From dd8d4c10855515cb61c7afb3b1173fdb093ca69e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karl=20Erik=20=C3=95unapuu?= Date: Thu, 28 Jan 2021 12:47:06 +0200 Subject: [PATCH] Fix CC issues --- .codeclimate.yml | 4 ++-- app/controllers/repp/v1/domains/contacts_controller.rb | 4 ++-- app/controllers/repp/v1/domains/dnssec_controller.rb | 6 +++--- app/controllers/repp/v1/domains/nameservers_controller.rb | 6 +++--- app/controllers/repp/v1/domains/renews_controller.rb | 2 +- app/controllers/repp/v1/domains/transfers_controller.rb | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.codeclimate.yml b/.codeclimate.yml index 346b01897..c16179c86 100644 --- a/.codeclimate.yml +++ b/.codeclimate.yml @@ -12,9 +12,9 @@ plugins: duplication: enabled: true config: + count_threshold: 3 languages: - ruby: - mass_threshold: 26 + - ruby - javascript eslint: enabled: true diff --git a/app/controllers/repp/v1/domains/contacts_controller.rb b/app/controllers/repp/v1/domains/contacts_controller.rb index 2f8b7c1b4..b84e4bd46 100644 --- a/app/controllers/repp/v1/domains/contacts_controller.rb +++ b/app/controllers/repp/v1/domains/contacts_controller.rb @@ -38,7 +38,7 @@ module Repp end def cta(action = 'add') - contact_create_params[:contacts].each { |c| c[:action] = action } + params[:contacts].each { |c| c[:action] = action } action = Actions::DomainUpdate.new(@domain, contact_create_params, current_user) # rubocop:disable Style/AndOr @@ -76,7 +76,7 @@ module Repp private def contact_create_params - params.permit! + params.permit(:domain_id, contacts: [%i[action code type]]) end def contact_params diff --git a/app/controllers/repp/v1/domains/dnssec_controller.rb b/app/controllers/repp/v1/domains/dnssec_controller.rb index 0c30fd84f..491ce0a98 100644 --- a/app/controllers/repp/v1/domains/dnssec_controller.rb +++ b/app/controllers/repp/v1/domains/dnssec_controller.rb @@ -37,8 +37,8 @@ module Repp end def cta(action = 'add') - dnssec_params[:dnssec][:dns_keys].each { |n| n[:action] = action } - action = Actions::DomainUpdate.new(@domain, dnssec_params[:dnssec], current_user) + params[:dns_keys].each { |n| n[:action] = action } + action = Actions::DomainUpdate.new(@domain, dnssec_params, current_user) # rubocop:disable Style/AndOr (handle_errors(@domain) and return) unless action.call @@ -50,7 +50,7 @@ module Repp private def dnssec_params - params.permit! + params.permit(:domain_id, dns_keys: [%i[action flags protocol alg public_key]]) end end end diff --git a/app/controllers/repp/v1/domains/nameservers_controller.rb b/app/controllers/repp/v1/domains/nameservers_controller.rb index ce4227bab..0a907c04e 100644 --- a/app/controllers/repp/v1/domains/nameservers_controller.rb +++ b/app/controllers/repp/v1/domains/nameservers_controller.rb @@ -13,8 +13,8 @@ module Repp param :ipv6, Array, required: false, desc: 'Array of IPv6 values' end def create - nameserver_params[:nameservers].each { |n| n[:action] = 'add' } - action = Actions::DomainUpdate.new(@domain, params, current_user) + params[:nameservers].each { |n| n[:action] = 'add' } + action = Actions::DomainUpdate.new(@domain, nameserver_params, current_user) unless action.call handle_errors(@domain) @@ -45,7 +45,7 @@ module Repp end def nameserver_params - params.permit! + params.permit(:domain_id, nameservers: [[:hostname, :action, ipv4: [], ipv6: []]]) end end end diff --git a/app/controllers/repp/v1/domains/renews_controller.rb b/app/controllers/repp/v1/domains/renews_controller.rb index 74a9ad2e2..eabd9ea16 100644 --- a/app/controllers/repp/v1/domains/renews_controller.rb +++ b/app/controllers/repp/v1/domains/renews_controller.rb @@ -36,7 +36,7 @@ module Repp private def renew_params - params.permit! + params.permit(:domain_id, renew: %i[period period_unit]) end def validate_renew_period diff --git a/app/controllers/repp/v1/domains/transfers_controller.rb b/app/controllers/repp/v1/domains/transfers_controller.rb index 2594205d6..e9474d94d 100644 --- a/app/controllers/repp/v1/domains/transfers_controller.rb +++ b/app/controllers/repp/v1/domains/transfers_controller.rb @@ -31,7 +31,7 @@ module Repp end def transfer_params - params.permit! + params.permit(:domain_id, transfer: [:transfer_code]) end end end