zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-06-10 06:34:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix CC issues

Browse source
This commit is contained in:
Alex Sherman 2021-05-05 17:31:13 +05:00
parent d4dc39bf22
commit 11d97358c1
16 changed files with 78 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/controllers/repp/v1/base_controller.rb
View file

@ -63,7 +63,7 @@ module Repp
@epp_errors ||= ActiveModel::Errors.new(self)
end
def handle_errors(obj = nil, update: false)
def handle_errors(obj = nil)
@epp_errors ||= ActiveModel::Errors.new(self)
if obj
@ -78,8 +78,8 @@ module Repp
@epp_errors ||= ActiveModel::Errors.new(self)
@epp_errors.add(:epp_errors, msg: 'Command failed', code: '2304') if data != {}
error_options = @epp_errors.errors.uniq.
select { |error| error.options[:code].present? }[0].options
error_options = @epp_errors.errors.uniq
.select { |error| error.options[:code].present? }[0].options
@response = { code: error_options[:code].to_i, message: error_options[:msg], data: data }
render(json: @response, status: status)

10
app/controllers/repp/v1/domains/base_contacts_controller.rb
View file

@ -16,11 +16,11 @@ module Repp
def update
@epp_errors ||= ActiveModel::Errors.new(self)
if @new_contact.invalid?
@epp_errors.add(:epp_errors,
msg: 'New contact must be valid',
code: '2304')
end
return unless @new_contact.invalid?
@epp_errors.add(:epp_errors,
msg: 'New contact must be valid',
code: '2304')
end
private

16
app/controllers/repp/v1/domains/renews_controller.rb
View file

@ -30,7 +30,7 @@ module Repp
return render_success(data: { updated_domains: @domains.map(&:name) }) if renew.valid?
msg = renew.errors.keys.map { |k, _v| renew.errors[k] }.join(', ')
@epp_errors.add(:epp_errors, msg: msg , code: '2002')
@epp_errors.add(:epp_errors, msg: msg, code: '2002')
handle_errors
end
@ -45,7 +45,7 @@ module Repp
periods = Depp::Domain::PERIODS.map { |p| p[1] }
return if periods.include? bulk_renew_params[:renew_period]
@epp_errors.add(:epp_errors, msg: 'Invalid renew period' , code: '2005')
@epp_errors.add(:epp_errors, msg: 'Invalid renew period', code: '2005')
end
def select_renewable_domains
@ -54,7 +54,7 @@ module Repp
if bulk_renew_params[:domains].instance_of?(Array)
@domains = bulk_renew_domains
else
@epp_errors.add(:epp_errors, msg: 'Domains attribute must be an array' , code: '2005')
@epp_errors.add(:epp_errors, msg: 'Domains attribute must be an array', code: '2005')
end
return handle_errors if @epp_errors.any?
@ -78,11 +78,11 @@ module Repp
bulk_renew_params[:domains].each do |idn|
domain = Epp::Domain.find_by(name: idn)
domains << domain if domain
unless domain
@epp_errors.add(:epp_errors,
msg: "Object does not exist: #{idn}",
code: '2304')
end
next if domain
@epp_errors.add(:epp_errors,
msg: "Object does not exist: #{idn}",
code: '2304')
end
domains

4
app/controllers/repp/v1/domains_controller.rb
View file

@ -194,7 +194,9 @@ module Repp
return if @domain.registrar == current_user.registrar
return if @domain.transfer_code.eql?(request.headers['Auth-Code'])
@epp_errors.add(:epp_errors, code: 2202, msg: I18n.t('errors.messages.epp_authorization_error'))
@epp_errors.add(:epp_errors,
code: 2202,
msg: I18n.t('errors.messages.epp_authorization_error'))
handle_errors
end