zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-12 04:29:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix registrar interface #2752

Browse source
This commit is contained in:
Martin Lensment 2015-07-24 14:25:11 +03:00
parent cd9851df2f
commit 5e75d0cba3
2 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/models/depp/contact.rb
View file

@ -192,23 +192,23 @@ module Depp
{ {
id: { value: id }, id: { value: id },
chg: { chg: {
voice: { value: phone },
email: { value: email },
postalInfo: { postalInfo: {
name: { value: name }, name: { value: name },
org: { value: org_name }, org: { value: org_name },
addr: { addr: {
street: { value: street }, street: { value: street },
city: { value: city }, city: { value: city },
pc: { value: zip },
sp: { value: state }, sp: { value: state },
pc: { value: zip },
cc: { value: country_code } cc: { value: country_code }
} }
},
voice: { value: phone },
email: { value: email },
authInfo: {
pw: { value: password }
} }
}, },
authInfo: {
pw: { value: password }
}
}, },
extension_xml extension_xml
) )

40
app/models/depp/domain.rb
View file

@ -36,15 +36,17 @@ module Depp
end end
def create(domain_params) def create(domain_params)
dns_hash = {}
keys = Domain.create_dnskeys_hash(domain_params)
dns_hash[:_anonymus] = keys if keys.any?
xml = epp_xml.create({ xml = epp_xml.create({
name: { value: domain_params[:name] }, name: { value: domain_params[:name] },
registrant: { value: domain_params[:registrant] },
period: { value: domain_params[:period].to_s[0], attrs: { unit: domain_params[:period].to_s[1] } }, period: { value: domain_params[:period].to_s[0], attrs: { unit: domain_params[:period].to_s[1] } },
ns: Domain.create_nameservers_hash(domain_params), ns: Domain.create_nameservers_hash(domain_params),
registrant: { value: domain_params[:registrant] },
_anonymus: Domain.create_contacts_hash(domain_params) _anonymus: Domain.create_contacts_hash(domain_params)
}, { }, dns_hash, Domain.construct_custom_params_hash(domain_params))
_anonymus: Domain.create_dnskeys_hash(domain_params)
}, Domain.construct_custom_params_hash(domain_params))
current_user.request(xml) current_user.request(xml)
end end
@ -205,6 +207,16 @@ module Depp
contacts = array_difference(create_contacts_hash(old_domain_params), create_contacts_hash(domain_params)) contacts = array_difference(create_contacts_hash(old_domain_params), create_contacts_hash(domain_params))
rem_anon = contacts rem_anon = contacts
add_arr = []
add_ns = create_nameservers_hash(domain_params) - create_nameservers_hash(old_domain_params)
add_arr << { ns: add_ns } if add_ns.any?
add_arr << { _anonymus: add_anon } if add_anon.any?
rem_arr = []
rem_ns = create_nameservers_hash(old_domain_params) - create_nameservers_hash(domain_params)
rem_arr << { ns: rem_ns } if rem_ns.any?
rem_arr << { _anonymus: rem_anon } if rem_anon.any?
if domain_params[:registrant] != old_domain_params[:registrant] if domain_params[:registrant] != old_domain_params[:registrant]
chg = [{ registrant: { value: domain_params[:registrant] } }] chg = [{ registrant: { value: domain_params[:registrant] } }]
end end
@ -212,22 +224,18 @@ module Depp
{ {
name: { value: domain_params[:name] }, name: { value: domain_params[:name] },
chg: chg, chg: chg,
add: [ add: add_arr,
{ ns: create_nameservers_hash(domain_params) - create_nameservers_hash(old_domain_params) }, rem: rem_arr
{ _anonymus: add_anon }
],
rem: [
{ ns: create_nameservers_hash(old_domain_params) - create_nameservers_hash(domain_params) },
{ _anonymus: rem_anon }
]
} }
end end
def construct_ext_edit_hash(domain_params, old_domain_params) def construct_ext_edit_hash(domain_params, old_domain_params)
{ rem_keys = create_dnskeys_hash(old_domain_params) - create_dnskeys_hash(domain_params)
add: create_dnskeys_hash(domain_params) - create_dnskeys_hash(old_domain_params), add_keys = create_dnskeys_hash(domain_params) - create_dnskeys_hash(old_domain_params)
rem: create_dnskeys_hash(old_domain_params) - create_dnskeys_hash(domain_params) hash = {}
} hash[:rem] = rem_keys if rem_keys.any?
hash[:add] = add_keys if add_keys.any?
hash
end end
def create_nameservers_hash(domain_params) def create_nameservers_hash(domain_params)