mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 01:47:18 +02:00
Refactor request_valid
This commit is contained in:
parent
0b7017481d
commit
e66b5adae5
3 changed files with 14 additions and 12 deletions
|
@ -117,12 +117,12 @@ class Epp::DomainsController < EppController
|
||||||
|
|
||||||
def validate_info
|
def validate_info
|
||||||
@prefix = 'info > info >'
|
@prefix = 'info > info >'
|
||||||
epp_request_valid?('name')
|
requires('name')
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_check
|
def validate_check
|
||||||
@prefix = 'check > check >'
|
@prefix = 'check > check >'
|
||||||
epp_request_valid?('name')
|
requires('name')
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_create
|
def validate_create
|
||||||
|
@ -131,30 +131,30 @@ class Epp::DomainsController < EppController
|
||||||
end
|
end
|
||||||
|
|
||||||
@prefix = 'create > create >'
|
@prefix = 'create > create >'
|
||||||
epp_request_valid?('name', 'ns', 'registrant', 'ns > hostAttr')
|
requires('name', 'ns', 'registrant', 'ns > hostAttr')
|
||||||
|
|
||||||
@prefix = nil
|
@prefix = nil
|
||||||
epp_request_valid?('extension > extdata > legalDocument')
|
requires('extension > extdata > legalDocument')
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_renew
|
def validate_renew
|
||||||
@prefix = 'renew > renew >'
|
@prefix = 'renew > renew >'
|
||||||
epp_request_valid?('name', 'curExpDate', 'period')
|
requires('name', 'curExpDate', 'period')
|
||||||
end
|
end
|
||||||
|
|
||||||
def validate_update
|
def validate_update
|
||||||
if params[:parsed_frame].css('chg registrant').present? && params[:parsed_frame].css('legalDocument').blank?
|
if params[:parsed_frame].css('chg registrant').present? && params[:parsed_frame].css('legalDocument').blank?
|
||||||
epp_request_valid?('extension > extdata > legalDocument')
|
requires('extension > extdata > legalDocument')
|
||||||
end
|
end
|
||||||
|
|
||||||
@prefix = 'update > update >'
|
@prefix = 'update > update >'
|
||||||
epp_request_valid?('name')
|
requires('name')
|
||||||
end
|
end
|
||||||
|
|
||||||
## TRANSFER
|
## TRANSFER
|
||||||
def validate_transfer
|
def validate_transfer
|
||||||
@prefix = 'transfer > transfer >'
|
@prefix = 'transfer > transfer >'
|
||||||
epp_request_valid?('name')
|
requires('name')
|
||||||
|
|
||||||
op = params[:parsed_frame].css('transfer').first[:op]
|
op = params[:parsed_frame].css('transfer').first[:op]
|
||||||
return if %w(approve query reject).include?(op)
|
return if %w(approve query reject).include?(op)
|
||||||
|
@ -163,10 +163,10 @@ class Epp::DomainsController < EppController
|
||||||
|
|
||||||
## DELETE
|
## DELETE
|
||||||
def validate_delete
|
def validate_delete
|
||||||
epp_request_valid?('extension > extdata > legalDocument')
|
requires('extension > extdata > legalDocument')
|
||||||
|
|
||||||
@prefix = 'delete > delete >'
|
@prefix = 'delete > delete >'
|
||||||
epp_request_valid?('name')
|
requires('name')
|
||||||
end
|
end
|
||||||
|
|
||||||
def domain_create_params
|
def domain_create_params
|
||||||
|
|
|
@ -15,7 +15,8 @@ class Epp::KeyrelaysController < EppController
|
||||||
|
|
||||||
def validate_keyrelay
|
def validate_keyrelay
|
||||||
@prefix = 'keyrelay >'
|
@prefix = 'keyrelay >'
|
||||||
epp_request_valid?(
|
|
||||||
|
requires(
|
||||||
'name',
|
'name',
|
||||||
'keyData', 'keyData > pubKey', 'keyData > flags', 'keyData > protocol', 'keyData > alg',
|
'keyData', 'keyData > pubKey', 'keyData > flags', 'keyData > protocol', 'keyData > alg',
|
||||||
'authInfo', 'authInfo > pw'
|
'authInfo', 'authInfo > pw'
|
||||||
|
@ -23,6 +24,7 @@ class Epp::KeyrelaysController < EppController
|
||||||
|
|
||||||
optional 'expiry > relative', duration_iso8601: true
|
optional 'expiry > relative', duration_iso8601: true
|
||||||
optional 'expiry > absolute', date_time_iso8601: true
|
optional 'expiry > absolute', date_time_iso8601: true
|
||||||
|
|
||||||
exactly_one_of 'expiry > relative', 'expiry > absolute'
|
exactly_one_of 'expiry > relative', 'expiry > absolute'
|
||||||
end
|
end
|
||||||
# rubocop: enable Metrics/PerceivedComplexity
|
# rubocop: enable Metrics/PerceivedComplexity
|
||||||
|
|
|
@ -62,7 +62,7 @@ class EppController < ApplicationController
|
||||||
handle_errors and return if epp_errors.any?
|
handle_errors and return if epp_errors.any?
|
||||||
end
|
end
|
||||||
|
|
||||||
def epp_request_valid?(*selectors)
|
def requires(*selectors)
|
||||||
selectors.each do |selector|
|
selectors.each do |selector|
|
||||||
full_selector = [@prefix, selector].join(' ')
|
full_selector = [@prefix, selector].join(' ')
|
||||||
el = params[:parsed_frame].css(full_selector).first
|
el = params[:parsed_frame].css(full_selector).first
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue