diff --git a/app/assets/stylesheets/admin-manifest.sass b/app/assets/stylesheets/admin-manifest.sass
index 0b7e9d8f7..8975faf71 100644
--- a/app/assets/stylesheets/admin-manifest.sass
+++ b/app/assets/stylesheets/admin-manifest.sass
@@ -5,10 +5,10 @@
//= require 'select2-bootstrap'
@import shared/fonts
@import shared/general
+@import forms
@import typeaheadjs
@import selectize
@import selectize.bootstrap3
// @import bootstrap-datepicker3
@import admin/admin
@import admin/bootstrap-dialog-fix
-
diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
new file mode 100644
index 000000000..c59a5e951
--- /dev/null
+++ b/app/assets/stylesheets/forms.scss
@@ -0,0 +1,7 @@
+input[type=number]::-webkit-inner-spin-button {
+ display: none;
+}
+
+input[type=number] {
+ -moz-appearance: textfield;
+}
diff --git a/app/controllers/admin/dns/zones_controller.rb b/app/controllers/admin/dns/zones_controller.rb
new file mode 100644
index 000000000..b38976283
--- /dev/null
+++ b/app/controllers/admin/dns/zones_controller.rb
@@ -0,0 +1,63 @@
+module Admin
+ module DNS
+ class ZonesController < AdminController
+ load_and_authorize_resource(class: DNS::Zone)
+ before_action :load_zone, only: %i[edit update destroy]
+
+ def index
+ @zones = ::DNS::Zone.all
+ end
+
+ def new
+ @zone = ::DNS::Zone.new
+ end
+
+ def create
+ @zone = ::DNS::Zone.new(zone_params)
+
+ if @zone.save
+ flash[:notice] = t('.created')
+ redirect_to_index
+ else
+ render :new
+ end
+ end
+
+ def edit
+ @zone = ::DNS::Zone.find(params[:id])
+ end
+
+ def update
+ if @zone.update(zone_params)
+ flash[:notice] = t('.updated')
+ redirect_to_index
+ else
+ render :edit
+ end
+ end
+
+ def destroy
+ @zone.destroy!
+ flash[:notice] = t('.destroyed')
+ redirect_to_index
+ end
+
+ private
+
+ def load_zone
+ @zone = ::DNS::Zone.find(params[:id])
+ end
+
+ def zone_params
+ params.require(:zone).permit(
+ :origin, :ttl, :refresh, :retry, :expire, :minimum_ttl, :email,
+ :master_nameserver, :ns_records, :a_records, :a4_records
+ )
+ end
+
+ def redirect_to_index
+ redirect_to admin_zones_url
+ end
+ end
+ end
+end
diff --git a/app/controllers/admin/zonefile_settings_controller.rb b/app/controllers/admin/zonefile_settings_controller.rb
deleted file mode 100644
index 34283d872..000000000
--- a/app/controllers/admin/zonefile_settings_controller.rb
+++ /dev/null
@@ -1,60 +0,0 @@
-class Admin::ZonefileSettingsController < AdminController
- load_and_authorize_resource
- before_action :set_zonefile_setting, only: [:update, :edit]
- def index
- @zonefile_settings = ZonefileSetting.all
- end
-
- def new
- @zonefile_setting = ZonefileSetting.new
- end
-
- def create
- @zonefile_setting = ZonefileSetting.new(zonefile_setting_params)
-
- if @zonefile_setting.save
- flash[:notice] = I18n.t('record_created')
- redirect_to admin_zonefile_settings_path
- else
- flash.now[:alert] = I18n.t('failed_to_create_record')
- render 'new'
- end
- end
-
- def edit
- @zonefile_setting = ZonefileSetting.find(params[:id])
- end
-
- def update
- if @zonefile_setting.update(zonefile_setting_params)
- flash[:notice] = I18n.t('record_updated')
- redirect_to admin_zonefile_settings_path
- else
- flash.now[:alert] = I18n.t('failed_to_update_record')
- render 'edit'
- end
- end
-
- def destroy
- if @zonefile_setting.destroy
- flash[:notice] = I18n.t('record_deleted')
- redirect_to admin_zonefile_settings_path
- else
- flash.now[:alert] = I18n.t('failed_to_delete_record')
- render 'edit'
- end
- end
-
- private
-
- def set_zonefile_setting
- @zonefile_setting = ZonefileSetting.find(params[:id])
- end
-
- def zonefile_setting_params
- params.require(:zonefile_setting).permit(
- :origin, :ttl, :refresh, :retry, :expire, :minimum_ttl, :email,
- :master_nameserver, :ns_records, :a_records, :a4_records
- )
- end
-end
diff --git a/app/controllers/admin/zonefiles_controller.rb b/app/controllers/admin/zonefiles_controller.rb
index 1c0fed936..20d57dc90 100644
--- a/app/controllers/admin/zonefiles_controller.rb
+++ b/app/controllers/admin/zonefiles_controller.rb
@@ -3,7 +3,7 @@ class Admin::ZonefilesController < ApplicationController
# TODO: Refactor this
def create
- if ZonefileSetting.origins.include?(params[:origin])
+ if DNS::Zone.origins.include?(params[:origin])
@zonefile = ActiveRecord::Base.connection.execute(
"select generate_zonefile('#{params[:origin]}')"
diff --git a/app/controllers/registrar/account_activities_controller.rb b/app/controllers/registrar/account_activities_controller.rb
index 2b3fc7951..17ac16e6c 100644
--- a/app/controllers/registrar/account_activities_controller.rb
+++ b/app/controllers/registrar/account_activities_controller.rb
@@ -1,28 +1,30 @@
-class Registrar::AccountActivitiesController < RegistrarController
- load_and_authorize_resource
+class Registrar
+ class AccountActivitiesController < BaseController
+ load_and_authorize_resource
- def index # rubocop: disable Metrics/AbcSize
- params[:q] ||= {}
- account = current_user.registrar.cash_account
+ def index # rubocop: disable Metrics/AbcSize
+ params[:q] ||= {}
+ account = current_user.registrar.cash_account
- ca_cache = params[:q][:created_at_lteq]
- begin
- end_time = params[:q][:created_at_lteq].try(:to_date)
- params[:q][:created_at_lteq] = end_time.try(:end_of_day)
- rescue
- logger.warn('Invalid date')
- end
-
- @q = account.activities.includes(:invoice).search(params[:q])
- @q.sorts = 'id desc' if @q.sorts.empty?
-
- respond_to do |format|
- format.html { @account_activities = @q.result.page(params[:page]) }
- format.csv do
- send_data @q.result.to_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv"
+ ca_cache = params[:q][:created_at_lteq]
+ begin
+ end_time = params[:q][:created_at_lteq].try(:to_date)
+ params[:q][:created_at_lteq] = end_time.try(:end_of_day)
+ rescue
+ logger.warn('Invalid date')
end
- end
- params[:q][:created_at_lteq] = ca_cache
+ @q = account.activities.includes(:invoice).search(params[:q])
+ @q.sorts = 'id desc' if @q.sorts.empty?
+
+ respond_to do |format|
+ format.html { @account_activities = @q.result.page(params[:page]) }
+ format.csv do
+ send_data @q.result.to_csv, filename: "account_activities_#{Time.zone.now.to_formatted_s(:number)}.csv"
+ end
+ end
+
+ params[:q][:created_at_lteq] = ca_cache
+ end
end
end
diff --git a/app/controllers/registrar/base_controller.rb b/app/controllers/registrar/base_controller.rb
new file mode 100644
index 000000000..c91f2e075
--- /dev/null
+++ b/app/controllers/registrar/base_controller.rb
@@ -0,0 +1,40 @@
+class Registrar
+ class BaseController < ApplicationController
+ before_action :authenticate_user!, :check_ip
+
+ include Registrar::ApplicationHelper
+
+ helper_method :depp_controller?
+
+ def depp_controller?
+ false
+ end
+
+ def check_ip
+ return unless current_user
+ unless current_user.is_a? ApiUser
+ sign_out(current_user)
+ return
+ end
+ return if Rails.env.development?
+ registrar_ip_whitelisted = current_user.registrar.registrar_ip_white?(request.ip)
+
+ return if registrar_ip_whitelisted
+ flash[:alert] = t('ip_is_not_whitelisted')
+ sign_out(current_user)
+ redirect_to registrar_login_path and return
+ end
+
+ helper_method :head_title_sufix
+
+ def head_title_sufix
+ t(:registrar_head_title_sufix)
+ end
+
+ protected
+
+ def current_ability
+ @current_ability ||= Ability.new(current_user, request.remote_ip)
+ end
+ end
+end
diff --git a/app/controllers/registrar/contacts_controller.rb b/app/controllers/registrar/contacts_controller.rb
index 3b3f1b293..b927df1a8 100644
--- a/app/controllers/registrar/contacts_controller.rb
+++ b/app/controllers/registrar/contacts_controller.rb
@@ -1,142 +1,144 @@
-class Registrar::ContactsController < Registrar::DeppController # EPP controller
- before_action :init_epp_contact
- helper_method :address_processing?
+class Registrar
+ class ContactsController < DeppController
+ before_action :init_epp_contact
+ helper_method :address_processing?
- def index
- authorize! :view, Depp::Contact
+ def index
+ authorize! :view, Depp::Contact
- params[:q] ||= {}
- params[:q].delete_if { |_k, v| v.blank? }
+ params[:q] ||= {}
+ params[:q].delete_if { |_k, v| v.blank? }
- search_params = params[:q].deep_dup
+ search_params = params[:q].deep_dup
- if search_params[:domain_contacts_type_in].is_a?(Array) && search_params[:domain_contacts_type_in].delete('registrant')
- search_params[:registrant_domains_id_not_null] = 1
- end
+ if search_params[:domain_contacts_type_in].is_a?(Array) && search_params[:domain_contacts_type_in].delete('registrant')
+ search_params[:registrant_domains_id_not_null] = 1
+ end
- if search_params.length == 1 && search_params[:name_matches].present?
- @contacts = Contact.find_by(name: search_params[:name_matches])
- end
+ if search_params.length == 1 && search_params[:name_matches].present?
+ @contacts = Contact.find_by(name: search_params[:name_matches])
+ end
- if params[:statuses_contains]
- contacts = current_user.registrar.contacts.includes(:registrar).where(
+ if params[:statuses_contains]
+ contacts = current_user.registrar.contacts.includes(:registrar).where(
"contacts.statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
- )
- else
+ )
+ else
+ contacts = current_user.registrar.contacts.includes(:registrar)
+ end
+
+ normalize_search_parameters do
+ @q = contacts.search(search_params)
+ @contacts = @q.result(distinct: :true).page(params[:page])
+ end
+
+ @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
+ end
+
+ def download_list
+ authorize! :view, Depp::Contact
+
+ params[:q] ||= {}
+ params[:q].delete_if { |_k, v| v.blank? }
+ if params[:q].length == 1 && params[:q][:name_matches].present?
+ @contacts = Contact.find_by(name: params[:q][:name_matches])
+ end
+
contacts = current_user.registrar.contacts.includes(:registrar)
- end
+ contacts = contacts.filter_by_states(params[:statuses_contains]) if params[:statuses_contains]
- normalize_search_parameters do
- @q = contacts.search(search_params)
- @contacts = @q.result(distinct: :true).page(params[:page])
- end
+ normalize_search_parameters do
+ @q = contacts.search(params[:q])
+ @contacts = @q.result.page(params[:page])
+ end
- @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
- end
+ @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
- def download_list
- authorize! :view, Depp::Contact
-
- params[:q] ||= {}
- params[:q].delete_if { |_k, v| v.blank? }
- if params[:q].length == 1 && params[:q][:name_matches].present?
- @contacts = Contact.find_by(name: params[:q][:name_matches])
- end
-
- contacts = current_user.registrar.contacts.includes(:registrar)
- contacts = contacts.filter_by_states(params[:statuses_contains]) if params[:statuses_contains]
-
- normalize_search_parameters do
- @q = contacts.search(params[:q])
- @contacts = @q.result.page(params[:page])
- end
-
- @contacts = @contacts.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
-
- respond_to do |format|
+ respond_to do |format|
format.csv { render text: @contacts.to_csv }
format.pdf do
- pdf = @contacts.pdf(render_to_string('registrar/contacts/download_list', layout: false))
- send_data pdf, filename: 'contacts.pdf'
+ pdf = @contacts.pdf(render_to_string('registrar/contacts/download_list', layout: false))
+ send_data pdf, filename: 'contacts.pdf'
+ end
+ end
+
+ end
+
+ def new
+ authorize! :create, Depp::Contact
+ @contact = Depp::Contact.new
+ end
+
+ def show
+ authorize! :view, Depp::Contact
+ @contact = Depp::Contact.find_by_id(params[:id])
+ end
+
+ def edit
+ authorize! :edit, Depp::Contact
+ @contact = Depp::Contact.find_by_id(params[:id])
+ end
+
+ def create
+ authorize! :create, Depp::Contact
+ @contact = Depp::Contact.new(params[:depp_contact])
+
+ if @contact.save
+ redirect_to registrar_contact_url(@contact.id)
+ else
+ render 'new'
end
end
- end
+ def update
+ authorize! :edit, Depp::Contact
+ @contact = Depp::Contact.new(params[:depp_contact])
- def new
- authorize! :create, Depp::Contact
- @contact = Depp::Contact.new
- end
-
- def show
- authorize! :view, Depp::Contact
- @contact = Depp::Contact.find_by_id(params[:id])
- end
-
- def edit
- authorize! :edit, Depp::Contact
- @contact = Depp::Contact.find_by_id(params[:id])
- end
-
- def create
- authorize! :create, Depp::Contact
- @contact = Depp::Contact.new(params[:depp_contact])
-
- if @contact.save
- redirect_to registrar_contact_url(@contact.id)
- else
- render 'new'
- end
- end
-
- def update
- authorize! :edit, Depp::Contact
- @contact = Depp::Contact.new(params[:depp_contact])
-
- if @contact.update_attributes(params[:depp_contact])
- redirect_to registrar_contact_url(@contact.id)
- else
- render 'edit'
- end
- end
-
- def delete
- authorize! :delete, Depp::Contact
- @contact = Depp::Contact.find_by_id(params[:id])
- end
-
- def destroy
- authorize! :delete, Depp::Contact
- @contact = Depp::Contact.new(params[:depp_contact])
-
- if @contact.delete
- redirect_to registrar_contacts_url, notice: t(:destroyed)
- else
- render 'delete'
- end
- end
-
- private
-
- def init_epp_contact
- Depp::Contact.user = depp_current_user
- end
-
- def normalize_search_parameters
- ca_cache = params[:q][:valid_to_lteq]
- begin
- end_time = params[:q][:valid_to_lteq].try(:to_date)
- params[:q][:valid_to_lteq] = end_time.try(:end_of_day)
- rescue
- logger.warn('Invalid date')
+ if @contact.update_attributes(params[:depp_contact])
+ redirect_to registrar_contact_url(@contact.id)
+ else
+ render 'edit'
+ end
end
- yield
+ def delete
+ authorize! :delete, Depp::Contact
+ @contact = Depp::Contact.find_by_id(params[:id])
+ end
- params[:q][:valid_to_lteq] = ca_cache
- end
+ def destroy
+ authorize! :delete, Depp::Contact
+ @contact = Depp::Contact.new(params[:depp_contact])
- def address_processing?
- Contact.address_processing?
+ if @contact.delete
+ redirect_to registrar_contacts_url, notice: t(:destroyed)
+ else
+ render 'delete'
+ end
+ end
+
+ private
+
+ def init_epp_contact
+ Depp::Contact.user = depp_current_user
+ end
+
+ def normalize_search_parameters
+ ca_cache = params[:q][:valid_to_lteq]
+ begin
+ end_time = params[:q][:valid_to_lteq].try(:to_date)
+ params[:q][:valid_to_lteq] = end_time.try(:end_of_day)
+ rescue
+ logger.warn('Invalid date')
+ end
+
+ yield
+
+ params[:q][:valid_to_lteq] = ca_cache
+ end
+
+ def address_processing?
+ Contact.address_processing?
+ end
end
end
diff --git a/app/controllers/registrar/dashboard_controller.rb b/app/controllers/registrar/dashboard_controller.rb
index cdbc70b0c..80b3f530b 100644
--- a/app/controllers/registrar/dashboard_controller.rb
+++ b/app/controllers/registrar/dashboard_controller.rb
@@ -1,11 +1,13 @@
-class Registrar::DashboardController < RegistrarController
- authorize_resource class: false
+class Registrar
+ class DashboardController < BaseController
+ authorize_resource class: false
- def show
- if can?(:show, :poll)
- redirect_to registrar_poll_url and return
- elsif can?(:show, Invoice)
- redirect_to registrar_invoices_url and return
+ def show
+ if can?(:show, :poll)
+ redirect_to registrar_poll_url and return
+ elsif can?(:show, Invoice)
+ redirect_to registrar_invoices_url and return
+ end
end
end
end
diff --git a/app/controllers/registrar/deposits_controller.rb b/app/controllers/registrar/deposits_controller.rb
index 4b7d0db97..856b22553 100644
--- a/app/controllers/registrar/deposits_controller.rb
+++ b/app/controllers/registrar/deposits_controller.rb
@@ -1,26 +1,28 @@
-class Registrar::DepositsController < RegistrarController
- authorize_resource class: false
+class Registrar
+ class DepositsController < BaseController
+ authorize_resource class: false
- def new
- @deposit = Deposit.new
- end
+ def new
+ @deposit = Deposit.new
+ end
- def create
- @deposit = Deposit.new(deposit_params.merge(registrar: current_user.registrar))
- @invoice = @deposit.issue_prepayment_invoice
+ def create
+ @deposit = Deposit.new(deposit_params.merge(registrar: current_user.registrar))
+ @invoice = @deposit.issue_prepayment_invoice
- if @invoice && @invoice.persisted?
- flash[:notice] = t(:please_pay_the_following_invoice)
- redirect_to [:registrar, @invoice]
- else
- flash.now[:alert] = t(:failed_to_create_record)
- render 'new'
+ if @invoice && @invoice.persisted?
+ flash[:notice] = t(:please_pay_the_following_invoice)
+ redirect_to [:registrar, @invoice]
+ else
+ flash.now[:alert] = t(:failed_to_create_record)
+ render 'new'
+ end
+ end
+
+ private
+
+ def deposit_params
+ params.require(:deposit).permit(:amount, :description)
end
end
-
- private
-
- def deposit_params
- params.require(:deposit).permit(:amount, :description)
- end
end
diff --git a/app/controllers/registrar/depp_controller.rb b/app/controllers/registrar/depp_controller.rb
index 73e13fdae..234ab40b7 100644
--- a/app/controllers/registrar/depp_controller.rb
+++ b/app/controllers/registrar/depp_controller.rb
@@ -1,34 +1,37 @@
-class Registrar::DeppController < RegistrarController # EPP controller
- helper_method :depp_current_user
+class Registrar
+ class DeppController < BaseController
+ helper_method :depp_current_user
- rescue_from(Errno::ECONNRESET, Errno::ECONNREFUSED) do |exception|
- logger.error 'COULD NOT CONNECT TO REGISTRY'
- logger.error exception.backtrace.join("\n")
- redirect_to registrar_login_url, alert: t(:no_connection_to_registry)
- end
-
- before_action :authenticate_user
- def authenticate_user
- redirect_to registrar_login_url and return unless depp_current_user
- end
-
- def depp_controller?
- true
- end
-
- def depp_current_user
- return nil unless current_user
- @depp_current_user ||= Depp::User.new(
- tag: current_user.username,
- password: current_user.password
- )
- end
-
- def response_ok?
- @data.css('result').each do |x|
- success_codes = %(1000, 1001, 1300, 1301)
- return false unless success_codes.include?(x['code'])
+ rescue_from(Errno::ECONNRESET, Errno::ECONNREFUSED) do |exception|
+ logger.error 'COULD NOT CONNECT TO REGISTRY'
+ logger.error exception.backtrace.join("\n")
+ redirect_to registrar_login_url, alert: t(:no_connection_to_registry)
+ end
+
+ before_action :authenticate_user
+
+ def authenticate_user
+ redirect_to registrar_login_url and return unless depp_current_user
+ end
+
+ def depp_controller?
+ true
+ end
+
+ def depp_current_user
+ return nil unless current_user
+ @depp_current_user ||= Depp::User.new(
+ tag: current_user.username,
+ password: current_user.password
+ )
+ end
+
+ def response_ok?
+ @data.css('result').each do |x|
+ success_codes = %(1000, 1001, 1300, 1301)
+ return false unless success_codes.include?(x['code'])
+ end
+ true
end
- true
end
end
diff --git a/app/controllers/registrar/domains_controller.rb b/app/controllers/registrar/domains_controller.rb
index 560a965f3..a75469de3 100644
--- a/app/controllers/registrar/domains_controller.rb
+++ b/app/controllers/registrar/domains_controller.rb
@@ -1,191 +1,194 @@
-class Registrar::DomainsController < Registrar::DeppController # EPP controller
- before_action :init_domain, except: :new
- helper_method :contacts
+class Registrar
+ class DomainsController < DeppController
+ before_action :init_domain, except: :new
+ helper_method :contacts
- # rubocop: disable Metrics/PerceivedComplexity
- # rubocop: disable Metrics/CyclomaticComplexity
- # rubocop: disable Metrics/AbcSize
- # rubocop: disable Metrics/MethodLength
- def index
- authorize! :view, Depp::Domain
+ # rubocop: disable Metrics/PerceivedComplexity
+ # rubocop: disable Metrics/CyclomaticComplexity
+ # rubocop: disable Metrics/AbcSize
+ # rubocop: disable Metrics/MethodLength
+ def index
+ authorize! :view, Depp::Domain
- params[:q] ||= {}
- params[:q].delete_if { |_k, v| v.blank? }
- if params[:q].length == 1 && params[:q][:name_matches].present?
- @domain = Domain.find_by(name: params[:q][:name_matches])
- if @domain
- redirect_to info_registrar_domains_url(domain_name: @domain.name) and return
+ params[:q] ||= {}
+ params[:q].delete_if { |_k, v| v.blank? }
+ if params[:q].length == 1 && params[:q][:name_matches].present?
+ @domain = Domain.find_by(name: params[:q][:name_matches])
+ if @domain
+ redirect_to info_registrar_domains_url(domain_name: @domain.name) and return
+ end
end
- end
- if params[:statuses_contains]
- domains = current_user.registrar.domains.includes(:registrar, :registrant).where(
- "statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
- )
- else
- domains = current_user.registrar.domains.includes(:registrar, :registrant)
- end
+ if params[:statuses_contains]
+ domains = current_user.registrar.domains.includes(:registrar, :registrant).where(
+ "statuses @> ?::varchar[]", "{#{params[:statuses_contains].join(',')}}"
+ )
+ else
+ domains = current_user.registrar.domains.includes(:registrar, :registrant)
+ end
- normalize_search_parameters do
- @q = domains.search(params[:q])
- @domains = @q.result.page(params[:page])
- if @domains.count == 0 && params[:q][:name_matches] !~ /^%.+%$/
- # if we do not get any results, add wildcards to the name field and search again
- n_cache = params[:q][:name_matches]
- params[:q][:name_matches] = "%#{params[:q][:name_matches]}%"
+ normalize_search_parameters do
@q = domains.search(params[:q])
@domains = @q.result.page(params[:page])
- params[:q][:name_matches] = n_cache # we don't want to show wildcards in search form
- end
- end
-
- @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
-
- respond_to do |format|
- format.html
- format.csv do
- domain_presenters = []
-
- @domains.find_each do |domain|
- domain_presenters << ::DomainPresenter.new(domain: domain, view: view_context)
+ if @domains.count == 0 && params[:q][:name_matches] !~ /^%.+%$/
+ # if we do not get any results, add wildcards to the name field and search again
+ n_cache = params[:q][:name_matches]
+ params[:q][:name_matches] = "%#{params[:q][:name_matches]}%"
+ @q = domains.search(params[:q])
+ @domains = @q.result.page(params[:page])
+ params[:q][:name_matches] = n_cache # we don't want to show wildcards in search form
end
+ end
- csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters, view: view_context).to_s
- send_data(csv)
+ @domains = @domains.per(params[:results_per_page]) if params[:results_per_page].to_i > 0
+
+ respond_to do |format|
+ format.html
+ format.csv do
+ domain_presenters = []
+
+ @domains.find_each do |domain|
+ domain_presenters << ::DomainPresenter.new(domain: domain, view: view_context)
+ end
+
+ csv = Registrar::DomainListCSVPresenter.new(domains: domain_presenters, view: view_context).to_s
+ send_data(csv)
+ end
end
end
- end
- # rubocop: enable Metrics/PerceivedComplexity
- # rubocop: enable Metrics/CyclomaticComplexity
- # rubocop: enable Metrics/AbcSize
- def info
- authorize! :info, Depp::Domain
- @data = @domain.info(params[:domain_name]) if params[:domain_name]
- if response_ok?
- render 'info'
- else
- flash[:alert] = @data.css('msg').text
- redirect_to registrar_domains_url and return
- end
- end
+ # rubocop: enable Metrics/PerceivedComplexity
+ # rubocop: enable Metrics/CyclomaticComplexity
+ # rubocop: enable Metrics/AbcSize
- def check
- authorize! :check, Depp::Domain
- if params[:domain_name]
- @data = @domain.check(params[:domain_name])
- render 'check_index' and return unless response_ok?
- else
- render 'check_index'
- end
- end
-
- def new
- authorize! :create, Depp::Domain
- @domain_params = Depp::Domain.default_params
- end
-
- def create
- authorize! :create, Depp::Domain
- @domain_params = params[:domain]
- @data = @domain.create(@domain_params)
-
- if response_ok?
- redirect_to info_registrar_domains_url(domain_name: @domain_params[:name])
- else
- render 'new'
- end
- end
-
- def edit
- authorize! :update, Depp::Domain
- @data = @domain.info(params[:domain_name])
- @domain_params = Depp::Domain.construct_params_from_server_data(@data)
- end
-
- def update
- authorize! :update, Depp::Domain
- @domain_params = params[:domain]
- @data = @domain.update(@domain_params)
-
- if response_ok?
- redirect_to info_registrar_domains_url(domain_name: @domain_params[:name])
- else
- params[:domain_name] = @domain_params[:name]
- render 'new'
- end
- end
-
- def delete
- authorize! :delete, Depp::Domain
- end
-
- def destroy
- authorize! :delete, Depp::Domain
- @data = @domain.delete(params[:domain])
- @results = @data.css('result')
- if response_ok?
- redirect_to info_registrar_domains_url(domain_name: params[:domain][:name])
- else
- params[:domain_name] = params[:domain][:name]
- render 'delete'
- end
- end
-
- def renew
- authorize! :renew, Depp::Domain
- if params[:domain_name] && params[:cur_exp_date]
- @data = @domain.renew(params)
- render 'renew_index' and return unless response_ok?
- else
- render 'renew_index'
- 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
-
- scope = current_user.registrar.contacts.limit(10)
- if params[:query].present?
- escaped_str = ActiveRecord::Base.connection.quote_string params[:query]
- scope = scope.where("name ilike '%#{escaped_str}%' OR code ilike '%#{escaped_str}%' ")
+ def info
+ authorize! :info, Depp::Domain
+ @data = @domain.info(params[:domain_name]) if params[:domain_name]
+ if response_ok?
+ render 'info'
+ else
+ flash[:alert] = @data.css('msg').text
+ redirect_to registrar_domains_url and return
+ end
end
- render json: scope.pluck(:name, :code).map { |c| {display_key: "#{c.second} #{c.first}", value: c.second} }
- end
-
- private
-
- def init_domain
- @domain = Depp::Domain.new(current_user: depp_current_user)
- end
-
-
- def contacts
- current_user.registrar.contacts
- end
-
- def normalize_search_parameters
- ca_cache = params[:q][:valid_to_lteq]
- begin
- end_time = params[:q][:valid_to_lteq].try(:to_date)
- params[:q][:valid_to_lteq] = end_time.try(:end_of_day)
- rescue
- logger.warn('Invalid date')
+ def check
+ authorize! :check, Depp::Domain
+ if params[:domain_name]
+ @data = @domain.check(params[:domain_name])
+ render 'check_index' and return unless response_ok?
+ else
+ render 'check_index'
+ end
end
- yield
+ def new
+ authorize! :create, Depp::Domain
+ @domain_params = Depp::Domain.default_params
+ end
- params[:q][:valid_to_lteq] = ca_cache
+ def create
+ authorize! :create, Depp::Domain
+ @domain_params = params[:domain]
+ @data = @domain.create(@domain_params)
+
+ if response_ok?
+ redirect_to info_registrar_domains_url(domain_name: @domain_params[:name])
+ else
+ render 'new'
+ end
+ end
+
+ def edit
+ authorize! :update, Depp::Domain
+ @data = @domain.info(params[:domain_name])
+ @domain_params = Depp::Domain.construct_params_from_server_data(@data)
+ end
+
+ def update
+ authorize! :update, Depp::Domain
+ @domain_params = params[:domain]
+ @data = @domain.update(@domain_params)
+
+ if response_ok?
+ redirect_to info_registrar_domains_url(domain_name: @domain_params[:name])
+ else
+ params[:domain_name] = @domain_params[:name]
+ render 'new'
+ end
+ end
+
+ def delete
+ authorize! :delete, Depp::Domain
+ end
+
+ def destroy
+ authorize! :delete, Depp::Domain
+ @data = @domain.delete(params[:domain])
+ @results = @data.css('result')
+ if response_ok?
+ redirect_to info_registrar_domains_url(domain_name: params[:domain][:name])
+ else
+ params[:domain_name] = params[:domain][:name]
+ render 'delete'
+ end
+ end
+
+ def renew
+ authorize! :renew, Depp::Domain
+ if params[:domain_name] && params[:cur_exp_date]
+ @data = @domain.renew(params)
+ render 'renew_index' and return unless response_ok?
+ else
+ render 'renew_index'
+ 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
+
+ scope = current_user.registrar.contacts.limit(10)
+ if params[:query].present?
+ escaped_str = ActiveRecord::Base.connection.quote_string params[:query]
+ scope = scope.where("name ilike '%#{escaped_str}%' OR code ilike '%#{escaped_str}%' ")
+ end
+
+ render json: scope.pluck(:name, :code).map { |c| { display_key: "#{c.second} #{c.first}", value: c.second } }
+ end
+
+ private
+
+ def init_domain
+ @domain = Depp::Domain.new(current_user: depp_current_user)
+ end
+
+
+ def contacts
+ current_user.registrar.contacts
+ end
+
+ def normalize_search_parameters
+ ca_cache = params[:q][:valid_to_lteq]
+ begin
+ end_time = params[:q][:valid_to_lteq].try(:to_date)
+ params[:q][:valid_to_lteq] = end_time.try(:end_of_day)
+ rescue
+ logger.warn('Invalid date')
+ end
+
+ yield
+
+ params[:q][:valid_to_lteq] = ca_cache
+ end
end
end
diff --git a/app/controllers/registrar/invoices_controller.rb b/app/controllers/registrar/invoices_controller.rb
index 543c4623d..ac762e712 100644
--- a/app/controllers/registrar/invoices_controller.rb
+++ b/app/controllers/registrar/invoices_controller.rb
@@ -1,71 +1,74 @@
-class Registrar::InvoicesController < RegistrarController
- load_and_authorize_resource
+class Registrar
+ class InvoicesController < BaseController
+ load_and_authorize_resource
- before_action :set_invoice, only: [:show, :forward, :download_pdf]
+ before_action :set_invoice, only: [:show, :forward, :download_pdf]
- def index
- params[:q] ||= {}
- invoices = current_user.registrar.invoices.includes(:invoice_items, :account_activity)
+ def index
+ params[:q] ||= {}
+ invoices = current_user.registrar.invoices.includes(:invoice_items, :account_activity)
- normalize_search_parameters do
- @q = invoices.search(params[:q])
- @q.sorts = 'id desc' if @q.sorts.empty?
- @invoices = @q.result.page(params[:page])
- end
- end
-
- def show; end
-
- def forward
- @invoice.billing_email = @invoice.buyer.billing_email
-
- return unless request.post?
-
- @invoice.billing_email = params[:invoice][:billing_email]
-
- if @invoice.forward(render_to_string('pdf', layout: false))
- flash[:notice] = t(:invoice_forwared)
- redirect_to([:registrar, @invoice])
- else
- flash.now[:alert] = t(:failed_to_forward_invoice)
- end
- end
-
- def cancel
- if @invoice.cancel
- flash[:notice] = t(:record_updated)
- redirect_to([:registrar, @invoice])
- else
- flash.now[:alert] = t(:failed_to_update_record)
- render :show
- end
- end
-
- def download_pdf
- pdf = @invoice.pdf(render_to_string('pdf', layout: false))
- send_data pdf, filename: @invoice.pdf_name
- end
-
- private
-
- def set_invoice
- @invoice = Invoice.find(params[:id])
- end
-
- def normalize_search_parameters
- params[:q][:sum_cache_gteq].gsub!(',', '.') if params[:q][:sum_cache_gteq]
- params[:q][:sum_cache_lteq].gsub!(',', '.') if params[:q][:sum_cache_lteq]
-
- ca_cache = params[:q][:due_date_lteq]
- begin
- end_time = params[:q][:due_date_lteq].try(:to_date)
- params[:q][:due_date_lteq] = end_time.try(:end_of_day)
- rescue
- logger.warn('Invalid date')
+ normalize_search_parameters do
+ @q = invoices.search(params[:q])
+ @q.sorts = 'id desc' if @q.sorts.empty?
+ @invoices = @q.result.page(params[:page])
+ end
end
- yield
+ def show;
+ end
- params[:q][:due_date_lteq] = ca_cache
+ def forward
+ @invoice.billing_email = @invoice.buyer.billing_email
+
+ return unless request.post?
+
+ @invoice.billing_email = params[:invoice][:billing_email]
+
+ if @invoice.forward(render_to_string('pdf', layout: false))
+ flash[:notice] = t(:invoice_forwared)
+ redirect_to([:registrar, @invoice])
+ else
+ flash.now[:alert] = t(:failed_to_forward_invoice)
+ end
+ end
+
+ def cancel
+ if @invoice.cancel
+ flash[:notice] = t(:record_updated)
+ redirect_to([:registrar, @invoice])
+ else
+ flash.now[:alert] = t(:failed_to_update_record)
+ render :show
+ end
+ end
+
+ def download_pdf
+ pdf = @invoice.pdf(render_to_string('pdf', layout: false))
+ send_data pdf, filename: @invoice.pdf_name
+ end
+
+ private
+
+ def set_invoice
+ @invoice = Invoice.find(params[:id])
+ end
+
+ def normalize_search_parameters
+ params[:q][:sum_cache_gteq].gsub!(',', '.') if params[:q][:sum_cache_gteq]
+ params[:q][:sum_cache_lteq].gsub!(',', '.') if params[:q][:sum_cache_lteq]
+
+ ca_cache = params[:q][:due_date_lteq]
+ begin
+ end_time = params[:q][:due_date_lteq].try(:to_date)
+ params[:q][:due_date_lteq] = end_time.try(:end_of_day)
+ rescue
+ logger.warn('Invalid date')
+ end
+
+ yield
+
+ params[:q][:due_date_lteq] = ca_cache
+ end
end
end
diff --git a/app/controllers/registrar/keyrelays_controller.rb b/app/controllers/registrar/keyrelays_controller.rb
index 13c480524..8436bb679 100644
--- a/app/controllers/registrar/keyrelays_controller.rb
+++ b/app/controllers/registrar/keyrelays_controller.rb
@@ -1,18 +1,20 @@
-class Registrar::KeyrelaysController < Registrar::DeppController # EPP controller
- def show
- authorize! :view, Depp::Keyrelay
- end
+class Registrar
+ class KeyrelaysController < DeppController
+ def show
+ authorize! :view, Depp::Keyrelay
+ end
- def create
- authorize! :create, Depp::Keyrelay
- keyrelay = Depp::Keyrelay.new(current_user: depp_current_user)
- @data = keyrelay.keyrelay(params)
+ def create
+ authorize! :create, Depp::Keyrelay
+ keyrelay = Depp::Keyrelay.new(current_user: depp_current_user)
+ @data = keyrelay.keyrelay(params)
- if response_ok?
- flash[:epp_results] = [{ 'code' => '1000', 'msg' => 'Command completed successfully', 'show' => true }]
- redirect_to registrar_keyrelay_path
- else
- render 'show'
+ if response_ok?
+ flash[:epp_results] = [{ 'code' => '1000', 'msg' => 'Command completed successfully', 'show' => true }]
+ redirect_to registrar_keyrelay_path
+ else
+ render 'show'
+ end
end
end
end
diff --git a/app/controllers/registrar/payments_controller.rb b/app/controllers/registrar/payments_controller.rb
index 931dffcf2..696dbbc7e 100644
--- a/app/controllers/registrar/payments_controller.rb
+++ b/app/controllers/registrar/payments_controller.rb
@@ -1,46 +1,48 @@
-class Registrar::PaymentsController < RegistrarController
- protect_from_forgery except: :back
+class Registrar
+ class PaymentsController < BaseController
+ protect_from_forgery except: :back
- skip_authorization_check # actually anyone can pay, no problems at all
- skip_before_action :authenticate_user!, :check_ip, only: [:back]
- before_action :check_bank
+ skip_authorization_check # actually anyone can pay, no problems at all
+ skip_before_action :authenticate_user!, :check_ip, only: [:back]
+ before_action :check_bank
- # to handle existing model we should
- # get invoice_id and then get number
- # build BankTransaction without connection with right reference number
- # do not connect transaction and invoice
- def pay
- invoice = Invoice.find(params[:invoice_id])
- @bank_link = BankLink::Request.new(params[:bank], invoice, self)
- @bank_link.make_transaction
- end
-
-
- # connect invoice and transaction
- # both back and IPN
- def back
- @bank_link = BankLink::Response.new(params[:bank], params)
- if @bank_link.valid? && @bank_link.ok?
- @bank_link.complete_payment
-
- if @bank_link.invoice.binded?
- flash[:notice] = t(:pending_applied)
- else
- flash[:alert] = t(:something_wrong)
- end
- else
- flash[:alert] = t(:something_wrong)
+ # to handle existing model we should
+ # get invoice_id and then get number
+ # build BankTransaction without connection with right reference number
+ # do not connect transaction and invoice
+ def pay
+ invoice = Invoice.find(params[:invoice_id])
+ @bank_link = BankLink::Request.new(params[:bank], invoice, self)
+ @bank_link.make_transaction
end
- redirect_to registrar_invoice_path(@bank_link.invoice)
- end
- private
- def banks
- ENV['payments_banks'].split(",").map(&:strip)
- end
- def check_bank
- raise StandardError.new("Not Implemented bank") unless banks.include?(params[:bank])
- end
+ # connect invoice and transaction
+ # both back and IPN
+ def back
+ @bank_link = BankLink::Response.new(params[:bank], params)
+ if @bank_link.valid? && @bank_link.ok?
+ @bank_link.complete_payment
+ if @bank_link.invoice.binded?
+ flash[:notice] = t(:pending_applied)
+ else
+ flash[:alert] = t(:something_wrong)
+ end
+ else
+ flash[:alert] = t(:something_wrong)
+ end
+ redirect_to registrar_invoice_path(@bank_link.invoice)
+ end
+
+ private
+
+ def banks
+ ENV['payments_banks'].split(",").map(&:strip)
+ end
+
+ def check_bank
+ raise StandardError.new("Not Implemented bank") unless banks.include?(params[:bank])
+ end
+ end
end
diff --git a/app/controllers/registrar/polls_controller.rb b/app/controllers/registrar/polls_controller.rb
index 5f893e3c3..ab0d5e1a6 100644
--- a/app/controllers/registrar/polls_controller.rb
+++ b/app/controllers/registrar/polls_controller.rb
@@ -1,56 +1,61 @@
-class Registrar::PollsController < Registrar::DeppController # EPP controller
- authorize_resource class: false
- before_action :init_epp_xml
+class Registrar
+ class PollsController < DeppController
+ authorize_resource class: false
+ before_action :init_epp_xml
+
+ def show
+ if Rails.env.test? # Stub for depp server request
+ @data = Object.new
+
+ def @data.css(key)
+ ; [];
+ end
+ else
+ @data = depp_current_user.request(@ex.poll)
+ end
+ end
+
+ def destroy
+ @data = depp_current_user.request(@ex.poll(poll: {
+ value: '', attrs: { op: 'ack', msgID: params[:id] }
+ }))
+
+ @results = @data.css('result')
- def show
- if Rails.env.test? # Stub for depp server request
- @data = Object.new
- def @data.css(key); []; end
- else
@data = depp_current_user.request(@ex.poll)
+ render 'show'
+ end
+
+ # TODO: Keyrelay is disabled for now
+ # def confirm_keyrelay
+ # authorize! :confirm, :keyrelay
+ # domain_params = params[:domain]
+ # @data = @domain.confirm_keyrelay(domain_params)
+
+ # if response_ok?
+ # redirect_to info_registrar_domains_url(domain_name: domain_params[:name])
+ # else
+ # @results = @data.css('result')
+ # @data = depp_current_user.request(@ex.poll)
+ # render 'show'
+ # end
+ # end
+
+ def confirm_transfer
+ domain_params = params[:domain]
+ @data = @domain.confirm_transfer(domain_params)
+
+ @results = @data.css('result')
+ @data = depp_current_user.request(@ex.poll)
+
+ render 'show'
+ end
+
+ private
+
+ def init_epp_xml
+ @ex = EppXml::Session.new(cl_trid_prefix: depp_current_user.tag)
+ @domain = Depp::Domain.new(current_user: depp_current_user)
end
end
-
- def destroy
- @data = depp_current_user.request(@ex.poll(poll: {
- value: '', attrs: { op: 'ack', msgID: params[:id] }
- }))
-
- @results = @data.css('result')
-
- @data = depp_current_user.request(@ex.poll)
- render 'show'
- end
-
- # TODO: Keyrelay is disabled for now
- # def confirm_keyrelay
- # authorize! :confirm, :keyrelay
- # domain_params = params[:domain]
- # @data = @domain.confirm_keyrelay(domain_params)
-
- # if response_ok?
- # redirect_to info_registrar_domains_url(domain_name: domain_params[:name])
- # else
- # @results = @data.css('result')
- # @data = depp_current_user.request(@ex.poll)
- # render 'show'
- # end
- # end
-
- def confirm_transfer
- domain_params = params[:domain]
- @data = @domain.confirm_transfer(domain_params)
-
- @results = @data.css('result')
- @data = depp_current_user.request(@ex.poll)
-
- render 'show'
- end
-
- private
-
- def init_epp_xml
- @ex = EppXml::Session.new(cl_trid_prefix: depp_current_user.tag)
- @domain = Depp::Domain.new(current_user: depp_current_user)
- end
end
diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb
index 8c148acc2..cd33590c2 100644
--- a/app/controllers/registrar/sessions_controller.rb
+++ b/app/controllers/registrar/sessions_controller.rb
@@ -1,188 +1,194 @@
-class Registrar::SessionsController < Devise::SessionsController
- layout 'registrar/application'
- helper_method :depp_controller?
- def depp_controller?
- false
- end
+class Registrar
+ class SessionsController < Devise::SessionsController
+ helper_method :depp_controller?
- before_action :check_ip
-
- def login
- @depp_user = Depp::User.new
- end
-
- # rubocop:disable Metrics/PerceivedComplexity
- # rubocop:disable Metrics/CyclomaticComplexity
- # rubocop:disable Metrics/MethodLength
- # rubocop:disable Metrics/AbcSize
- def create
- @depp_user = Depp::User.new(params[:depp_user].merge(pki: !(Rails.env.development? || Rails.env.test?)))
-
- if @depp_user.pki && request.env['HTTP_SSL_CLIENT_S_DN_CN'].blank?
- @depp_user.errors.add(:base, :webserver_missing_user_name_directive)
+ def depp_controller?
+ false
end
- if @depp_user.pki && request.env['HTTP_SSL_CLIENT_CERT'].blank?
- @depp_user.errors.add(:base, :webserver_missing_client_cert_directive)
+ before_action :check_ip
+
+ def login
+ @depp_user = Depp::User.new
end
- if @depp_user.pki && request.env['HTTP_SSL_CLIENT_S_DN_CN'] == '(null)'
- @depp_user.errors.add(:base, :webserver_user_name_directive_should_be_required)
- end
+ # rubocop:disable Metrics/PerceivedComplexity
+ # rubocop:disable Metrics/CyclomaticComplexity
+ # rubocop:disable Metrics/MethodLength
+ # rubocop:disable Metrics/AbcSize
+ def create
+ @depp_user = Depp::User.new(params[:depp_user].merge(pki: !(Rails.env.development? || Rails.env.test?)))
- if @depp_user.pki && request.env['HTTP_SSL_CLIENT_CERT'] == '(null)'
- @depp_user.errors.add(:base, :webserver_client_cert_directive_should_be_required)
- end
-
- @api_user = ApiUser.find_by(username: params[:depp_user][:tag], password: params[:depp_user][:password])
-
- unless @api_user
- @depp_user.errors.add(:base, t(:no_such_user))
- render 'login' and return
- end
-
- if @depp_user.pki
- unless @api_user.registrar_pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'], request.env['HTTP_SSL_CLIENT_S_DN_CN'])
- @depp_user.errors.add(:base, :invalid_cert)
+ if @depp_user.pki && request.env['HTTP_SSL_CLIENT_S_DN_CN'].blank?
+ @depp_user.errors.add(:base, :webserver_missing_user_name_directive)
end
- end
- if @depp_user.errors.none?
- if @api_user.active?
- sign_in @api_user
- redirect_to registrar_root_url
+ if @depp_user.pki && request.env['HTTP_SSL_CLIENT_CERT'].blank?
+ @depp_user.errors.add(:base, :webserver_missing_client_cert_directive)
+ end
+
+ if @depp_user.pki && request.env['HTTP_SSL_CLIENT_S_DN_CN'] == '(null)'
+ @depp_user.errors.add(:base, :webserver_user_name_directive_should_be_required)
+ end
+
+ if @depp_user.pki && request.env['HTTP_SSL_CLIENT_CERT'] == '(null)'
+ @depp_user.errors.add(:base, :webserver_client_cert_directive_should_be_required)
+ end
+
+ @api_user = ApiUser.find_by(username: params[:depp_user][:tag], password: params[:depp_user][:password])
+
+ unless @api_user
+ @depp_user.errors.add(:base, t(:no_such_user))
+ render 'login' and return
+ end
+
+ if @depp_user.pki
+ unless @api_user.registrar_pki_ok?(request.env['HTTP_SSL_CLIENT_CERT'], request.env['HTTP_SSL_CLIENT_S_DN_CN'])
+ @depp_user.errors.add(:base, :invalid_cert)
+ end
+ end
+
+ if @depp_user.errors.none?
+ if @api_user.active?
+ sign_in @api_user
+ redirect_to registrar_root_url
+ else
+ @depp_user.errors.add(:base, :not_active)
+ render 'login'
+ end
else
- @depp_user.errors.add(:base, :not_active)
render 'login'
end
- else
- render 'login'
end
- end
- # rubocop:enable Metrics/MethodLength
- # rubocop:enable Metrics/AbcSize
- def switch_user
- @api_user = ApiUser.find(params[:id])
+ # rubocop:enable Metrics/MethodLength
+ # rubocop:enable Metrics/AbcSize
- unless Rails.env.development?
- unless @api_user.registrar.registrar_ip_white?(request.ip)
- flash[:alert] = I18n.t(:ip_is_not_whitelisted)
- redirect_to :back and return
+ def switch_user
+ @api_user = ApiUser.find(params[:id])
+
+ unless Rails.env.development?
+ unless @api_user.registrar.registrar_ip_white?(request.ip)
+ flash[:alert] = I18n.t(:ip_is_not_whitelisted)
+ redirect_to :back and return
+ end
+ end
+
+ sign_in @api_user if @api_user.identity_code == current_user.identity_code
+
+ redirect_to registrar_root_url
+ end
+
+ # rubocop:enable Metrics/CyclomaticComplexity
+ # rubocop:enable Metrics/PerceivedComplexity
+
+ def id
+ @user = ApiUser.find_by_idc_data(request.env['SSL_CLIENT_S_DN'])
+
+ if @user
+ sign_in(@user, event: :authentication)
+ redirect_to registrar_root_url
+ else
+ flash[:alert] = t('no_such_user')
+ redirect_to registrar_login_url
end
end
- sign_in @api_user if @api_user.identity_code == current_user.identity_code
-
- redirect_to registrar_root_url
- end
- # rubocop:enable Metrics/CyclomaticComplexity
- # rubocop:enable Metrics/PerceivedComplexity
-
- def id
- @user = ApiUser.find_by_idc_data(request.env['SSL_CLIENT_S_DN'])
-
- if @user
- sign_in(@user, event: :authentication)
- redirect_to registrar_root_url
- else
- flash[:alert] = t('no_such_user')
- redirect_to registrar_login_url
- end
- end
-
- def login_mid
- @user = User.new
- end
-
- # rubocop:disable Metrics/MethodLength
- def mid
- phone = params[:user][:phone]
- endpoint = "#{ENV['sk_digi_doc_service_endpoint']}"
- client = Digidoc::Client.new(endpoint)
- client.logger = Rails.application.config.logger unless Rails.env.test?
-
- # country_codes = {'+372' => 'EST'}
- phone.gsub!('+372', '')
- response = client.authenticate(
- phone: "+372#{phone}",
- message_to_display: 'Authenticating',
- service_name: ENV['sk_digi_doc_service_name'] || 'Testing'
- )
-
- if response.faultcode
- render json: { message: response.detail.message }, status: :unauthorized
- return
+ def login_mid
+ @user = User.new
end
- @user = find_user_by_idc(response.user_id_code)
+ # rubocop:disable Metrics/MethodLength
+ def mid
+ phone = params[:user][:phone]
+ endpoint = "#{ENV['sk_digi_doc_service_endpoint']}"
+ client = Digidoc::Client.new(endpoint)
+ client.logger = Rails.application.config.logger unless Rails.env.test?
- if @user.persisted?
- session[:user_id_code] = response.user_id_code
- session[:mid_session_code] = client.session_code
+ # country_codes = {'+372' => 'EST'}
+ phone.gsub!('+372', '')
+ response = client.authenticate(
+ phone: "+372#{phone}",
+ message_to_display: 'Authenticating',
+ service_name: ENV['sk_digi_doc_service_name'] || 'Testing'
+ )
- render json: {
- message: t(:confirmation_sms_was_sent_to_your_phone_verification_code_is, { code: response.challenge_id })
- }, status: :ok
- else
- render json: { message: t(:no_such_user) }, status: :unauthorized
+ if response.faultcode
+ render json: { message: response.detail.message }, status: :unauthorized
+ return
+ end
+
+ @user = find_user_by_idc(response.user_id_code)
+
+ if @user.persisted?
+ session[:user_id_code] = response.user_id_code
+ session[:mid_session_code] = client.session_code
+
+ render json: {
+ message: t(:confirmation_sms_was_sent_to_your_phone_verification_code_is, { code: response.challenge_id })
+ }, status: :ok
+ else
+ render json: { message: t(:no_such_user) }, status: :unauthorized
+ end
end
- end
- # rubocop:enable Metrics/MethodLength
- # rubocop: disable Metrics/AbcSize
- # rubocop: disable Metrics/CyclomaticComplexity
- # rubocop: disable Metrics/MethodLength
- def mid_status
- endpoint = "#{ENV['sk_digi_doc_service_endpoint']}"
- client = Digidoc::Client.new(endpoint)
- client.logger = Rails.application.config.logger unless Rails.env.test?
- client.session_code = session[:mid_session_code]
- auth_status = client.authentication_status
+ # rubocop:enable Metrics/MethodLength
- case auth_status.status
- when 'OUTSTANDING_TRANSACTION'
- render json: { message: t(:check_your_phone_for_confirmation_code) }, status: :ok
- when 'USER_AUTHENTICATED'
- @user = find_user_by_idc(session[:user_id_code])
- sign_in @user
- flash[:notice] = t(:welcome)
- flash.keep(:notice)
- render js: "window.location = '#{registrar_root_url}'"
- when 'NOT_VALID'
- render json: { message: t(:user_signature_is_invalid) }, status: :bad_request
- when 'EXPIRED_TRANSACTION'
- render json: { message: t(:session_timeout) }, status: :bad_request
- when 'USER_CANCEL'
- render json: { message: t(:user_cancelled) }, status: :bad_request
- when 'MID_NOT_READY'
- render json: { message: t(:mid_not_ready) }, status: :bad_request
- when 'PHONE_ABSENT'
- render json: { message: t(:phone_absent) }, status: :bad_request
- when 'SENDING_ERROR'
- render json: { message: t(:sending_error) }, status: :bad_request
- when 'SIM_ERROR'
- render json: { message: t(:sim_error) }, status: :bad_request
- when 'INTERNAL_ERROR'
- render json: { message: t(:internal_error) }, status: :bad_request
- else
- render json: { message: t(:internal_error) }, status: :bad_request
+ # rubocop: disable Metrics/AbcSize
+ # rubocop: disable Metrics/CyclomaticComplexity
+ # rubocop: disable Metrics/MethodLength
+ def mid_status
+ endpoint = "#{ENV['sk_digi_doc_service_endpoint']}"
+ client = Digidoc::Client.new(endpoint)
+ client.logger = Rails.application.config.logger unless Rails.env.test?
+ client.session_code = session[:mid_session_code]
+ auth_status = client.authentication_status
+
+ case auth_status.status
+ when 'OUTSTANDING_TRANSACTION'
+ render json: { message: t(:check_your_phone_for_confirmation_code) }, status: :ok
+ when 'USER_AUTHENTICATED'
+ @user = find_user_by_idc(session[:user_id_code])
+ sign_in @user
+ flash[:notice] = t(:welcome)
+ flash.keep(:notice)
+ render js: "window.location = '#{registrar_root_url}'"
+ when 'NOT_VALID'
+ render json: { message: t(:user_signature_is_invalid) }, status: :bad_request
+ when 'EXPIRED_TRANSACTION'
+ render json: { message: t(:session_timeout) }, status: :bad_request
+ when 'USER_CANCEL'
+ render json: { message: t(:user_cancelled) }, status: :bad_request
+ when 'MID_NOT_READY'
+ render json: { message: t(:mid_not_ready) }, status: :bad_request
+ when 'PHONE_ABSENT'
+ render json: { message: t(:phone_absent) }, status: :bad_request
+ when 'SENDING_ERROR'
+ render json: { message: t(:sending_error) }, status: :bad_request
+ when 'SIM_ERROR'
+ render json: { message: t(:sim_error) }, status: :bad_request
+ when 'INTERNAL_ERROR'
+ render json: { message: t(:internal_error) }, status: :bad_request
+ else
+ render json: { message: t(:internal_error) }, status: :bad_request
+ end
end
- end
- # rubocop: enable Metrics/AbcSize
- # rubocop: enable Metrics/CyclomaticComplexity
- # rubocop: enable Metrics/MethodLength
- def find_user_by_idc(idc)
- return User.new unless idc
- ApiUser.find_by(identity_code: idc) || User.new
- end
+ # rubocop: enable Metrics/AbcSize
+ # rubocop: enable Metrics/CyclomaticComplexity
+ # rubocop: enable Metrics/MethodLength
- private
+ def find_user_by_idc(idc)
+ return User.new unless idc
+ ApiUser.find_by(identity_code: idc) || User.new
+ end
- def check_ip
- return if Rails.env.development?
- return if WhiteIp.registrar_ip_white?(request.ip)
- render text: t('access_denied') and return
+ private
+
+ def check_ip
+ return if Rails.env.development?
+ return if WhiteIp.registrar_ip_white?(request.ip)
+ render text: t('access_denied') and return
+ end
end
end
diff --git a/app/controllers/registrar/xml_consoles_controller.rb b/app/controllers/registrar/xml_consoles_controller.rb
index 31ec3eafc..083dec532 100644
--- a/app/controllers/registrar/xml_consoles_controller.rb
+++ b/app/controllers/registrar/xml_consoles_controller.rb
@@ -1,23 +1,25 @@
-class Registrar::XmlConsolesController < Registrar::DeppController # EPP controller
- authorize_resource class: false
+class Registrar
+ class XmlConsolesController < DeppController
+ authorize_resource class: false
- def show
- end
-
- def create
- begin
- @result = depp_current_user.server.request(params[:payload])
- rescue
- @result = 'CONNECTION ERROR - Is the EPP server running?'
+ def show
end
- render :show
- end
- def load_xml
- cl_trid = "#{depp_current_user.tag}-#{Time.zone.now.to_i}"
- xml_dir_path = Rails.root + 'app/views/registrar/xml_consoles/epp_requests'
- xml = File.read("#{xml_dir_path}/#{params[:obj]}/#{params[:epp_action]}.xml")
- xml.gsub!('ABC-12345', "#{cl_trid}")
- render text: xml
+ def create
+ begin
+ @result = depp_current_user.server.request(params[:payload])
+ rescue
+ @result = 'CONNECTION ERROR - Is the EPP server running?'
+ end
+ render :show
+ end
+
+ def load_xml
+ cl_trid = "#{depp_current_user.tag}-#{Time.zone.now.to_i}"
+ xml_dir_path = Rails.root + 'app/views/registrar/xml_consoles/epp_requests'
+ xml = File.read("#{xml_dir_path}/#{params[:obj]}/#{params[:epp_action]}.xml")
+ xml.gsub!('ABC-12345', "#{cl_trid}")
+ render text: xml
+ end
end
end
diff --git a/app/controllers/registrar_controller.rb b/app/controllers/registrar_controller.rb
deleted file mode 100644
index 47d596fd3..000000000
--- a/app/controllers/registrar_controller.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-class RegistrarController < ApplicationController
- before_action :authenticate_user!, :check_ip
- layout 'registrar/application'
-
- include Registrar::ApplicationHelper
-
- helper_method :depp_controller?
- def depp_controller?
- false
- end
-
- def check_ip
- return unless current_user
- unless current_user.is_a? ApiUser
- sign_out(current_user)
- return
- end
- return if Rails.env.development?
- registrar_ip_whitelisted = current_user.registrar.registrar_ip_white?(request.ip)
-
- return if registrar_ip_whitelisted
- flash[:alert] = t('ip_is_not_whitelisted')
- sign_out(current_user)
- redirect_to registrar_login_path and return
- end
-
- helper_method :head_title_sufix
- def head_title_sufix
- t(:registrar_head_title_sufix)
- end
-
- private
-
- def current_ability
- @current_ability ||= Ability.new(current_user, request.remote_ip)
- end
-end
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 82ffd7c2e..3abe9d860 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -93,7 +93,7 @@ class Ability
can :manage, Setting
can :manage, BlockedDomain
can :manage, ReservedDomain
- can :manage, ZonefileSetting
+ can :manage, DNS::Zone
can :manage, DomainVersion
can :manage, ContactVersion
can :manage, Pricelist
diff --git a/app/models/dns.rb b/app/models/dns.rb
new file mode 100644
index 000000000..bdc95d4f2
--- /dev/null
+++ b/app/models/dns.rb
@@ -0,0 +1,5 @@
+module DNS
+ def self.use_relative_model_naming?
+ true
+ end
+end
diff --git a/app/models/dns/zone.rb b/app/models/dns/zone.rb
new file mode 100644
index 000000000..e57c7b712
--- /dev/null
+++ b/app/models/dns/zone.rb
@@ -0,0 +1,48 @@
+module DNS
+ class Zone < ActiveRecord::Base
+ validates :origin, :ttl, :refresh, :retry, :expire, :minimum_ttl, :email, :master_nameserver, presence: true
+ validates :ttl, :refresh, :retry, :expire, :minimum_ttl, numericality: { only_integer: true }
+ validates :origin, uniqueness: true
+
+ before_destroy :check_for_dependencies
+
+ def check_for_dependencies
+ dc = Domain.where("name ILIKE ?", "%.#{origin}").count
+ return if dc == 0
+ errors.add(:base, I18n.t('there_are_count_domains_in_this_zone', count: dc))
+ false
+ end
+
+ def self.generate_zonefiles
+ pluck(:origin).each do |origin|
+ generate_zonefile(origin)
+ end
+ end
+
+ def self.generate_zonefile(origin)
+ filename = "#{origin}.zone"
+
+ STDOUT << "#{Time.zone.now.utc} - Generating zonefile #{filename}\n"
+
+ zf = ActiveRecord::Base.connection.execute(
+ "select generate_zonefile('#{origin}')"
+ )[0]['generate_zonefile']
+
+ File.open("#{ENV['zonefile_export_dir']}/#{filename}", 'w') { |f| f.write(zf) }
+
+ STDOUT << "#{Time.zone.now.utc} - Successfully generated zonefile #{filename}\n"
+ end
+
+ def self.origins
+ pluck(:origin)
+ end
+
+ def to_s
+ origin
+ end
+
+ def to_partial_path
+ 'zone'
+ end
+ end
+end
diff --git a/app/models/version/zonefile_setting_version.rb b/app/models/version/zonefile_setting_version.rb
deleted file mode 100644
index d8d195d5a..000000000
--- a/app/models/version/zonefile_setting_version.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class ZonefileSettingVersion < PaperTrail::Version
- include VersionSession
- self.table_name = :log_zonefile_settings
- self.sequence_name = :log_zonefile_settings_id_seq
-end
diff --git a/app/models/zonefile_setting.rb b/app/models/zonefile_setting.rb
deleted file mode 100644
index 9f2b2b862..000000000
--- a/app/models/zonefile_setting.rb
+++ /dev/null
@@ -1,42 +0,0 @@
-class ZonefileSetting < ActiveRecord::Base
- include Versions # version/zonefile_setting_version.rb
- validates :origin, :ttl, :refresh, :retry, :expire, :minimum_ttl, :email, :master_nameserver, presence: true
- validates :ttl, :refresh, :retry, :expire, :minimum_ttl, numericality: { only_integer: true }
- validates :origin, uniqueness: true
-
- before_destroy :check_for_dependencies
- def check_for_dependencies
- dc = Domain.where("name ILIKE ?", "%.#{origin}").count
- return if dc == 0
- errors.add(:base, I18n.t('there_are_count_domains_in_this_zone', count: dc))
- false
- end
-
- def self.generate_zonefiles
- pluck(:origin).each do |origin|
- generate_zonefile(origin)
- end
- end
-
- def self.generate_zonefile(origin)
- filename = "#{origin}.zone"
-
- STDOUT << "#{Time.zone.now.utc} - Generating zonefile #{filename}\n"
-
- zf = ActiveRecord::Base.connection.execute(
- "select generate_zonefile('#{origin}')"
- )[0]['generate_zonefile']
-
- File.open("#{ENV['zonefile_export_dir']}/#{filename}", 'w') { |f| f.write(zf) }
-
- STDOUT << "#{Time.zone.now.utc} - Successfully generated zonefile #{filename}\n"
- end
-
- def self.origins
- pluck(:origin)
- end
-
- def to_s
- origin
- end
-end
diff --git a/app/validators/domain_name_validator.rb b/app/validators/domain_name_validator.rb
index be8cbb65f..49939087c 100644
--- a/app/validators/domain_name_validator.rb
+++ b/app/validators/domain_name_validator.rb
@@ -12,7 +12,7 @@ class DomainNameValidator < ActiveModel::EachValidator
return true unless value
value = value.mb_chars.downcase.strip
- origins = ZonefileSetting.origins
+ origins = DNS::Zone.origins
# if someone tries to register an origin domain, let this validation pass
# the error will be caught in blocked domains validator
return true if origins.include?(value)
@@ -38,7 +38,7 @@ class DomainNameValidator < ActiveModel::EachValidator
def validate_blocked(value)
return true unless value
return false if BlockedDomain.where(name: value).count > 0
- ZonefileSetting.where(origin: value).count.zero?
+ DNS::Zone.where(origin: value).count.zero?
end
end
end
diff --git a/app/views/admin/_menu.haml b/app/views/admin/_menu.haml
index 8b63b2c25..fbb1728a9 100644
--- a/app/views/admin/_menu.haml
+++ b/app/views/admin/_menu.haml
@@ -31,7 +31,7 @@
%li.divider
%li.dropdown-header= t(:system)
%li= link_to t(:settings), admin_settings_path
- %li= link_to t(:zonefile), admin_zonefile_settings_path
+ %li= link_to t('.zones'), admin_zones_path
%li= link_to t('.blocked_domains'), admin_blocked_domains_path
%li= link_to t('.reserved_domains'), admin_reserved_domains_path
%li= link_to t(:mail_templates), admin_mail_templates_path
diff --git a/app/views/admin/zonefile_settings/_form.haml b/app/views/admin/dns/zones/_form.haml
similarity index 69%
rename from app/views/admin/zonefile_settings/_form.haml
rename to app/views/admin/dns/zones/_form.haml
index 42ef94efa..b7f413156 100644
--- a/app/views/admin/zonefile_settings/_form.haml
+++ b/app/views/admin/dns/zones/_form.haml
@@ -1,5 +1,4 @@
-
-= form_for [:admin, @zonefile_setting], html: { class: 'form-horizontal' } do |f|
+= form_for [:admin, zone], html: { class: 'form-horizontal' } do |f|
.row
.col-md-8
#domain-statuses
@@ -9,52 +8,52 @@
.col-md-4.control-label
= f.label :origin
.col-md-8
- - if @zonefile_setting.persisted?
+ - if zone.persisted?
= f.text_field :origin, class: 'form-control', disabled: true
- else
- = f.text_field :origin, class: 'form-control'
+ = f.text_field :origin, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :ttl
.col-md-8
- = f.text_field :ttl, class: 'form-control'
+ = f.number_field :ttl, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :refresh
.col-md-8
- = f.text_field :refresh, class: 'form-control'
+ = f.number_field :refresh, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :retry
.col-md-8
- = f.text_field :retry, class: 'form-control'
+ = f.number_field :retry, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :expire
.col-md-8
- = f.text_field :expire, class: 'form-control'
+ = f.number_field :expire, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :minimum_ttl
.col-md-8
- = f.text_field :minimum_ttl, class: 'form-control'
+ = f.number_field :minimum_ttl, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :email
.col-md-8
- = f.text_field :email, class: 'form-control'
+ = f.email_field :email, class: 'form-control', required: true
.form-group
.col-md-4.control-label
= f.label :master_nameserver
.col-md-8
- = f.text_field :master_nameserver, class: 'form-control'
+ = f.text_field :master_nameserver, class: 'form-control', required: true
.form-group
.col-md-4.control-label
@@ -77,4 +76,4 @@
%hr
.row
.col-md-8.text-right
- %button.btn.btn-primary= t(:save)
+ %button.btn.btn-success= t(".#{zone.new_record? ? 'create' : 'update'}_btn")
diff --git a/app/views/admin/dns/zones/_zone.html.erb b/app/views/admin/dns/zones/_zone.html.erb
new file mode 100644
index 000000000..3a2d782d4
--- /dev/null
+++ b/app/views/admin/dns/zones/_zone.html.erb
@@ -0,0 +1,9 @@
+
+ | <%= zone.origin %> |
+
+ <%= link_to t('.edit_btn'), edit_admin_zone_path(zone), class: 'btn btn-xs btn-primary' %>
+ <%= link_to t('.generate_zone_file_btn'),
+ admin_zonefiles_path(origin: zone.origin),
+ method: 'post', class: 'btn btn-xs btn-primary' %>
+ |
+
diff --git a/app/views/admin/dns/zones/edit.html.erb b/app/views/admin/dns/zones/edit.html.erb
new file mode 100644
index 000000000..645a77197
--- /dev/null
+++ b/app/views/admin/dns/zones/edit.html.erb
@@ -0,0 +1,20 @@
+
+ - <%= link_to t('admin.dns.zones.index.title'), admin_zones_path %>
+
+
+
+
+<%= render 'form', zone: @zone %>
diff --git a/app/views/admin/dns/zones/index.html.erb b/app/views/admin/dns/zones/index.html.erb
new file mode 100644
index 000000000..eb945873e
--- /dev/null
+++ b/app/views/admin/dns/zones/index.html.erb
@@ -0,0 +1,28 @@
+
+
+<% if @zones.present? %>
+
+
+
+ | <%= DNS::Zone.human_attribute_name :origin %> |
+ |
+
+
+
+
+ <%= render @zones %>
+
+
+<% else %>
+ <%= t '.not_found' %>
+<% end %>
diff --git a/app/views/admin/dns/zones/new.html.erb b/app/views/admin/dns/zones/new.html.erb
new file mode 100644
index 000000000..fc37f984b
--- /dev/null
+++ b/app/views/admin/dns/zones/new.html.erb
@@ -0,0 +1,9 @@
+
+ - <%= link_to t('admin.dns.zones.index.title'), admin_zones_path %>
+
+
+
+
+<%= render 'form', zone: @zone %>
diff --git a/app/views/admin/zonefile_settings/edit.haml b/app/views/admin/zonefile_settings/edit.haml
deleted file mode 100644
index 93234ed2e..000000000
--- a/app/views/admin/zonefile_settings/edit.haml
+++ /dev/null
@@ -1,7 +0,0 @@
-- content_for :actions do
- = link_to(t(:back), admin_zonefile_settings_path, class: 'btn btn-default')
- = link_to(t(:delete), admin_zonefile_setting_path(@zonefile_setting),
- method: :delete, data: { confirm: t(:are_you_sure) }, class: 'btn btn-danger')
-= render 'shared/title', name: t(:edit_zone)
-
-= render 'form'
diff --git a/app/views/admin/zonefile_settings/index.haml b/app/views/admin/zonefile_settings/index.haml
deleted file mode 100644
index a062c0793..000000000
--- a/app/views/admin/zonefile_settings/index.haml
+++ /dev/null
@@ -1,22 +0,0 @@
-- content_for :actions do
- = link_to(t(:new), new_admin_zonefile_setting_path, class: 'btn btn-primary')
-= render 'shared/title', name: t(:zonefile_settings)
-
-.row
- .col-md-12
- .table-responsive
- %table.table.table-hover.table-bordered.table-condensed
- %thead
- %tr
- %th{class: 'col-xs-10'}
- = t(:origin)
- %th{class: 'col-xs-2'}
- = t(:action)
- %tbody
- - @zonefile_settings.each do |x|
- %tr
- %td= link_to(x, edit_admin_zonefile_setting_path(x))
- %td
- = link_to(t(:generate_zonefile),
- admin_zonefiles_path(origin: x.origin),
- method: 'post', class: 'btn btn-xs btn-primary')
diff --git a/app/views/admin/zonefile_settings/new.haml b/app/views/admin/zonefile_settings/new.haml
deleted file mode 100644
index 211054e03..000000000
--- a/app/views/admin/zonefile_settings/new.haml
+++ /dev/null
@@ -1,5 +0,0 @@
-- content_for :actions do
- = link_to(t(:back), admin_zonefile_settings_path, class: 'btn btn-default')
-= render 'shared/title', name: t(:new_zone)
-
-= render 'form'
diff --git a/app/views/layouts/registrar/application.haml b/app/views/layouts/registrar/application.haml
deleted file mode 100644
index df936bbee..000000000
--- a/app/views/layouts/registrar/application.haml
+++ /dev/null
@@ -1,75 +0,0 @@
-!!! 5
-%html{lang: I18n.locale.to_s}
- %head
- %meta{charset: "utf-8"}/
- %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
- %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
- %meta{content: "Full stack top-level domain (TLD) management.", name: "description"}/
- %meta{content: "Gitlab LTD", name: "author"}/
- - if content_for? :head_title
- = yield :head_title
- - else
- %title= t(:registrar_head_title)
- = csrf_meta_tags
- = stylesheet_link_tag 'registrar-manifest', media: 'all', 'data-turbolinks-track' => true
- = javascript_include_tag 'registrar-manifest', 'data-turbolinks-track' => true
- = favicon_link_tag 'favicon.ico'
- %body
- / Fixed navbar
- %nav.navbar.navbar-default.navbar-fixed-top
- .container
- .navbar-header
- %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"}
- %span.sr-only Toggle navigation
- %span.icon-bar
- %span.icon-bar
- %span.icon-bar
- = link_to main_app.registrar_root_path, class: 'navbar-brand' do
- = t(:registrar_head_title)
- - if unstable_env.present?
- .text-center
- %small{style: 'color: #0074B3;'}= unstable_env
- - if current_user
- .navbar-collapse.collapse
- %ul.nav.navbar-nav.public-nav
- - if can? :view, Depp::Domain
- - active_class = %w(registrar/domains registrar/check registrar/renew registrar/tranfer registrar/keyrelays).include?(params[:controller]) ? 'active' :nil
- %li{class: active_class}= link_to t(:domains), registrar_domains_path
-
- - if can? :view, Depp::Contact
- - active_class = ['registrar/contacts'].include?(params[:controller]) ? 'active' :nil
- %li{class: active_class}= link_to t(:contacts), registrar_contacts_path
-
- - if can? :show, Invoice
- - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil
- %li{class: active_class}= link_to t(:billing), registrar_invoices_path
-
- - if !Rails.env.production? && can?(:manage, :xml_console)
- - active_class = ['registrar/xml_consoles'].include?(params[:controller]) ? 'active' :nil
- %li{class: active_class}= link_to t(:xml_console), registrar_xml_console_path
-
- %ul.nav.navbar-nav.navbar-right
- %li.dropdown
- %a.dropdown-toggle{"data-toggle" => "dropdown", href: "#"}
- = "#{current_user} (#{current_user.roles.first}) - #{current_user.registrar}"
- %span.caret
- %ul.dropdown-menu{role: "menu"}
- - ApiUser.all_by_identity_code(current_user.identity_code).each do |x|
- %li= link_to "#{x} (#{x.roles.first}) - #{x.registrar}", "/registrar/switch_user/#{x.id}"
- - if user_signed_in?
- %li= link_to t(:log_out_), '/registrar/logout'
-
- .container
- = render 'shared/flash'
- - if depp_controller?
- = render 'registrar/shared/epp_results'
- = yield
-
- %footer.footer
- .container
- %row
- .col-md-6
- = image_tag 'eis-logo-et.png'
- .col-md-6.text-right
- Version
- = CURRENT_COMMIT_HASH
diff --git a/app/views/layouts/registrar/base.haml b/app/views/layouts/registrar/base.haml
new file mode 100644
index 000000000..a2add9f20
--- /dev/null
+++ b/app/views/layouts/registrar/base.haml
@@ -0,0 +1,48 @@
+!!! 5
+%html{lang: I18n.locale.to_s}
+ %head
+ %meta{charset: "utf-8"}/
+ %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
+ %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
+ %meta{content: "Full stack top-level domain (TLD) management.", name: "description"}/
+ %meta{content: "Gitlab LTD", name: "author"}/
+ - if content_for? :head_title
+ = yield :head_title
+ - else
+ %title= t(:registrar_head_title)
+ = csrf_meta_tags
+ = stylesheet_link_tag 'registrar-manifest', media: 'all', 'data-turbolinks-track' => true
+ = javascript_include_tag 'registrar-manifest', 'data-turbolinks-track' => true
+ = favicon_link_tag 'favicon.ico'
+ %body
+ / Fixed navbar
+ %nav.navbar.navbar-default.navbar-fixed-top
+ .container
+ .navbar-header
+ %button.navbar-toggle.collapsed{"aria-controls" => "navbar", "aria-expanded" => "false", "data-target" => "#navbar", "data-toggle" => "collapse", :type => "button"}
+ %span.sr-only Toggle navigation
+ %span.icon-bar
+ %span.icon-bar
+ %span.icon-bar
+ = link_to main_app.registrar_root_path, class: 'navbar-brand' do
+ = t(:registrar_head_title)
+ - if unstable_env.present?
+ .text-center
+ %small{style: 'color: #0074B3;'}= unstable_env
+ - if current_user
+ = render 'navbar'
+
+ .container
+ = render 'shared/flash'
+ - if depp_controller?
+ = render 'registrar/shared/epp_results'
+ = yield
+
+ %footer.footer
+ .container
+ %row
+ .col-md-6
+ = image_tag 'eis-logo-et.png'
+ .col-md-6.text-right
+ Version
+ = CURRENT_COMMIT_HASH
diff --git a/app/views/registrar/base/_form_errors.html.erb b/app/views/registrar/base/_form_errors.html.erb
new file mode 100644
index 000000000..0f898c81d
--- /dev/null
+++ b/app/views/registrar/base/_form_errors.html.erb
@@ -0,0 +1,11 @@
+<% if target.errors.any? %>
+
+
<%= pluralize(target.errors.count, 'error') %> prohibited this <%= target.model_name.human.downcase %> from being saved:
+
+
+ <% target.errors.full_messages.each do |message| %>
+ - <%= message %>
+ <% end %>
+
+