mirror of
https://github.com/internetee/registry.git
synced 2025-05-29 17:10:08 +02:00
Refactor
This commit is contained in:
parent
cd4486c79c
commit
bfb9abea8c
4 changed files with 10 additions and 9 deletions
|
@ -12,7 +12,6 @@ module Epp::Common
|
||||||
end
|
end
|
||||||
|
|
||||||
def proxy
|
def proxy
|
||||||
@errors = []
|
|
||||||
@svTRID = "ccReg-#{'%010d' % rand(10 ** 10)}"
|
@svTRID = "ccReg-#{'%010d' % rand(10 ** 10)}"
|
||||||
send(params[:command])
|
send(params[:command])
|
||||||
end
|
end
|
||||||
|
@ -25,6 +24,10 @@ module Epp::Common
|
||||||
EppSession.find_or_initialize_by(session_id: cookies['session'])
|
EppSession.find_or_initialize_by(session_id: cookies['session'])
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def epp_errors
|
||||||
|
@errors ||= []
|
||||||
|
end
|
||||||
|
|
||||||
def current_epp_user
|
def current_epp_user
|
||||||
@current_epp_user ||= EppUser.find(epp_session[:epp_user_id]) if epp_session[:epp_user_id]
|
@current_epp_user ||= EppUser.find(epp_session[:epp_user_id]) if epp_session[:epp_user_id]
|
||||||
end
|
end
|
||||||
|
@ -36,9 +39,8 @@ module Epp::Common
|
||||||
xsd = Nokogiri::XML::Schema(File.read("doc/schemas/#{type}-1.0.xsd"))
|
xsd = Nokogiri::XML::Schema(File.read("doc/schemas/#{type}-1.0.xsd"))
|
||||||
doc = Nokogiri::XML(params[:frame])
|
doc = Nokogiri::XML(params[:frame])
|
||||||
ext_values = xsd.validate(doc)
|
ext_values = xsd.validate(doc)
|
||||||
@errors = []
|
|
||||||
if ext_values.any?
|
if ext_values.any?
|
||||||
@errors << {code: '2001', msg: 'Command syntax error', ext_values: ext_values}
|
epp_errors << {code: '2001', msg: 'Command syntax error', ext_values: ext_values}
|
||||||
render '/epp/error' and return
|
render '/epp/error' and return
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -2,8 +2,7 @@ class Epp::ErrorsController < ApplicationController
|
||||||
include Epp::Common
|
include Epp::Common
|
||||||
|
|
||||||
def error
|
def error
|
||||||
@errors = []
|
epp_errors << {code: params[:code], msg: params[:msg]}
|
||||||
@errors << {code: params[:code], msg: params[:msg]}
|
|
||||||
render '/epp/error'
|
render '/epp/error'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -32,10 +32,10 @@ module Epp::ContactsHelper
|
||||||
@contact.destroy
|
@contact.destroy
|
||||||
render '/epp/contacts/delete'
|
render '/epp/contacts/delete'
|
||||||
rescue NoMethodError => e
|
rescue NoMethodError => e
|
||||||
@errors << {code: '2303', msg: "Object does not exist"}
|
epp_errors << {code: '2303', msg: "Object does not exist"}
|
||||||
render '/epp/error'
|
render '/epp/error'
|
||||||
rescue
|
rescue
|
||||||
@errors << {code: '2400', msg: "Command failed"}
|
epp_errors << {code: '2400', msg: "Command failed"}
|
||||||
render '/epp/error'
|
render '/epp/error'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -47,7 +47,7 @@ module Epp::ContactsHelper
|
||||||
if @contacts.any?
|
if @contacts.any?
|
||||||
render '/epp/contacts/check'
|
render '/epp/contacts/check'
|
||||||
else
|
else
|
||||||
@errors << {code: '2303', msg: "Object does not exist"}
|
epp_errors << {code: '2303', msg: "Object does not exist"}
|
||||||
render 'epp/error'
|
render 'epp/error'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -35,7 +35,7 @@ module Epp::DomainsHelper
|
||||||
def handle_domain_name_errors
|
def handle_domain_name_errors
|
||||||
[:epp_domain_taken, :epp_domain_reserved].each do |x|
|
[:epp_domain_taken, :epp_domain_reserved].each do |x|
|
||||||
if @domain.errors.added?(:name, x)
|
if @domain.errors.added?(:name, x)
|
||||||
@errors << {code: '2302', msg: @domain.errors[:name].first}
|
epp_errors << {code: '2302', msg: @domain.errors[:name].first}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue