diff --git a/.reek b/.reek
index 060f76785..3bdfebb81 100644
--- a/.reek
+++ b/.reek
@@ -103,13 +103,11 @@ UncommunicativeVariableName:
- Epp::Contact#attrs_from
- Epp::Contact#check_availability
- Epp::Domain#check_availability
- - Epp::Domain#copy_and_transfer_contact
- Epp::Domain#domain_contact_attrs_from
- Epp::Domain#domain_status_list_from
- Epp::Domain#domain_statuses_attrs
- Epp::Domain#nameservers_from
- Epp::Domain#parse_period_unit_from_frame
- - Epp::Domain#transfer_domain_contacts
- Epp::Domain#validate_contacts
- Invoice#cancel_overdue_invoices
- Legacy::Db
@@ -209,7 +207,6 @@ DuplicateMethodCall:
- Registrar::DomainsController#normalize_search_parameters
- Registrar::DomainsController#renew
- Registrar::DomainsController#search_contacts
- - Registrar::DomainsController#transfer
- Registrar::DomainsController#update
- Registrar::InvoicesController#index
- Registrar::InvoicesController#normalize_search_parameters
@@ -246,7 +243,6 @@ DuplicateMethodCall:
- Billing::Price#self.effective
- Billing::Price#self.valid
- BusinessRegistryCache#fetch_by_ident_and_cc
- - BusinessRegistryCache#purge
- Certificate#parse_metadata
- Certificate#reload_apache
- Certificate#revoke!
@@ -285,7 +281,6 @@ DuplicateMethodCall:
- Depp::Domain#default_params
- Depp::Domain#renew
- Depp::Keyrelay#keyrelay
- - Depp::User#repp_request
- Depp::User#validate_existance_in_server
- Directo#self.dump_result_to_db
- Directo#self.load_price
@@ -319,7 +314,6 @@ DuplicateMethodCall:
- Epp::Domain#parse_legal_document_from_frame
- Epp::Domain#query_transfer
- Epp::Domain#renew
- - Epp::Domain#transfer_domain_contacts
- Epp::Domain#update
- Epp::Domain#validate_contacts
- Epp::Domain#validate_exp_dates
@@ -765,7 +759,6 @@ TooManyStatements:
- Depp::Domain#create_nameservers_hash
- Depp::Domain#default_params
- Depp::Domain#transfer
- - Depp::User#repp_request
- Depp::User#validate_existance_in_server
- Directo#self.send_monthly_invoices
- Directo#self.send_receipts
@@ -785,7 +778,6 @@ TooManyStatements:
- DomainCron#self.start_expire_period
- DomainCron#self.start_redemption_grace_period
- DomainMailModel#domain_info
- - DomainTransfer#approve_as_client
- Epp::Contact#add_legal_file_to_new
- Epp::Contact#attrs_from
- Epp::Contact#check_availability
@@ -798,7 +790,6 @@ TooManyStatements:
- Epp::Domain#approve_transfer
- Epp::Domain#attrs_from
- Epp::Domain#check_availability
- - Epp::Domain#copy_and_transfer_contact
- Epp::Domain#destroy_attrs
- Epp::Domain#dnskeys_attrs
- Epp::Domain#domain_contact_attrs_from
@@ -814,7 +805,6 @@ TooManyStatements:
- Epp::Domain#reject_transfer
- Epp::Domain#renew
- Epp::Domain#transfer
- - Epp::Domain#transfer_domain_contacts
- Epp::Domain#update
- Epp::Domain#validate_contacts
- Invoice#cancel
@@ -884,7 +874,6 @@ UtilityFunction:
- EppErrors#construct_msg_args_and_value
- Versions#user_from_id_role_username
- Depp::Keyrelay#expiry
- - Epp::Domain#copy_and_transfer_contact
- Epp::Domain#nameservers_from
- Epp::Domain::DnsSecKeys#mark
- Epp::Domain::DnsSecKeys#xm_copy
@@ -947,7 +936,6 @@ FeatureEnvy:
- Depp::Domain#renew
- Depp::Domain#transfer
- Depp::Keyrelay#keyrelay
- - Depp::User#repp_request
- DomainMailModel#format
- Epp::Contact#attach_legal_document
- Epp::Contact#attrs_from
@@ -959,7 +947,6 @@ FeatureEnvy:
- Epp::Domain#destroy_attrs
- Epp::Domain#domain_contact_attrs_from
- Epp::Domain#domain_status_list_from
- - Epp::Domain#transfer_domain_contacts
- LegalDocument#calc_checksum
- Nameserver#find_by_hash_params
- RegistrantUser#find_or_create_by_idc_data
@@ -1094,7 +1081,6 @@ Attribute:
- BankStatement#th6_file
- Versions#version_loader
- Contact#deliver_emails
- - Contact#domain_transfer
- Contact#domains_present
- Contact#legal_document_id
- Counter#value
diff --git a/.travis.yml b/.travis.yml
index 795074687..a5fec1a71 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,6 @@ env:
- DB=postgresql
bundler_args: --without development staging production
before_script:
- - "psql -c 'create database registry_test;' -U postgres"
- - "psql -c 'create database registry_whois_test;' -U postgres"
- - "psql -c 'create database registry_api_log_test;' -U postgres"
- "cp config/application-example.yml config/application.yml"
- "cp config/database-travis.yml config/database.yml"
- "bundle exec rake db:setup:all"
diff --git a/Gemfile b/Gemfile
index 32c21e21d..ade4d256c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,7 +41,6 @@ gem 'sass-rails', '5.0.6' # sass style
gem 'coffee-rails', '4.1.0' # coffeescript support
gem 'jquery-rails', '4.0.4' # jquery
-gem 'turbolinks', '2.5.3' # faster page load
gem 'selectize-rails', '0.12.1' # include selectize.js for select
gem 'jquery-validation-rails', '1.13.1' # validate on client side
@@ -49,7 +48,6 @@ gem 'jquery-validation-rails', '1.13.1' # validate on client side
gem 'kaminari', '0.16.3' # pagination
gem 'coderay', '1.1.0' # xml console visualize
gem 'html5_validators', '1.2.2' # model requements now automatically on html form
-gem 'nprogress-rails', '0.1.6.7' # visual loader
gem 'select2-rails', '3.5.9.3' # for autocomplete
gem 'liquid', '3.0.6' # for email templates
@@ -59,7 +57,7 @@ gem 'devise', '3.5.4' # authenitcation
# rest api
gem 'grape', '0.12.0'
-gem 'hashie-forbidden_attributes', '0.1.1' # For grape, https://github.com/ruby-grape/grape#rails
+gem 'hashie-forbidden_attributes', '0.1.1' # For grape, https://github.com/ruby-grape/grape/tree/v0.12.0#rails
gem 'jbuilder', '2.2.16' # json api
# registry specfic
@@ -76,9 +74,6 @@ gem 'whenever', '0.9.4', require: false
# country listing
gem 'countries', :require => 'countries/global'
-# cloning activerecord objects
-gem 'deep_cloneable', '2.1.1'
-
# id + mid login
# gem 'digidoc_client', '0.3.0'
gem 'digidoc_client',
diff --git a/Gemfile.lock b/Gemfile.lock
index 74f9082da..c7cddacca 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -165,8 +165,6 @@ GEM
daemons
multi_json (~> 1.0)
database_cleaner (1.6.1)
- deep_cloneable (2.1.1)
- activerecord (>= 3.1.0, < 5.0.0)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (3.5.4)
@@ -281,7 +279,6 @@ GEM
nokogiri (1.8.1)
mini_portile2 (~> 2.3.0)
nori (2.6.0)
- nprogress-rails (0.1.6.7)
open4 (1.3.4)
orm_adapter (0.5.0)
parallel (1.12.0)
@@ -441,8 +438,6 @@ GEM
thor (0.19.4)
thread_safe (0.3.6)
tilt (1.4.1)
- turbolinks (2.5.3)
- coffee-rails
tzinfo (1.2.3)
thread_safe (~> 0.1)
unf (0.1.4)
@@ -497,7 +492,6 @@ DEPENDENCIES
daemons-rails (= 1.2.1)
data_migrate!
database_cleaner
- deep_cloneable (= 2.1.1)
devise (= 3.5.4)
digidoc_client!
epp (= 1.5.0)!
@@ -520,7 +514,6 @@ DEPENDENCIES
mina (= 0.3.1)
money-rails
nokogiri
- nprogress-rails (= 0.1.6.7)
paper_trail!
pdfkit (= 0.6.2)
pg (= 0.19.0)
@@ -545,7 +538,6 @@ DEPENDENCIES
simpleidn (= 0.0.7)
spring
spring-commands-rspec
- turbolinks (= 2.5.3)
uuidtools (= 2.1.5)
validates_email_format_of (= 1.6.3)
webmock
diff --git a/app/api/repp/api.rb b/app/api/repp/api.rb
index 394edfdad..aec46c68b 100644
--- a/app/api/repp/api.rb
+++ b/app/api/repp/api.rb
@@ -57,5 +57,6 @@ module Repp
mount Repp::DomainV1
mount Repp::ContactV1
mount Repp::AccountV1
+ mount Repp::DomainTransfersV1
end
end
diff --git a/app/api/repp/domain_transfers_v1.rb b/app/api/repp/domain_transfers_v1.rb
new file mode 100644
index 000000000..195740f54
--- /dev/null
+++ b/app/api/repp/domain_transfers_v1.rb
@@ -0,0 +1,47 @@
+module Repp
+ class DomainTransfersV1 < Grape::API
+ version 'v1', using: :path
+
+ resource :domain_transfers do
+ post '/' do
+ params do
+ requires :data, type: Hash do
+ requires :domainTransfers, type: Array do
+ requires :domainName, type: String, allow_blank: false
+ requires :transferCode, type: String, allow_blank: false
+ end
+ end
+ end
+
+ new_registrar = current_user.registrar
+ domain_transfers = params['data']['domainTransfers']
+ errors = []
+
+ domain_transfers.each do |domain_transfer|
+ domain_name = domain_transfer['domainName']
+ transfer_code = domain_transfer['transferCode']
+ domain = Domain.find_by(name: domain_name)
+
+ if domain
+ if domain.transfer_code == transfer_code
+ domain.transfer(new_registrar)
+ else
+ errors << { title: "#{domain_name} transfer code is wrong" }
+ end
+ else
+ errors << { title: "#{domain_name} does not exist" }
+ end
+ end
+
+ if errors.none?
+ status 204
+ body false
+ @response = {}
+ else
+ status 400
+ @response = { errors: errors }
+ end
+ end
+ end
+ end
+end
diff --git a/app/api/repp/domain_v1.rb b/app/api/repp/domain_v1.rb
index cd0f01bdf..5e6c286ca 100644
--- a/app/api/repp/domain_v1.rb
+++ b/app/api/repp/domain_v1.rb
@@ -32,7 +32,7 @@ module Repp
domain = ident =~ /\A[0-9]+\z/ ? Domain.find_by(id: ident) : Domain.find_by_idn(ident)
error! I18n.t('errors.messages.epp_domain_not_found'), 404 unless domain
- error! I18n.t('errors.messages.epp_authorization_error'), 401 unless domain.auth_info.eql? request.headers['Auth-Code']
+ error! I18n.t('errors.messages.epp_authorization_error'), 401 unless domain.transfer_code.eql? request.headers['Auth-Code']
contact_repp_json = proc{|contact|
contact.as_json.slice("code", "name", "ident", "ident_type", "ident_country_code", "phone", "email", "street", "city", "zip","country_code", "statuses")
diff --git a/app/assets/javascripts/datepicker.js b/app/assets/javascripts/datepicker.js
index 188dac211..2210612eb 100644
--- a/app/assets/javascripts/datepicker.js
+++ b/app/assets/javascripts/datepicker.js
@@ -12,10 +12,5 @@
dateFields.datepicker();
}
- // For turbolinks
- document.addEventListener('page:change', function() {
- attachDatePicker();
- });
-
attachDatePicker();
})();
diff --git a/app/assets/javascripts/registrant-manifest.coffee b/app/assets/javascripts/registrant-manifest.coffee
index b8ba84bba..eb7577e02 100644
--- a/app/assets/javascripts/registrant-manifest.coffee
+++ b/app/assets/javascripts/registrant-manifest.coffee
@@ -1,13 +1,7 @@
#= require jquery
#= require jquery_ujs
-#= require jquery.validate
-#= require jquery.validate.additional-methods
-#= require turbolinks
#= require bootstrap-sprockets
-#= require jquery.nested_attributes
-#= require shared/jquery.validate.bootstrap
#= require jquery-ui/datepicker
#= require select2
#= require datepicker
#= require shared/general
-#= require registrar/application
diff --git a/app/assets/javascripts/registrar-manifest.coffee b/app/assets/javascripts/registrar-manifest.coffee
index c5d8918b6..656b5cb18 100644
--- a/app/assets/javascripts/registrar-manifest.coffee
+++ b/app/assets/javascripts/registrar-manifest.coffee
@@ -1,6 +1,5 @@
#= require jquery
#= require jquery_ujs
-#= require turbolinks
#= require bootstrap-sprockets
#= require typeahead.bundle.min
#= require jquery.nested_attributes
diff --git a/app/assets/javascripts/registrar/application.coffee b/app/assets/javascripts/registrar/application.coffee
index f1b92f0f1..51ab8e60a 100644
--- a/app/assets/javascripts/registrar/application.coffee
+++ b/app/assets/javascripts/registrar/application.coffee
@@ -1,4 +1,4 @@
-$(document).on 'page:change', ->
+$ ->
$('.js-contact-form').on 'restoreDefault', (e) ->
form = $(e.target)
form.find('.js-ident-tip').hide()
diff --git a/app/assets/javascripts/shared/general.coffee b/app/assets/javascripts/shared/general.coffee
index 05d5ce8ed..8cfbf41b5 100644
--- a/app/assets/javascripts/shared/general.coffee
+++ b/app/assets/javascripts/shared/general.coffee
@@ -1,9 +1,3 @@
-#= require nprogress
-#= require nprogress-turbolinks
-
-NProgress.configure
- showSpinner: false
-
@flash_notice = (msg) ->
$('#flash').find('div').removeClass('bg-danger')
$('#flash').find('div').addClass('bg-success')
@@ -16,7 +10,7 @@ NProgress.configure
$('#flash').find('div').html(msg)
$('#flash').show()
-$(document).on 'page:change', ->
+$ ->
today = new Date()
tomorrow = new Date(today)
tomorrow.setDate(today.getDate() + 1)
diff --git a/app/assets/stylesheets/admin-manifest.sass b/app/assets/stylesheets/admin-manifest.sass
index 4dabdad0c..8a577df91 100644
--- a/app/assets/stylesheets/admin-manifest.sass
+++ b/app/assets/stylesheets/admin-manifest.sass
@@ -1,4 +1,3 @@
-//= require 'shared/general-manifest'
//= require 'admin/admin-bootstrap'
//= require 'jquery-ui/datepicker'
//= require 'select2'
diff --git a/app/assets/stylesheets/registrant-manifest.sass b/app/assets/stylesheets/registrant-manifest.sass
index 154645065..6d0a281fe 100644
--- a/app/assets/stylesheets/registrant-manifest.sass
+++ b/app/assets/stylesheets/registrant-manifest.sass
@@ -1,12 +1,10 @@
-//= require 'shared/general-manifest'
//= require 'registrant/registrant-bootstrap'
//= require 'jquery-ui/datepicker'
//= require 'select2'
//= require 'select2-bootstrap'
@import shared/fonts
@import shared/general
-@import nprogress
-@import nprogress-bootstrap
+@import forms
@import typeaheadjs
@import selectize
@import selectize.bootstrap3
diff --git a/app/assets/stylesheets/registrar-manifest.sass b/app/assets/stylesheets/registrar-manifest.sass
index 8de8ff95a..a5e9c3593 100644
--- a/app/assets/stylesheets/registrar-manifest.sass
+++ b/app/assets/stylesheets/registrar-manifest.sass
@@ -1,12 +1,10 @@
-//= require 'shared/general-manifest'
//= require 'registrar/registrar-bootstrap'
//= require 'jquery-ui/datepicker'
//= require 'select2'
//= require 'select2-bootstrap'
@import shared/fonts
@import shared/general
-@import nprogress
-@import nprogress-bootstrap
+@import forms
@import typeaheadjs
@import selectize
@import selectize.bootstrap3
diff --git a/app/assets/stylesheets/shared/general-bootstrap.sass b/app/assets/stylesheets/shared/general-bootstrap.sass
index 29a605cb7..8f382b017 100644
--- a/app/assets/stylesheets/shared/general-bootstrap.sass
+++ b/app/assets/stylesheets/shared/general-bootstrap.sass
@@ -65,3 +65,6 @@
.required:after
content: "*"
margin: 0 0 0 1px
+
+.tab-content
+ padding-top: 15px
diff --git a/app/assets/stylesheets/shared/general-manifest.sass b/app/assets/stylesheets/shared/general-manifest.sass
deleted file mode 100644
index e69de29bb..000000000
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ff1e8eb26..87dabad01 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -65,13 +65,6 @@ class ApplicationController < ActionController::Base
user_log_str(current_user)
end
- def depp_current_user
- @depp_current_user ||= Depp::User.new(
- tag: current_user.username,
- password: current_user.password
- )
- end
-
def user_log_str(user)
user.nil? ? 'public' : user.id_role_username
end
diff --git a/app/controllers/registrant/domains_controller.rb b/app/controllers/registrant/domains_controller.rb
index fbd0eff13..7cde44a86 100644
--- a/app/controllers/registrant/domains_controller.rb
+++ b/app/controllers/registrant/domains_controller.rb
@@ -1,13 +1,12 @@
class Registrant::DomainsController < RegistrantController
-
def index
- authorize! :view, :registrant_domains
- params[:q] ||= {}
- normalize_search_parameters do
- @q = domains.search(params[:q])
- @domains = @q.result.page(params[:page])
- end
- @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
+ authorize! :view, :registrant_domains
+ params[:q] ||= {}
+ normalize_search_parameters do
+ @q = domains.search(params[:q])
+ @domains = @q.result.page(params[:page])
+ end
+ @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
end
def show
@@ -15,19 +14,15 @@ class Registrant::DomainsController < RegistrantController
authorize! :read, @domain
end
- def set_domain
- @domain = domains.find(params[:id])
- end
-
def domain_verification_url
authorize! :view, :registrant_domains
dom = domains.find(params[:id])
if (dom.statuses.include?(DomainStatus::PENDING_UPDATE) || dom.statuses.include?(DomainStatus::PENDING_DELETE_CONFIRMATION)) &&
- dom.pending_json.present?
+ dom.pending_json.present?
- @domain = dom
- confirm_path = get_confirm_path(dom.statuses)
- @verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}"
+ @domain = dom
+ confirm_path = get_confirm_path(dom.statuses)
+ @verification_url = "#{confirm_path}/#{@domain.id}?token=#{@domain.registrant_verification_token}"
else
flash[:warning] = I18n.t('available_verification_url_not_found')
@@ -52,6 +47,12 @@ class Registrant::DomainsController < RegistrantController
end
end
+ private
+
+ def set_domain
+ @domain = domains.find(params[:id])
+ end
+
def domains
ident_cc, ident = @current_user.registrant_ident.split '-'
begin
@@ -82,5 +83,4 @@ class Registrant::DomainsController < RegistrantController
"#{ENV['registrant_url']}/registrant/domain_delete_confirms"
end
end
-
-end
\ No newline at end of file
+end
diff --git a/app/controllers/registrant/sessions_controller.rb b/app/controllers/registrant/sessions_controller.rb
index e1523c919..2ab7e0dde 100644
--- a/app/controllers/registrant/sessions_controller.rb
+++ b/app/controllers/registrant/sessions_controller.rb
@@ -31,12 +31,6 @@ class Registrant::SessionsController < Devise::SessionsController
client = Digidoc::Client.new(endpoint)
client.logger = Rails.application.config.logger unless Rails.env.test?
- if Rails.env.test? && phone == "123"
- @user = ApiUser.find_by(identity_code: "14212128025")
- sign_in(@user, event: :authentication)
- return redirect_to registrant_root_url
- end
-
# country_codes = {'+372' => 'EST'}
response = client.authenticate(
phone: "+372#{phone}",
diff --git a/app/controllers/registrar/domain_transfers_controller.rb b/app/controllers/registrar/domain_transfers_controller.rb
new file mode 100644
index 000000000..0c72b2d93
--- /dev/null
+++ b/app/controllers/registrar/domain_transfers_controller.rb
@@ -0,0 +1,69 @@
+class Registrar
+ class DomainTransfersController < DeppController
+ before_action do
+ authorize! :transfer, Depp::Domain
+ end
+
+ def new
+ end
+
+ def create
+ if params[:batch_file].present?
+ csv = CSV.read(params[:batch_file].path, headers: true)
+ domain_transfers = []
+
+ csv.each do |row|
+ domain_name = row['Domain']
+ transfer_code = row['Transfer code']
+ domain_transfers << { 'domainName' => domain_name, 'transferCode' => transfer_code }
+ end
+
+ uri = URI.parse("#{ENV['repp_url']}domain_transfers")
+ request = Net::HTTP::Post.new(uri, 'Content-Type' => 'application/json')
+ request.body = { data: { domainTransfers: domain_transfers } }.to_json
+ request.basic_auth(current_user.username, current_user.password)
+
+
+ if Rails.env.test?
+ response = Net::HTTP.start(uri.hostname, uri.port,
+ use_ssl: (uri.scheme == 'https'),
+ verify_mode: OpenSSL::SSL::VERIFY_NONE) do |http|
+ http.request(request)
+ end
+ elsif Rails.env.development?
+ client_cert = File.read(ENV['cert_path'])
+ client_key = File.read(ENV['key_path'])
+ response = Net::HTTP.start(uri.hostname, uri.port,
+ use_ssl: (uri.scheme == 'https'),
+ verify_mode: OpenSSL::SSL::VERIFY_NONE,
+ cert: OpenSSL::X509::Certificate.new(client_cert),
+ key: OpenSSL::PKey::RSA.new(client_key)) do |http|
+ http.request(request)
+ end
+ else
+ client_cert = File.read(ENV['cert_path'])
+ client_key = File.read(ENV['key_path'])
+ response = Net::HTTP.start(uri.hostname, uri.port,
+ use_ssl: (uri.scheme == 'https'),
+ cert: OpenSSL::X509::Certificate.new(client_cert),
+ key: OpenSSL::PKey::RSA.new(client_key)) do |http|
+ http.request(request)
+ end
+ end
+
+ if response.code == '204'
+ flash[:notice] = t '.transferred'
+ redirect_to registrar_domains_url
+ else
+ @api_errors = JSON.parse(response.body, symbolize_names: true)[:errors]
+ render :new
+ end
+ else
+ params[:request] = true # EPP domain:transfer "op" attribute
+ domain = Depp::Domain.new(current_user: depp_current_user)
+ @data = domain.transfer(params)
+ render :new unless response_ok?
+ end
+ end
+ end
+end
diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb
index 76467ce79..b85923a02 100644
--- a/app/controllers/registrar/domains_controller.rb
+++ b/app/controllers/registrar/domains_controller.rb
@@ -52,7 +52,8 @@ class Registrar
end
csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters, view: view_context).to_s
- send_data(csv)
+ filename = "Domains_#{l(Time.zone.now, format: :filename)}.csv"
+ send_data(csv, filename: filename)
end
end
end
@@ -146,16 +147,6 @@ class Registrar
end
end
- def transfer
- authorize! :transfer, Depp::Domain
- if request.post? && params[:domain_name]
- @data = @domain.transfer(params)
- render 'transfer_index' and return unless response_ok?
- else
- render 'transfer_index'
- end
- end
-
def search_contacts
authorize! :create, Depp::Domain
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 2b25dc753..3883bbabf 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -54,14 +54,14 @@ class Ability
# can(:create, :epp_request)
# Epp::Domain
- can(:info, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || pw.blank? ? true : d.auth_info == pw }
+ can(:info, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || pw.blank? ? true : d.transfer_code == pw }
can(:check, Epp::Domain)
can(:create, Epp::Domain)
can(:renew, Epp::Domain) { |d| d.registrar_id == @user.registrar_id }
- 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 }
- can(:view_password, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.auth_info == pw }
- can(:delete, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.auth_info == pw }
+ can(:update, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.transfer_code == pw }
+ can(:transfer, Epp::Domain) { |d, pw| d.transfer_code == pw }
+ can(:view_password, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.transfer_code == pw }
+ can(:delete, Epp::Domain) { |d, pw| d.registrar_id == @user.registrar_id || d.transfer_code == pw }
# Epp::Contact
can(:info, Epp::Contact) { |c, pw| c.registrar_id == @user.registrar_id || pw.blank? ? true : c.auth_info == pw }
diff --git a/app/models/business_registry_cache.rb b/app/models/business_registry_cache.rb
index f73a5cfe8..2e7c06cc8 100644
--- a/app/models/business_registry_cache.rb
+++ b/app/models/business_registry_cache.rb
@@ -19,24 +19,17 @@ authentication using electronic ID. Association through a business organisation
=end
class BusinessRegistryCache < ActiveRecord::Base
-
- # 1. load domains by business
- # 2. load domains by person
- def associated_contacts
- contact_ids = Contact.where(ident_type: 'org', ident: associated_businesses, ident_country_code: 'EE').pluck(:id)
- contact_ids += Contact.where(ident_type: 'priv', ident: ident, ident_country_code: ident_country_code).pluck(:id)
- contact_ids
- end
-
def associated_domain_ids
+ contact_ids = Contact.where(ident_type: 'org', ident: associated_businesses, ident_country_code: ident_country_code).pluck(:id)
+ contact_ids += Contact.where(ident_type: 'priv', ident: ident, ident_country_code: ident_country_code).pluck(:id)
domain_ids = []
- contact_ids = associated_contacts
-
unless contact_ids.blank?
domain_ids = DomainContact.distinct.where(contact_id: contact_ids).pluck(:domain_id)
end
+ domain_ids += Domain.where(registrant_id: contact_ids).pluck(:id)
+
domain_ids
end
@@ -69,15 +62,5 @@ class BusinessRegistryCache < ActiveRecord::Base
def business_registry
Soap::Arireg.new
end
-
- def purge
- STDOUT << "#{Time.zone.now.utc} - Starting Purge of old BusinessRegistry data from cache\n" unless Rails.env.test?
- purged = 0
- BusinessRegistryCache.where('retrieved_on < ?',
- Time.zone.now < Setting.days_to_keep_business_registry_cache.days).each do |br|
- br.destroy and purged += 1
- end
- STDOUT << "#{Time.zone.now.utc} - Finished purging #{purged} old BusinessRegistry cache items\n" unless Rails.env.test?
- end
end
end
diff --git a/app/models/concerns/contact/transferable.rb b/app/models/concerns/contact/transferable.rb
new file mode 100644
index 000000000..e280adfae
--- /dev/null
+++ b/app/models/concerns/contact/transferable.rb
@@ -0,0 +1,28 @@
+module Concerns::Contact::Transferable
+ extend ActiveSupport::Concern
+
+ included do
+ validates :auth_info, presence: true
+ after_initialize :generate_auth_info, if: 'new_record? && auth_info.blank?'
+ end
+
+ def transfer(new_registrar)
+ new_contact = self.dup
+ new_contact.registrar = new_registrar
+ new_contact.original = self
+ new_contact.code = nil
+ new_contact.regenerate_code
+ new_contact.regenerate_auth_info
+ new_contact.remove_address unless self.class.address_processing?
+ new_contact.save!
+ new_contact
+ end
+
+ protected
+
+ def generate_auth_info
+ self.auth_info = SecureRandom.hex(11)
+ end
+
+ alias_method :regenerate_auth_info, :generate_auth_info
+end
diff --git a/app/models/concerns/domain/transferable.rb b/app/models/concerns/domain/transferable.rb
new file mode 100644
index 000000000..62b70a71b
--- /dev/null
+++ b/app/models/concerns/domain/transferable.rb
@@ -0,0 +1,68 @@
+module Concerns::Domain::Transferable
+ extend ActiveSupport::Concern
+
+ included do
+ after_initialize :generate_transfer_code, if: 'new_record? && transfer_code.blank?'
+ end
+
+ def transfer(new_registrar)
+ old_registrar = registrar
+
+ self.registrar = new_registrar
+ regenerate_transfer_code
+
+ contact_codes = contacts.pluck(:code).sort.uniq
+ registrant_code = registrant.code
+
+ transaction do
+ old_registrar.messages.create!(
+ body: I18n.t('domain_transfer_was_approved', contacts: contact_codes, registrant: registrant_code),
+ attached_obj_id: id,
+ attached_obj_type: self.class.name
+ )
+
+ domain_transfers.create!(
+ transfer_requested_at: Time.zone.now,
+ old_registrar: old_registrar,
+ new_registrar: new_registrar
+ )
+
+ transfer_contacts(new_registrar)
+ save!
+ end
+ end
+
+ private
+
+ def generate_transfer_code
+ self.transfer_code = SecureRandom.hex
+ end
+
+ alias_method :regenerate_transfer_code, :generate_transfer_code
+
+ def transfer_contacts(new_registrar)
+ transfer_registrant(new_registrar)
+ transfer_domain_contacts(new_registrar)
+ end
+
+ def transfer_registrant(new_registrar)
+ return if registrant.registrar == new_registrar
+ self.registrant = registrant.transfer(new_registrar)
+ end
+
+ def transfer_domain_contacts(new_registrar)
+ copied_ids = []
+ contacts.each do |contact|
+ next if copied_ids.include?(contact.id) || contact.registrar == new_registrar
+
+ if registrant_id_was == contact.id # registrant was copied previously, do not copy it again
+ oc = OpenStruct.new(id: registrant_id)
+ else
+ oc = contact.transfer(new_registrar)
+ end
+
+ domain_contacts.where(contact_id: contact.id).update_all({ contact_id: oc.id }) # n+1 workaround
+ copied_ids << contact.id
+ end
+ end
+end
diff --git a/app/models/concerns/versions.rb b/app/models/concerns/versions.rb
index 49c4298f2..5e2bad90c 100644
--- a/app/models/concerns/versions.rb
+++ b/app/models/concerns/versions.rb
@@ -67,7 +67,7 @@ module Versions
map do |ver|
o = new(ver.object)
o.version_loader = ver
- ver.object_changes.to_h.each { |k, v| o[k]=v[-1] }
+ ver.object_changes.to_h.each { |k, v| o.public_send("#{k}=", v[-1]) }
o
end
not_in_history = where(id: (ids.to_a - from_history.map(&:id)))
diff --git a/app/models/contact.rb b/app/models/contact.rb
index 61a82ae0a..3024551f8 100644
--- a/app/models/contact.rb
+++ b/app/models/contact.rb
@@ -2,7 +2,9 @@ class Contact < ActiveRecord::Base
include Versions # version/contact_version.rb
include EppErrors
include UserEvents
+ include Concerns::Contact::Transferable
+ belongs_to :original, class_name: self.name
belongs_to :registrar, required: true
has_many :domain_contacts
has_many :domains, through: :domain_contacts
@@ -16,6 +18,7 @@ class Contact < ActiveRecord::Base
attr_accessor :legal_document_id
alias_attribute :kind, :ident_type
+ alias_attribute :copy_from_id, :original_id # Old attribute name; for PaperTrail
accepts_nested_attributes_for :legal_documents
@@ -43,7 +46,6 @@ class Contact < ActiveRecord::Base
before_validation :to_upcase_country_code
before_validation :strip_email
- before_create :generate_auth_info
before_update :manage_emails
composed_of :identifier,
@@ -79,7 +81,6 @@ class Contact < ActiveRecord::Base
PASSPORT = 'passport'
attr_accessor :deliver_emails
- attr_accessor :domain_transfer # hack but solves problem faster
#
# STATUSES
@@ -313,16 +314,6 @@ class Contact < ActiveRecord::Base
!org?
end
- def generate_auth_info
- return if @generate_auth_info_disabled
- return if auth_info.present?
- self.auth_info = SecureRandom.hex(11)
- end
-
- # def auth_info=(pw)
- # self[:auth_info] = pw if new_record?
- # end
-
def code=(code)
self[:code] = code if new_record? # cannot change code later
end
@@ -346,6 +337,8 @@ class Contact < ActiveRecord::Base
end
# rubocop:enable Metrics/CyclomaticComplexity
+ alias_method :regenerate_code, :generate_code
+
def country
Country.new(country_code)
end
diff --git a/app/models/depp/domain.rb b/app/models/depp/domain.rb
index 1351b2672..0032fd958 100644
--- a/app/models/depp/domain.rb
+++ b/app/models/depp/domain.rb
@@ -118,7 +118,7 @@ module Depp
current_user.request(epp_xml.transfer({
name: { value: params[:domain_name] },
- authInfo: { pw: { value: params[:password] } }
+ authInfo: { pw: { value: params[:transfer_code] } }
}, op, Domain.construct_custom_params_hash(params)))
end
diff --git a/app/models/depp/user.rb b/app/models/depp/user.rb
index 51ce3f682..b40d910e4 100644
--- a/app/models/depp/user.rb
+++ b/app/models/depp/user.rb
@@ -36,39 +36,6 @@ module Depp
Nokogiri::XML(e.response_xml.to_s).remove_namespaces!
end
- # rubocop:disable Metrics/AbcSize
- def repp_request(path, params = {})
- client_cert = File.read(ENV['cert_path'])
- client_key = File.read(ENV['key_path'])
-
- repp_url = Rails.env.test? ? 'http://localhost:8989/repp/v1/' : ENV['repp_url']
- uri = URI.parse("#{repp_url}#{path}")
- uri.query = URI.encode_www_form(params)
-
- req = Net::HTTP::Get.new(uri)
- req.basic_auth tag, password
-
- res = Net::HTTP.start(uri.hostname, uri.port,
- use_ssl: (uri.scheme == 'https'),
- verify_mode: OpenSSL::SSL::VERIFY_NONE,
- cert: OpenSSL::X509::Certificate.new(client_cert),
- key: OpenSSL::PKey::RSA.new(client_key)) do |http|
- http.request(req)
- end
-
- ret = OpenStruct.new(code: res.code)
- ret.parsed_body = JSON.parse(res.body) if res.body.present?
-
- if ret.parsed_body && ret.parsed_body['error']
- ret.message = ret.parsed_body['error']
- else
- ret.message = res.message
- end
-
- ret
- end
- # rubocop:enable Metrics/AbcSize
-
private
# rubocop:disable Metrics/AbcSize
diff --git a/app/models/domain.rb b/app/models/domain.rb
index 6d16d617f..31ba838f2 100644
--- a/app/models/domain.rb
+++ b/app/models/domain.rb
@@ -6,6 +6,7 @@ class Domain < ActiveRecord::Base
include Concerns::Domain::Activatable
include Concerns::Domain::ForceDelete
include Concerns::Domain::Deletable
+ include Concerns::Domain::Transferable
has_paper_trail class_name: "DomainVersion", meta: { children: :children_log }
@@ -15,6 +16,7 @@ class Domain < ActiveRecord::Base
alias_attribute :on_hold_time, :outzone_at
alias_attribute :outzone_time, :outzone_at
+ alias_attribute :auth_info, :transfer_code # Old attribute name; for PaperTrail
# TODO: whois requests ip whitelist for full info for own domains and partial info for other domains
# TODO: most inputs should be trimmed before validatation, probably some global logic?
@@ -79,9 +81,7 @@ class Domain < ActiveRecord::Base
self.status_notes = {} if status_notes.nil?
end
- before_create :generate_auth_info
before_create -> { self.reserved = in_reserved_list?; nil }
-
before_save :manage_automatic_statuses
before_save :touch_always_version
def touch_always_version
@@ -105,6 +105,7 @@ class Domain < ActiveRecord::Base
validates :name_dirty, domain_name: true, uniqueness: true
validates :puny_label, length: { maximum: 63 }
validates :period, presence: true, numericality: { only_integer: true }
+ validates :transfer_code, presence: true
validate :validate_reservation
def validate_reservation
@@ -497,19 +498,6 @@ class Domain < ActiveRecord::Base
Registrant.find_by(id: pending_json['new_registrant_id'])
end
- def generate_auth_info
- return if auth_info.present?
- generate_auth_info!
- end
-
- # rubocop:disable Lint/Loop
- def generate_auth_info!
- begin
- self.auth_info = SecureRandom.hex
- end while self.class.exists?(auth_info: auth_info)
- end
- # rubocop:enable Lint/Loop
-
def set_graceful_expired
self.outzone_at = expire_time + self.class.expire_warning_period
self.delete_at = outzone_at + self.class.redemption_grace_period
@@ -672,6 +660,12 @@ class Domain < ActiveRecord::Base
pending_json['new_registrant_id']
end
+ def as_json(_options)
+ hash = super
+ hash['auth_info'] = hash.delete('transfer_code') # API v1 requirement
+ hash
+ end
+
def self.to_csv
CSV.generate do |csv|
csv << column_names
diff --git a/app/models/domain_transfer.rb b/app/models/domain_transfer.rb
index adcd10e50..6dd539bb8 100644
--- a/app/models/domain_transfer.rb
+++ b/app/models/domain_transfer.rb
@@ -1,16 +1,13 @@
class DomainTransfer < ActiveRecord::Base
- include Versions # version/domain_transfer_version.rb
belongs_to :domain
- belongs_to :transfer_from, class_name: 'Registrar'
- belongs_to :transfer_to, class_name: 'Registrar'
+ belongs_to :old_registrar, class_name: 'Registrar'
+ belongs_to :new_registrar, class_name: 'Registrar'
PENDING = 'pending'
CLIENT_APPROVED = 'clientApproved'
- CLIENT_CANCELLED = 'clientCancelled'
CLIENT_REJECTED = 'clientRejected'
SERVER_APPROVED = 'serverApproved'
- SERVER_CANCELLED = 'serverCancelled'
before_create :set_wait_until
def set_wait_until
@@ -39,20 +36,8 @@ class DomainTransfer < ActiveRecord::Base
status == PENDING
end
- def approve_as_client
- transaction do
- self.status = DomainTransfer::CLIENT_APPROVED
- self.transferred_at = Time.zone.now
- save
-
- domain.generate_auth_info
- domain.registrar = transfer_to
- domain.save(validate: false)
- end
- end
-
def notify_losing_registrar(contacts, registrant)
- transfer_from.messages.create!(
+ old_registrar.messages.create!(
body: I18n.t('domain_transfer_was_approved', contacts: contacts, registrant: registrant),
attached_obj_id: id,
attached_obj_type: self.class.to_s
diff --git a/app/models/epp/domain.rb b/app/models/epp/domain.rb
index 997c77fc5..969d9a9bc 100644
--- a/app/models/epp/domain.rb
+++ b/app/models/epp/domain.rb
@@ -100,7 +100,7 @@ class Epp::Domain < Domain
[:puny_label, :too_long, { obj: 'name', val: name_puny }]
],
'2201' => [ # Authorisation error
- [:auth_info, :wrong_pw]
+ [:transfer_code, :wrong_pw]
],
'2202' => [
[:base, :invalid_auth_information_reserved]
@@ -182,7 +182,7 @@ class Epp::Domain < Domain
# at[:domain_statuses_attributes] = domain_statuses_attrs(frame, action)
pw = frame.css('authInfo > pw').text
- at[:auth_info] = pw if pw.present?
+ at[:transfer_code] = pw if pw.present?
if new_record?
dnskey_frame = frame.css('extension create')
@@ -641,47 +641,6 @@ class Epp::Domain < Domain
end
end
- # TODO: Eager load problems here. Investigate how it's possible not to query contact again
- # Check if versioning works with update_column
- def transfer_contacts(registrar_id)
- transfer_registrant(registrar_id)
- transfer_domain_contacts(registrar_id)
- end
-
- def copy_and_transfer_contact(contact_id, registrar_id)
- c = Contact.find(contact_id) # n+1 workaround
- oc = c.deep_clone
- oc.code = nil
- oc.registrar_id = registrar_id
- oc.copy_from_id = c.id
- oc.generate_code
- oc.domain_transfer = true
- oc.remove_address unless Contact.address_processing?
- oc.save!(validate: false)
- oc
- end
-
- def transfer_registrant(registrar_id)
- return if registrant.registrar_id == registrar_id
- self.registrant_id = copy_and_transfer_contact(registrant_id, registrar_id).id
- end
-
- def transfer_domain_contacts(registrar_id)
- copied_ids = []
- contacts.each do |c|
- next if copied_ids.include?(c.id) || c.registrar_id == registrar_id
-
- if registrant_id_was == c.id # registrant was copied previously, do not copy it again
- oc = OpenStruct.new(id: registrant_id)
- else
- oc = copy_and_transfer_contact(c.id, registrar_id)
- end
-
- domain_contacts.where(contact_id: c.id).update_all({ contact_id: oc.id }) # n+1 workaround
- copied_ids << c.id
- end
- end
-
# rubocop: enable Metrics/PerceivedComplexity
# rubocop: enable Metrics/CyclomaticComplexity
# rubocop: disable Metrics/MethodLength
@@ -707,8 +666,8 @@ class Epp::Domain < Domain
transaction do
dt = domain_transfers.create!(
transfer_requested_at: Time.zone.now,
- transfer_to: current_user.registrar,
- transfer_from: registrar
+ old_registrar: registrar,
+ new_registrar: current_user.registrar
)
if dt.pending?
@@ -720,9 +679,9 @@ class Epp::Domain < Domain
end
if dt.approved?
- transfer_contacts(current_user.registrar_id)
+ transfer_contacts(current_user.registrar)
dt.notify_losing_registrar(old_contact_codes, old_registrant_code)
- generate_auth_info!
+ regenerate_transfer_code
self.registrar = current_user.registrar
end
@@ -737,7 +696,7 @@ class Epp::Domain < Domain
def approve_transfer(frame, current_user)
pt = pending_transfer
- if current_user.registrar != pt.transfer_from
+ if current_user.registrar != pt.old_registrar
throw :epp_error, {
msg: I18n.t('transfer_can_be_approved_only_by_current_registrar'),
code: '2304'
@@ -750,9 +709,9 @@ class Epp::Domain < Domain
transferred_at: Time.zone.now
)
- transfer_contacts(pt.transfer_to_id)
- generate_auth_info
- self.registrar = pt.transfer_to
+ transfer_contacts(pt.new_registrar)
+ regenerate_transfer_code
+ self.registrar = pt.new_registrar
attach_legal_document(self.class.parse_legal_document_from_frame(frame))
save!(validate: false)
@@ -763,7 +722,7 @@ class Epp::Domain < Domain
def reject_transfer(frame, current_user)
pt = pending_transfer
- if current_user.registrar != pt.transfer_from
+ if current_user.registrar != pt.old_registrar
throw :epp_error, {
msg: I18n.t('transfer_can_be_rejected_only_by_current_registrar'),
code: '2304'
@@ -872,7 +831,7 @@ class Epp::Domain < Domain
# For domain transfer
def authenticate(pw)
- errors.add(:auth_info, :wrong_pw) if pw != auth_info
+ errors.add(:transfer_code, :wrong_pw) if pw != transfer_code
errors.empty?
end
diff --git a/app/models/registrar.rb b/app/models/registrar.rb
index 418277b8a..7646b2ceb 100644
--- a/app/models/registrar.rb
+++ b/app/models/registrar.rb
@@ -140,8 +140,8 @@ class Registrar < ActiveRecord::Base
def domain_transfers
at = DomainTransfer.arel_table
DomainTransfer.where(
- at[:transfer_to_id].eq(id).or(
- at[:transfer_from_id].eq(id)
+ at[:new_registrar_id].eq(id).or(
+ at[:old_registrar_id].eq(id)
)
)
end
diff --git a/app/models/version/domain_transfer_version.rb b/app/models/version/domain_transfer_version.rb
deleted file mode 100644
index 7005337ba..000000000
--- a/app/models/version/domain_transfer_version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class DomainTransferVersion < PaperTrail::Version
- include VersionSession
- self.table_name = :log_domain_transfers
- self.sequence_name = :log_domain_transfers_id_seq
-end
diff --git a/app/presenters/domain_presenter.rb b/app/presenters/domain_presenter.rb
index e81aede33..11a066b7a 100644
--- a/app/presenters/domain_presenter.rb
+++ b/app/presenters/domain_presenter.rb
@@ -1,5 +1,5 @@
class DomainPresenter
- delegate :name, :registrant_name, :registrant_id, :registrant_code, to: :domain
+ delegate :name, :transfer_code, :registrant_name, :registrant_id, :registrant_code, to: :domain
def initialize(domain:, view:)
@domain = domain
diff --git a/app/presenters/registrar/domain_list_csv_presenter.rb b/app/presenters/registrar/domain_list_csv_presenter.rb
index d6f0c46bd..5b47cfdcf 100644
--- a/app/presenters/registrar/domain_list_csv_presenter.rb
+++ b/app/presenters/registrar/domain_list_csv_presenter.rb
@@ -19,6 +19,7 @@ class Registrar::DomainListCSVPresenter
def header
columns = %w(
domain_name
+ transfer_code
registrant_name
registrant_code
expire_time
@@ -32,9 +33,10 @@ class Registrar::DomainListCSVPresenter
def domain_to_row(domain:)
row = []
row[0] = domain.name
- row[1] = domain.registrant_name
- row[2] = domain.registrant_code
- row[3] = domain.expire_date
+ row[1] = domain.transfer_code
+ row[2] = domain.registrant_name
+ row[3] = domain.registrant_code
+ row[4] = domain.expire_date
row
CSV::Row.new([], row)
diff --git a/app/views/admin/contact_versions/index.haml b/app/views/admin/contact_versions/index.haml
index 31d8f84e3..0367db3be 100644
--- a/app/views/admin/contact_versions/index.haml
+++ b/app/views/admin/contact_versions/index.haml
@@ -58,7 +58,7 @@
- @versions.each do |version|
- if version
- contact = Contact.new(version.object.to_h)
- - version.object_changes.to_h.each{|k,v| contact[k]=v.last}
+ - version.object_changes.to_h.each { |k,v| contact.public_send("#{k}=", v.last) }
%tr
%td= link_to(contact.name, admin_contact_version_path(version.id))
diff --git a/app/views/admin/contact_versions/show.haml b/app/views/admin/contact_versions/show.haml
index 82a96daba..e19326fca 100644
--- a/app/views/admin/contact_versions/show.haml
+++ b/app/views/admin/contact_versions/show.haml
@@ -1,5 +1,5 @@
- contact = Contact.new(@version.object.to_h)
-- @version.object_changes.to_h.each{|k,v| contact[k]=v.last}
+- @version.object_changes.to_h.each { |k,v| contact.public_send("#{k}=", v.last ) }
= render 'shared/title', name: contact.name
.row
diff --git a/app/views/admin/contacts/_form.haml b/app/views/admin/contacts/_form.haml
index d1538ab4e..2e0553a98 100644
--- a/app/views/admin/contacts/_form.haml
+++ b/app/views/admin/contacts/_form.haml
@@ -3,9 +3,7 @@
= render 'shared/errors', object: contact
.row
.col-md-8
- .tab-content{style:'margin-top: 20px;'}
- #general-tab.tab-pane.active
- = render 'admin/shared/form/statuses', f: f,
+ = render 'admin/shared/form/statuses', f: f,
model: 'contact',
admin_statuses_map: Contact.admin_statuses_map,
disabled_statuses: Contact::STATUSES - Contact.admin_statuses,
diff --git a/app/views/admin/domain_versions/archive.haml b/app/views/admin/domain_versions/archive.haml
index 2a22284e9..5e6d8eaa9 100644
--- a/app/views/admin/domain_versions/archive.haml
+++ b/app/views/admin/domain_versions/archive.haml
@@ -56,7 +56,7 @@
- @versions.each do |version|
- if version
- domain = Domain.new(version.object.to_h)
- - version.object_changes.to_h.each{|k,v| domain[k]=v.last}
+ - version.object_changes.to_h.each{|k,v| domain.public_send("#{k}=", v.last) }
%tr
%td= link_to(domain.name, admin_domain_version_path(version.id))
@@ -66,7 +66,7 @@
- else
- contact = Contact.all_versions_for([domain.registrant_id], version.created_at).first
- if contact.nil? && ver = ContactVersion.where(item_id: domain.registrant_id).last
- - contact = Contact.new(ver.object.to_h.merge(ver.object_changes.to_h.each_with_object({}){|(k,v), o| o[k]=v.last } ))
+ - contact = Contact.new(ver.object.to_h.merge(ver.object_changes.to_h.each_with_object({}){|(k,v), o| o.public_send("#{k}=", v.last) } ))
= contact.try(:name)
= " ".html_safe
= "(#{t(:deleted)})"
diff --git a/app/views/admin/domain_versions/show.haml b/app/views/admin/domain_versions/show.haml
index d0863eed5..1a17ba3f9 100644
--- a/app/views/admin/domain_versions/show.haml
+++ b/app/views/admin/domain_versions/show.haml
@@ -1,5 +1,5 @@
- domain = Domain.new(@version.object.to_h)
-- @version.object_changes.to_h.each{|k,v| domain[k]=v.last}
+- @version.object_changes.to_h.each{|k,v| domain.public_send("#{k}=", v.last) }
- if @version
- children = HashWithIndifferentAccess.new(@version.children)
diff --git a/app/views/admin/domains/_domain.html.erb b/app/views/admin/domains/_domain.html.erb
new file mode 100644
index 000000000..6431833e6
--- /dev/null
+++ b/app/views/admin/domains/_domain.html.erb
@@ -0,0 +1,6 @@
+
+ | <%= link_to domain, admin_domain_path(domain) %> |
+ <%= link_to domain.registrant, admin_registrant_path(domain.registrant) %> |
+ <%= l domain.expire_time %> |
+ <%= link_to domain.registrar, admin_registrar_path(domain.registrar) %> |
+
diff --git a/app/views/admin/domains/_form.haml b/app/views/admin/domains/_form.haml
index 087930c58..93b6be600 100644
--- a/app/views/admin/domains/_form.haml
+++ b/app/views/admin/domains/_form.haml
@@ -4,9 +4,7 @@
%hr
.row
.col-md-8
- .tab-content{style:'margin-top: 20px;'}
- #general-tab.tab-pane.active
- = render 'admin/shared/form/statuses', f: f,
+ = render 'admin/shared/form/statuses', f: f,
model: 'domain',
admin_statuses_map: DomainStatus.admin_statuses_map,
disabled_statuses: DomainStatus::STATUSES - DomainStatus.admin_statuses,
diff --git a/app/views/admin/domains/_search_form.html.erb b/app/views/admin/domains/_search_form.html.erb
new file mode 100644
index 000000000..bc317ea0b
--- /dev/null
+++ b/app/views/admin/domains/_search_form.html.erb
@@ -0,0 +1,70 @@
+<%= search_form_for [:admin, @q], html: { class: 'search-form', autocomplete: 'off' } do |f| %>
+
+
+
+ <%= f.label :name, for: nil %>
+ <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
+
+
+
+
+ <%= f.label :registrant_ident, for: nil %>
+ <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
+
+
+
+
+ <%= f.label :contact_ident, for: nil %>
+ <%= f.search_field :contacts_ident_eq, class: 'form-control', placeholder: t(:contact_ident) %>
+
+
+
+
+ <%= f.label :nameserver_hostname, for: nil %>
+ <%= f.search_field :nameservers_hostname_eq, class: 'form-control', placeholder: t(:nameserver_hostname) %>
+
+
+
+
+
+ <%= f.label :registrar_name, for: nil %>
+ <%= f.select :registrar_id_eq, Registrar.all.map { |x| [x, x.id] }, { include_blank: true }, class: 'form-control selectize' %>
+
+
+
+
+ <%= f.label :valid_to_from, for: nil %>
+ <%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) %>
+
+
+
+
+ <%= f.label :valid_to_until, for: nil %>
+ <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
+
+
+
+
+
+ <%= label_tag :status, nil, for: nil %>
+ <%= select_tag :statuses_contains, options_for_select(DomainStatus::STATUSES, params[:statuses_contains]), { multiple: true, class: 'form-control js-combobox' } %>
+
+
+
+
+ <%= label_tag :results_per_page, nil, for: nil %>
+ <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+
+
+
+
+ <%= link_to t('.reset_btn'), admin_domains_path, class: 'btn btn-default' %>
+
+
+
+ <%= render 'search_form' %>
+
+
+
+
+
+
+
+ | <%= sort_link(@q, 'name') %> |
+ <%= sort_link(@q, 'registrant_name', Registrant.model_name.human) %> |
+ <%= sort_link(@q, 'valid_to', t(:valid_to)) %> |
+ <%= sort_link(@q, 'registrar_name', Registrar.model_name.human) %> |
+
+
+
+
+ <%= render @domains %>
+
+
+
+
+
+
+ <%= paginate @domains %>
+
+
+
+
+
+
+
+
+ <%= t(:general) %>
+
+
+
+
+
+ - <%= t(:name) %>
+ - <%= @domain.name %>
+
+ - <%= t(:registered_at) %>
+ - <%= l(@domain.registered_at) %>
+
+ - <%= t(:registrar_name) %>
+ - <%= link_to(@domain.registrar, admin_registrar_path(@domain.registrar)) %>
+
+ - <%= Domain.human_attribute_name :transfer_code %>
+ -
+ <%= tag :input, type: 'text', value: @domain.transfer_code, readonly: true,
+ class: 'form-control input-sm' %>
+
+
+ - <%= t(:valid_from) %>
+ - <%= l(@domain.valid_from) %>
+
+ - <%= t(:valid_to) %>
+ - <%= l(@domain.valid_to) %>
+
+ - <%= t('.outzone_time') %>
+ - <%= l(@domain.outzone_at) %>
+
+ - <%= t('.delete_time') %>
+ - <%= l(@domain.delete_at) %>
+
+ - <%= t('.force_delete_time') %>
+ - <%= l(@domain.force_delete_at) %>
+
+
+
+ <%= render 'shared/flash' %>
+ <% if depp_controller? %>
+ <%= render 'registrar/shared/epp_results' %>
+ <% end %>
+ <%= yield %>
+
+
+<%= javascript_include_tag 'registrar-manifest', async: true %>
+
+
diff --git a/app/views/registrant/domains/_domain.html.erb b/app/views/registrant/domains/_domain.html.erb
new file mode 100644
index 000000000..b3bf4d334
--- /dev/null
+++ b/app/views/registrant/domains/_domain.html.erb
@@ -0,0 +1,6 @@
+
+ | <%= link_to domain, registrant_domain_path(domain) %> |
+ <%= link_to domain.registrant.name, registrant_contact_path(domain.registrant) %> |
+ <%= l domain.expire_time %> |
+ <%= link_to domain.registrar, registrant_registrar_path(domain.registrar) %> |
+
diff --git a/app/views/registrant/domains/index.haml b/app/views/registrant/domains/index.haml
deleted file mode 100644
index 056abd885..000000000
--- a/app/views/registrant/domains/index.haml
+++ /dev/null
@@ -1,84 +0,0 @@
-= render 'shared/title', name: t(:domains)
-
-.row
- .col-md-12
- = search_form_for [:registrant, @q], html: { style: 'margin-bottom: 0;', class: 'js-form', autocomplete: 'off' } do |f|
- .row
- .col-md-3
- .form-group
- = f.label :name
- = f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name)
- .col-md-3
- .form-group
- = f.label t(:registrant_ident)
- = f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident)
- .row
- .col-md-3
- .form-group
- = f.label t(:valid_to_from)
- = f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
- .col-md-3
- .form-group
- = f.label t(:valid_to_until)
- = f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
- .col-md-3
- .form-group
- = label_tag t(:results_per_page)
- = text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page)
- .col-md-3{style: 'padding-top: 25px;'}
- %button.btn.btn-primary
-
- %span.glyphicon.glyphicon-search
-
- %button.btn.btn-default.js-reset-form
- = t(:clear_fields)
- .row
- .col-md-3
- .btn-group{:role => "group"}
- %button.btn.btn-default.dropdown-toggle{"aria-expanded" => "false", "aria-haspopup" => "true", "data-toggle" => "dropdown", :type => "button"}
- Download
- %span.caret
- %ul.dropdown-menu
- %li= link_to 'PDF', download_list_registrant_domains_path(q: params[:q], format: "pdf")
- %li= link_to 'CSV', download_list_registrant_domains_path(q: params[:q], format: "csv")
- .col-md-3
- .col-md-3
- .col-md-3
-
-
-
-%hr
-.row
- .col-md-12
- .table-responsive
- %table.table.table-hover.table-bordered.table-condensed
- %thead
- %tr
- %th{class: 'col-xs-2'}
- = sort_link(@q, 'name')
- %th{class: 'col-xs-2'}
- = sort_link(@q, 'registrant_name', t('.registrant'))
- %th{class: 'col-xs-2'}
- = sort_link(@q, 'valid_to', t(:valid_to))
- %th{class: 'col-xs-2'}
- = sort_link(@q, 'registrar_name', t(:registrar_name))
- %tbody
- - @domains.each do |x|
- %tr
- %td= link_to(x, registrant_domain_path(x))
- %td= link_to(x.registrant.name, registrant_contact_path(x.registrant)) if x.registrant
- %td= l(x.valid_to, format: :short)
- %td= link_to(x.registrar, registrant_registrar_path(x.registrar)) if x.registrar
-
- .row
- .col-md-6
- = paginate @domains
- .col-md-6.text-right
- .pagination
- = t(:result_count, count: @domains.total_count)
-
-:coffee
- $(".js-reset-form").on "click", (e) ->
- e.preventDefault();
- window.location = "#{registrant_domains_path}"
-
diff --git a/app/views/registrant/domains/index.html.erb b/app/views/registrant/domains/index.html.erb
new file mode 100644
index 000000000..43a9122eb
--- /dev/null
+++ b/app/views/registrant/domains/index.html.erb
@@ -0,0 +1,111 @@
+
+
+
+
+ <%= search_form_for [:registrant, @q], html: { class: 'search-form', autocomplete: 'off' } do |f| %>
+
+
+
+ <%= f.label :name, for: nil %>
+ <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control', placeholder: t(:name) %>
+
+
+
+
+ <%= f.label t(:registrant_ident), for: nil %>
+ <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
+
+
+
+
+
+
+ <%= f.label t(:valid_to_from), for: nil %>
+ <%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from) %>
+
+
+
+
+ <%= f.label t(:valid_to_until), for: nil %>
+ <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until) %>
+
+
+
+
+ <%= label_tag t(:results_per_page) %>
+ <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control', placeholder: t(:results_per_page) %>
+
+
+
+
+
+ <%= link_to(t('.reset_btn'), registrant_domains_path, class: 'btn btn-default') %>
+
+
+
+ <% end %>
+
+
+
+
+
+
+
+
+ |
+ <%= sort_link(@q, 'name') %>
+ |
+
+ <%= sort_link(@q, 'registrant_name', t('.registrant')) %>
+ |
+
+ <%= sort_link(@q, 'valid_to', t(:valid_to)) %>
+ |
+
+ <%= sort_link(@q, 'registrar_name', t(:registrar_name)) %>
+ |
+
+
+
+
+ <%= render @domains %>
+
+
+
+
+
+ <%= paginate @domains %>
+
+
+
+
+
+
+
+ <%= t(:general) %>
+
+
+
+
+
+ - <%= t(:name) %>
+ - <%= @domain.name %>
+
+ - <%= t(:registered_at) %>
+ - <%= l(@domain.registered_at) %>
+
+ - <%= t(:registrar_name) %>
+ - <%= link_to(@domain.registrar, registrant_registrar_path(@domain.registrar)) %>
+
+ - <%= Domain.human_attribute_name :transfer_code %>
+ -
+ <%= tag :input, type: 'text', value: @domain.transfer_code, readonly: true,
+ class: 'form-control input-sm' %>
+
+
+ - <%= t(:valid_from) %>
+ - <%= l(@domain.valid_from) %>
+
+ - <%= t(:valid_to) %>
+ - <%= l(@domain.valid_to) %>
+
+ - <%= t(:outzone_at) %>
+ - <%= l(@domain.outzone_at) %>
+
+ - <%= t(:delete_at) %>
+ - <%= l(@domain.delete_at) %>
+
+ - <%= t(:force_delete_at) %>
+ - <%= l(@domain.force_delete_at) %>
+
+
+
+
+ <%= render 'registrant/domains/partials/general' %>
+
+
+ <%= render 'registrant/domains/partials/owner' %>
+
+
+
+ <%= render 'registrant/domains/partials/tech_contacts' %>
+
+
+
+ <%= render 'registrant/domains/partials/admin_contacts' %>
+
+
+
+ <%= render 'registrant/domains/partials/statuses' %>
+
+
+
+ <%= render 'registrant/domains/partials/nameservers' %>
+
+
+
+ <%= render 'registrant/domains/partials/dnskeys' %>
+
+
+
+ <%= render 'registrant/domains/partials/keyrelays' %>
+
+
+
+
+
+
+ <%= t(:result) %>
+
+
+
+
+ - <%= t(:domain_name) %>
+ - <%= @data.css('name').text %>
+
+ <% @data.css('trnData').children.each do |x| %>
+ <% next if x.blank? %>
+ - <%= t(x.name) %>
+ - <%= x.text %>
+ <% end %>
+
+
+
+
+
+
+ <% @api_errors.each do |error| %>
+ - <%= error[:title] %>
+ <% end %>
+
+
+
+
+
+
+
+ <%= render 'registrar/domain_transfers/form/single' %>
+
+
+
+ <%= render 'registrar/domain_transfers/form/batch' %>
+
+
+
+
+ | <%= link_to truncate(domain.name), info_registrar_domains_path(domain_name: domain.name) %> |
+ <%= link_to domain.registrant, registrar_contact_path(id: domain.registrant.code) %> |
+ <%= l domain.expire_time %> |
+
+ <%= link_to t('.edit_btn'), edit_registrar_domains_path(domain_name: domain.name),
+ class: 'btn btn-primary btn-xs' %>
+ <%= link_to t('.renew_btn'), renew_registrar_domains_path(domain_name: domain.name),
+ class: 'btn btn-default btn-xs' %>
+ <%= link_to t('.delete_btn'), delete_registrar_domains_path(domain_name: domain.name),
+ class: 'btn btn-default btn-xs' %>
+ |
+
diff --git a/app/views/registrar/domains/_search_form.html.erb b/app/views/registrar/domains/_search_form.html.erb
new file mode 100644
index 000000000..b494e0d8d
--- /dev/null
+++ b/app/views/registrar/domains/_search_form.html.erb
@@ -0,0 +1,88 @@
+<%= search_form_for [:registrar, @q], html: { class: 'search-form', autocomplete: 'off' } do |f| %>
+
+
+
+ <%= f.label :name, for: nil %>
+ <%= f.search_field :name_matches, value: params[:q][:name_matches], class: 'form-control',
+ placeholder: t(:name) %>
+
+
+
+
+
+ <%= f.label :registrant_ident, for: nil %>
+ <%= f.search_field :registrant_ident_eq, class: 'form-control', placeholder: t(:registrant_ident) %>
+
+
+
+
+
+ <%= f.label :contact_ident, for: nil %>
+ <%= f.search_field :contacts_ident_eq, class: 'form-control', placeholder: t(:contact_ident) %>
+
+
+
+
+
+ <%= f.label :nameserver_hostname, for: nil %>
+ <%= f.search_field :nameservers_hostname_eq, class: 'form-control',
+ placeholder: t(:nameserver_hostname) %>
+
+
+
+
+
+ <%= label_tag :status, nil, for: nil %>
+ <%= select_tag :statuses_contains,
+ options_for_select(DomainStatus::STATUSES, params[:statuses_contains]),
+ { multiple: true, class: 'form-control js-combobox' } %>
+
+
+
+
+
+ <%= f.label :valid_to_from, for: nil %>
+ <%= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq],
+ class: 'form-control js-datepicker',
+ placeholder: t(:valid_to_from) %>
+
+
+
+
+
+ <%= f.label :valid_to_until, for: nil %>
+ <%= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq],
+ class: 'form-control js-datepicker',
+ placeholder: t(:valid_to_until) %>
+
+
+
+
+ <%= label_tag :results_per_page, nil, for: nil %>
+
+
+
+
+ <%= text_field_tag :results_per_page, params[:results_per_page], class: 'form-control',
+ placeholder: t(:results_per_page) %>
+
+
+
+
+
+ <%= button_tag t('.download_btn'), class: 'btn btn-primary export-domains-csv-btn',
+ formaction: registrar_domains_path(format: 'csv') %>
+ <%= link_to t('.reset_btn'), registrar_domains_path, class: 'btn btn-default' %>
+
+
+
+ <%= render 'search_form' %>
+
+
+
+
+
+
+
+ |
+ <%= sort_link(@q, 'name') %>
+ |
+
+ <%= sort_link @q, 'registrant_name', Registrant.model_name.human %>
+ |
+
+ <%= sort_link @q, 'valid_to', Domain.human_attribute_name(:expire_time) %>
+ |
+ |
+
+
+
+
+ <%= render @domains %>
+
+
+
+
+
+
+ <%= paginate @domains %>
+
+
+
+
+
+
+
+ <% if @data.css('result').first['code'] == '1000' %>
+
+
+ <%= render 'registrar/domains/partials/general' %>
+
+
+
+
+ <%= render 'registrar/domains/partials/contacts' %>
+
+
+
+
+ <%= render 'registrar/domains/partials/statuses' %>
+
+
+
+
+ <%= render 'registrar/domains/partials/nameservers' %>
+
+
+
+
+ <%= render 'registrar/domains/partials/dnskeys' %>
+
+
+ <% else %>
+
+
+
+ <%= t(:not_found) %>
+
+
+
+ <% end %>
+
+
+
+
+ <%= t(:general) %>
+
+
+
+
+
+ - <%= Domain.human_attribute_name :transfer_code %>
+ -
+ <% if @data.css('pw').text.present? %>
+ <%= tag(:input, type: 'text', value: @data.css('pw').text, readonly: true,
+ class: 'form-control input-sm') %>
+ <% end %>
+
+
+
+ <% if @data.css('pw').text.blank? %>
+ - <%= t(:registrar_name) %>
+ - <%= @data.css('clID').text %>
+ <% end %>
+
+ <% registrant = Contact.find_by_code(@data.css('registrant').text) %>
+ - <%= t('.registrant') %>
+ - <%= "#{registrant.name} (#{@data.css('registrant').text})" %>
+
+ - <%= t('.registered') %>
+ - <%= @data.css('crDate').text %>
+
+ - <%= t(:valid_to) %>
+ - <%= @data.css('exDate').text %>
+
+ - <%= t('.created') %>
+ - <%= @data.css('crDate').text %>
+
+ - <%= t('.updated') %>
+ - <%= @data.css('upDate').text %>
+
+
+