diff --git a/app/controllers/epp/domains_controller.rb b/app/controllers/epp/domains_controller.rb index 1140453e0..e14501521 100644 --- a/app/controllers/epp/domains_controller.rb +++ b/app/controllers/epp/domains_controller.rb @@ -5,8 +5,8 @@ class Epp::DomainsController < EppController before_action :find_password, only: [:info, :update, :transfer, :delete] def create - authorize! :create, Epp::EppDomain - @domain = Epp::EppDomain.new_from_epp(params[:parsed_frame], current_user) + authorize! :create, Epp::Domain + @domain = Epp::Domain.new_from_epp(params[:parsed_frame], current_user) if @domain.errors.any? || !@domain.save handle_errors(@domain) @@ -21,15 +21,15 @@ class Epp::DomainsController < EppController end def check - authorize! :check, Epp::EppDomain + authorize! :check, Epp::Domain names = params[:parsed_frame].css('name').map(&:text) - @domains = Epp::EppDomain.check_availability(names) + @domains = Epp::Domain.check_availability(names) render_epp_response '/epp/domains/check' end def renew - authorize! :renew, Epp::EppDomain + authorize! :renew, Epp::Domain handle_errors(@domain) and return unless @domain.renew( params[:parsed_frame].css('curExpDate').text, @@ -92,7 +92,7 @@ class Epp::DomainsController < EppController def delete handle_errors(@domain) and return unless @domain.can_be_deleted? - @domain.attach_legal_document(Epp::EppDomain.parse_legal_document_from_frame(params[:parsed_frame])) + @domain.attach_legal_document(Epp::Domain.parse_legal_document_from_frame(params[:parsed_frame])) @domain.save(validate: false) handle_errors(@domain) and return unless @domain.destroy @@ -169,7 +169,7 @@ class Epp::DomainsController < EppController def find_domain domain_name = params[:parsed_frame].css('name').text.strip.downcase - @domain = Epp::EppDomain.find_by(name: domain_name) + @domain = Epp::Domain.find_by(name: domain_name) unless @domain epp_errors << { diff --git a/app/controllers/epp/keyrelays_controller.rb b/app/controllers/epp/keyrelays_controller.rb index 8a9b863d4..9384818ca 100644 --- a/app/controllers/epp/keyrelays_controller.rb +++ b/app/controllers/epp/keyrelays_controller.rb @@ -34,7 +34,7 @@ class Epp::KeyrelaysController < EppController def find_domain domain_name = params[:parsed_frame].css('name').text.strip.downcase - domain = Epp::EppDomain.includes(:owner_contact).find_by(name: domain_name) + domain = Epp::Domain.includes(:owner_contact).find_by(name: domain_name) unless domain epp_errors << { diff --git a/app/models/ability.rb b/app/models/ability.rb index 4c845fc7b..d8915dc40 100644 --- a/app/models/ability.rb +++ b/app/models/ability.rb @@ -27,12 +27,12 @@ class Ability can(:view_password, Epp::Contact) { |c| c.registrar_id == @user.registrar_id } # Epp::Domain - can(:info, Epp::EppDomain) { |d, pw| d.registrar_id == @user.registrar_id || d.auth_info == pw } - can(:check, Epp::EppDomain) - can(:create, Epp::EppDomain) - can(:renew, Epp::EppDomain) - can(:update, Epp::EppDomain) { |d, pw| d.registrar_id == @user.registrar_id || d.auth_info == pw } - can(:transfer, Epp::EppDomain) { |d, pw| d.auth_info == pw } + can(:info, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.auth_info == pw } + can(:check, Epp::Domain) + can(:create, Epp::Domain) + can(:renew, Epp::Domain) + can(:update, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.auth_info == pw } + can(:transfer, Epp::Domain) { |d, pw| d.auth_info == pw } end def user diff --git a/app/models/epp/epp_domain.rb b/app/models/epp/domain.rb similarity index 99% rename from app/models/epp/epp_domain.rb rename to app/models/epp/domain.rb index 8e6642ea6..b68c164e5 100644 --- a/app/models/epp/epp_domain.rb +++ b/app/models/epp/domain.rb @@ -1,5 +1,5 @@ # rubocop: disable Metrics/ClassLength -class Epp::EppDomain < Domain +class Epp::Domain < Domain include EppErrors def epp_code_map # rubocop:disable Metrics/MethodLength @@ -59,7 +59,7 @@ class Epp::EppDomain < Domain end def self.new_from_epp(frame, current_user) - domain = Epp::EppDomain.new + domain = Epp::Domain.new domain.attributes = domain.attrs_from(frame, current_user) domain.attach_default_contacts domain @@ -105,7 +105,7 @@ class Epp::EppDomain < Domain period = frame.css('period').text at[:period] = (period.to_i == 0) ? 1 : period.to_i - at[:period_unit] = Epp::EppDomain.parse_period_unit_from_frame(frame) || 'y' + at[:period_unit] = Epp::Domain.parse_period_unit_from_frame(frame) || 'y' at[:nameservers_attributes] = nameservers_attrs(frame, action) at[:domain_contacts_attributes] = domain_contacts_attrs(frame, action) diff --git a/lib/epp_parser.rb b/lib/epp_parser.rb deleted file mode 100644 index 569e4a07a..000000000 --- a/lib/epp_parser.rb +++ /dev/null @@ -1,30 +0,0 @@ -module EppParser - def domain_rem_params - - - { - nameservers_attributes: to_destroy - } - end - - def nameservers_attributes - ns_list = Epp::EppDomain.parse_nameservers_from_frame(params[:parsed_frame]) - - to_destroy = [] - ns_list.each do |ns_attrs| - nameserver = @domain.nameservers.where(ns_attrs).try(:first) - if nameserver.blank? - epp_errors << { - code: '2303', - msg: I18n.t('nameserver_not_found'), - value: { obj: 'hostAttr', val: ns_attrs[:hostname] } - } - else - to_destroy << { - id: nameserver.id, - _destroy: 1 - } - end - end - end -end diff --git a/spec/fabricators/epp_domain_fabricator.rb b/spec/fabricators/epp_domain_fabricator.rb index f7df49ce3..35deda396 100644 --- a/spec/fabricators/epp_domain_fabricator.rb +++ b/spec/fabricators/epp_domain_fabricator.rb @@ -1 +1 @@ -Fabricator(:epp_domain, from: :domain, class_name: 'Epp::EppDomain') +Fabricator(:epp_domain, from: :domain, class_name: 'Epp::Domain') diff --git a/spec/models/epp_domain_spec.rb b/spec/models/epp_domain_spec.rb index b5c67509f..3cd640005 100644 --- a/spec/models/epp_domain_spec.rb +++ b/spec/models/epp_domain_spec.rb @@ -1,6 +1,6 @@ require 'rails_helper' -describe Epp::EppDomain do +describe Epp::Domain do context 'with sufficient settings' do let(:domain) { Fabricate(:epp_domain) }