Merge branch 'master' into improve-test-env-config

app/api/repp/api.rb

@@ -59,5 +59,6 @@ module Repp
     mount Repp::AccountV1
     mount Repp::DomainTransfersV1
     mount Repp::NameserversV1
+    mount Repp::DomainContactsV1
   end
 end

app/api/repp/domain_contacts_v1.rb

@@ -0,0 +1,47 @@
+module Repp
+  class DomainContactsV1 < Grape::API
+    version 'v1', using: :path
+
+    resource :domains do
+      resource :contacts do
+        patch '/' do
+          current_contact = current_user.registrar.contacts
+                                .find_by(code: params[:current_contact_id])
+          new_contact = current_user.registrar.contacts.find_by(code: params[:new_contact_id])
+
+          unless current_contact
+            error!({ error: { type: 'invalid_request_error',
+                              param: 'current_contact_id',
+                              message: "No such contact: #{params[:current_contact_id]}"} },
+                   :bad_request)
+          end
+
+          unless new_contact
+            error!({ error: { type: 'invalid_request_error',
+                              param: 'new_contact_id',
+                              message: "No such contact: #{params[:new_contact_id]}" } },
+                   :bad_request)
+          end
+
+          if new_contact.invalid?
+            error!({ error: { type: 'invalid_request_error',
+                              param: 'new_contact_id',
+                              message: 'New contact must be valid' } },
+                   :bad_request)
+          end
+
+          if current_contact == new_contact
+            error!({ error: { type: 'invalid_request_error',
+                              message: 'New contact ID must be different from current' \
+                                ' contact ID' } },
+                   :bad_request)
+          end
+
+          affected_domains, skipped_domains = TechDomainContact
+                                                  .replace(current_contact, new_contact)
+          @response = { affected_domains: affected_domains, skipped_domains: skipped_domains }
+        end
+      end
+    end
+  end
+end

app/assets/javascripts/popover.js

@@ -0,0 +1,9 @@
+(function() {
+    function initPopover() {
+        $(function () {
+            $('[data-toggle="popover"]').popover();
+        })
+    }
+
+    initPopover();
+})();

app/assets/javascripts/registrar-manifest.coffee

@@ -7,6 +7,8 @@
 #= require select2
 #= require datepicker
 #= require spell_check
+#= require popover
+#= require text_field_trimmer
 #= require shared/general
 #= require registrar/autocomplete
 #= require registrar/application

app/assets/javascripts/text_field_trimmer.js

@@ -0,0 +1,15 @@
+(function () {
+    function trimTextFields() {
+        let selector = 'input[type=text], input[type=search], input[type=email], textarea';
+        let textFields = document.querySelectorAll(selector);
+        let listener = function () {
+            this.value = this.value.trim();
+        };
+
+        for (let field of textFields) {
+            field.addEventListener('change', listener);
+        }
+    }
+
+    trimTextFields();
+})();

app/controllers/registrar/bulk_change_controller.rb

@@ -0,0 +1,20 @@
+class Registrar
+  class BulkChangeController < DeppController
+    helper_method :available_contacts
+
+    def new
+      authorize! :manage, :repp
+      render file: 'registrar/bulk_change/new', locals: { active_tab: default_tab }
+    end
+
+    private
+
+    def available_contacts
+      current_user.registrar.contacts.order(:name).pluck(:name, :code)
+    end
+
+    def default_tab
+      :technical_contact
+    end
+  end
+end

app/controllers/registrar/domain_transfers_controller.rb

@@ -1,5 +1,5 @@
 class Registrar
-  class DomainTransfersController < DeppController
+  class DomainTransfersController < BulkChangeController
     before_action do
       authorize! :transfer, Depp::Domain
     end
@@ -58,7 +58,7 @@ class Registrar
           redirect_to registrar_domains_url
         else
           @api_errors = parsed_response[:errors]
-          render :new
+          render file: 'registrar/bulk_change/new', locals: { active_tab: :bulk_transfer }
         end
       else
         params[:request] = true # EPP domain:transfer "op" attribute

app/controllers/registrar/nameservers_controller.rb

@@ -1,9 +1,5 @@
 class Registrar
-  class RegistrarNameserversController < DeppController
-    def edit
-      authorize! :manage, :repp
-    end
-
+  class NameserversController < BulkChangeController
     def update
       authorize! :manage, :repp
 
@@ -52,7 +48,7 @@ class Registrar
         redirect_to registrar_domains_url
       else
         @api_errors = parsed_response[:errors]
-        render :edit
+        render file: 'registrar/bulk_change/new', locals: { active_tab: :nameserver }
       end
     end
   end

app/controllers/registrar/tech_contacts_controller.rb

@@ -0,0 +1,59 @@
+class Registrar
+  class TechContactsController < BulkChangeController
+    def update
+      authorize! :manage, :repp
+
+      uri = URI.parse("#{ENV['repp_url']}domains/contacts")
+
+      request = Net::HTTP::Patch.new(uri)
+      request.set_form_data(current_contact_id: params[:current_contact_id],
+                            new_contact_id: params[:new_contact_id])
+      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
+
+      parsed_response = JSON.parse(response.body, symbolize_names: true)
+
+      if response.code == '200'
+        notices = [t('.replaced')]
+
+        notices << "#{t('.affected_domains')}: #{parsed_response[:affected_domains].join(', ')}"
+
+        if parsed_response[:skipped_domains]
+          notices << "#{t('.skipped_domains')}: #{parsed_response[:skipped_domains].join(', ')}"
+        end
+
+        flash[:notice] = notices
+        redirect_to registrar_domains_url
+      else
+        @error = parsed_response[:error]
+        render file: 'registrar/bulk_change/new', locals: { active_tab: :technical_contact }
+      end
+    end
+  end
+end

app/models/tech_domain_contact.rb

@@ -1,2 +1,23 @@
 class TechDomainContact < DomainContact
+  # Audit log is needed, therefore no raw SQL
+  def self.replace(current_contact, new_contact)
+    affected_domains = []
+    skipped_domains = []
+    tech_contacts = where(contact: current_contact)
+
+    transaction do
+      tech_contacts.each do |tech_contact|
+        if tech_contact.domain.discarded?
+          skipped_domains << tech_contact.domain.name
+          next
+        end
+
+        tech_contact.contact = new_contact
+        tech_contact.save!
+        affected_domains << tech_contact.domain.name
+      end
+    end
+
+    return affected_domains.sort, skipped_domains.sort
+  end
 end

app/views/application/_flash_messages.html.erb

@@ -1,7 +1,11 @@
 <% if flash[:notice] %>
     <div class="alert alert-success alert-dismissible">
         <button class="close" data-dismiss="alert" type=button><span>&times;</span></button>
-        <p><%= flash[:notice] %></p>
+        <% if flash[:notice].respond_to?(:join) %>
+            <p><%= flash[:notice].join('<br>').html_safe %></p>
+        <% else %>
+            <p><%= flash[:notice] %></p>
+        <% end %>
     </div>
 <% end %>
 

app/views/layouts/registrant/application.html.erb

@@ -20,7 +20,7 @@
     <nav class="navbar navbar-default navbar-fixed-top">
       <div class="container">
         <div class="navbar-header">
-          <button aria-controls="navbar" aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
+          <button aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
             <span class="sr-only">Toggle navigation</span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>

app/views/layouts/registrar/base.html.erb

@@ -18,7 +18,7 @@
 <nav class="navbar navbar-default navbar-fixed-top">
     <div class="container">
         <div class="navbar-header">
-            <button aria-controls="navbar" aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
+            <button aria-expanded="false" class="navbar-toggle collapsed" data-target="#navbar" data-toggle="collapse" type="button">
                 <span class="sr-only">Toggle navigation</span>
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
@@ -39,7 +39,7 @@
     </div>
 </nav>
 <div class="container">
-    <%= render 'shared/flash' %>
+    <%= render 'flash_messages' %>
     <% if depp_controller? %>
         <%= render 'registrar/shared/epp_results' %>
     <% end %>

app/views/layouts/registrar/sessions.haml

@@ -1,45 +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"}/
-    - if content_for? :head_title
-      = yield :head_title
-    - else
-      %title= t(:registrar_head_title)
-    = csrf_meta_tags
-    = stylesheet_link_tag 'registrar-manifest', media: 'all'
-    = javascript_include_tag 'registrar-manifest'
-    = favicon_link_tag 'favicon.ico'
-  %body
-    %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 registrar_root_path, class: 'navbar-brand', id: 'registrar-home-btn' 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

app/views/layouts/registrar/sessions.html.erb

@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html lang="<%= locale %>">
+<head>
+    <meta charset="utf-8">
+    <% if content_for? :head_title %>
+        <%= yield :head_title %>
+    <% else %>
+        <title>
+            <%= t(:registrar_head_title) %>
+        </title>
+    <% end %>
+    <%= csrf_meta_tags %>
+    <%= stylesheet_link_tag 'registrar-manifest', media: 'all' %>
+    <%= javascript_include_tag 'registrar-manifest' %>
+</head>
+<body>
+    <nav class="navbar navbar-default navbar-fixed-top">
+        <div class="container">
+            <div class="navbar-header">
+                <%= link_to registrar_root_path, class: 'navbar-brand',
+                            id: 'registrar-home-btn' do %>
+                    <%= t(:registrar_head_title) %>
+                    <% if unstable_env.present? %>
+                        <div class="text-center">
+                            <small style="color: #0074B3;">
+                                <%= unstable_env %>
+                            </small>
+                        </div>
+                    <% end %>
+                <% end %>
+            </div>
+        </div>
+    </nav>
+
+    <div class="container">
+        <%= render 'flash_messages' %>
+        <%= yield %>
+    </div>
+
+    <footer class="footer">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-6">
+                    <%= image_tag 'eis-logo-et.png' %>
+                </div>
+                <div class="col-md-6 text-right">
+                    Version
+                    <%= CURRENT_COMMIT_HASH %>
+                </div>
+            </div>
+        </div>
+    </footer>
+</body>
+</html>

app/views/registrar/bulk_change/_bulk_transfer_form.html.erb

@@ -0,0 +1,34 @@
+<%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %>
+    <%= render 'registrar/domain_transfers/form/api_errors' %>
+
+    <div class="form-group">
+        <div class="col-md-2 control-label">
+            <%= label_tag :batch_file %>
+        </div>
+        <div class="col-md-4">
+            <%= file_field_tag :batch_file, required: true %>
+            <span class="help-block"><%= t '.file_field_hint' %></span>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-4 col-md-offset-2 text-right">
+            <button class="btn btn-warning">
+                <%= t '.submit_btn' %>
+            </button>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <a class="btn btn-default btn-xs" role="button" data-toggle="collapse"
+               href="#bulk_change_bulk_transfer_help"><%= t '.help_btn' %>
+            </a>
+            <div class="collapse" id="bulk_change_bulk_transfer_help">
+                <div class="well">
+                    <%= t '.help' %>
+                </div>
+            </div>
+        </div>
+    </div>
+<% end %>

app/views/registrar/bulk_change/_nameserver_form.html.erb

@@ -1,12 +1,13 @@
-<%= form_tag registrar_update_registrar_nameserver_path, method: :put, class: 'form-horizontal' do %>
+<%= form_tag registrar_nameservers_path, method: :patch, class: 'form-horizontal' do %>
+    <%= render 'registrar/domain_transfers/form/api_errors' %>
+
     <div class="form-group">
         <div class="col-md-2 control-label">
             <%= label_tag :old_hostname %>
         </div>
 
-        <div class="col-md-5">
-            <%= text_field_tag :old_hostname, params[:old_hostname], autofocus: true,
-                               required: true,
+        <div class="col-md-4">
+            <%= text_field_tag :old_hostname, params[:old_hostname], required: true,
                                class: 'form-control' %>
         </div>
     </div>
@@ -16,7 +17,7 @@
             <%= label_tag :new_hostname %>
         </div>
 
-        <div class="col-md-5">
+        <div class="col-md-4">
             <%= text_field_tag :new_hostname, params[:new_hostname], required: true,
                                class: 'form-control' %>
         </div>
@@ -27,7 +28,7 @@
             <%= label_tag :ipv4 %>
         </div>
 
-        <div class="col-md-3">
+        <div class="col-md-4">
             <%= text_area_tag :ipv4, params[:ipv4], class: 'form-control' %>
         </div>
     </div>
@@ -37,17 +38,30 @@
             <%= label_tag :ipv6 %>
         </div>
 
-        <div class="col-md-3">
+        <div class="col-md-4">
             <%= text_area_tag :ipv6, params[:ipv6], class: 'form-control' %>
             <span class="help-block"><%= t '.ip_hint' %></span>
         </div>
     </div>
 
     <div class="form-group">
-        <div class="col-md-5 col-md-offset-2 text-right">
+        <div class="col-md-4 col-md-offset-2 text-right">
             <button class="btn btn-warning">
                 <%= t '.replace_btn' %>
             </button>
         </div>
     </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <a class="btn btn-default btn-xs" role="button" data-toggle="collapse"
+               href="#bulk_change_nameserver_help"><%= t '.help_btn' %>
+            </a>
+            <div class="collapse" id="bulk_change_nameserver_help">
+                <div class="well">
+                    <%= t '.help' %>
+                </div>
+            </div>
+        </div>
+    </div>
 <% end %>

app/views/registrar/bulk_change/_tech_contact_form.html.erb

@@ -0,0 +1,60 @@
+<%= form_tag registrar_tech_contacts_path, method: :patch, class: 'form-horizontal' do %>
+    <% if @error %>
+        <div class="alert alert-danger">
+            <%= @error[:message] %>
+        </div>
+    <% end %>
+
+    <div class="form-group">
+        <div class="col-md-2 control-label">
+            <%= label_tag :current_contact_id, t('.current_contact_id') %>
+        </div>
+
+        <div class="col-md-4">
+            <%= text_field_tag :current_contact_id, params[:current_contact_id],
+                               list: :contacts,
+                               required: true,
+                               autofocus: true,
+                               class: 'form-control' %>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-2 control-label">
+            <%= label_tag :new_contact_id, t('.new_contact_id') %>
+        </div>
+
+        <div class="col-md-4">
+            <%= text_field_tag :new_contact_id, params[:new_contact_id],
+                               list: :contacts,
+                               required: true,
+                               class: 'form-control' %>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-4 col-md-offset-2 text-right">
+            <button class="btn btn-warning">
+                <%= t '.submit_btn' %>
+            </button>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <a class="btn btn-default btn-xs" role="button" data-toggle="collapse"
+               href="#bulk_change_tech_contact_help"><%= t '.help_btn' %></a>
+            <div class="collapse" id="bulk_change_tech_contact_help">
+                <div class="well">
+                    <%= t '.help' %>
+                </div>
+            </div>
+        </div>
+    </div>
+<% end %>
+
+<datalist id="contacts">
+    <% available_contacts.each do |data| %>
+        <option value="<%= data.second %>"><%= data.first %></option>
+    <% end %>
+</datalist>

app/views/registrar/bulk_change/new.html.erb

@@ -0,0 +1,37 @@
+<ol class="breadcrumb">
+    <li><%= link_to t('registrar.domains.index.header'), registrar_domains_path %></li>
+</ol>
+
+<div class="page-header">
+    <h1><%= t '.header' %></h1>
+</div>
+
+
+        <ul class="nav nav-tabs">
+            <li class="<%= 'active' if active_tab == :technical_contact %>">
+                <a href="#technical_contact" data-toggle="tab"><%= t '.technical_contact' %></a>
+            </li>
+
+            <li class="<%= 'active' if active_tab == :nameserver %>">
+                <a href="#nameserver" data-toggle="tab"><%= t '.nameserver' %></a>
+            </li>
+
+            <li class="<%= 'active' if active_tab == :bulk_transfer %>">
+                <a href="#bulk_transfer" data-toggle="tab"><%= t '.bulk_transfer' %></a>
+            </li>
+        </ul>
+
+        <div class="tab-content">
+            <div class="tab-pane<%= ' active' if active_tab == :technical_contact %>"
+                 id="technical_contact">
+                <%= render 'tech_contact_form', available_contacts: available_contacts %>
+            </div>
+
+            <div class="tab-pane<%= ' active' if active_tab == :nameserver %>" id="nameserver">
+                <%= render 'nameserver_form' %>
+            </div>
+
+            <div class="tab-pane<%= ' active' if active_tab == :bulk_transfer %>" id="bulk_transfer">
+                <%= render 'bulk_transfer_form' %>
+            </div>
+        </div>

app/views/registrar/domain_transfers/_form.html.erb

@@ -1,4 +1,6 @@
 <%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %>
+    <%= render 'registrar/domain_transfers/form/api_errors' %>
+
     <div class="form-group">
         <div class="col-md-3 control-label">
             <%= label_tag :domain_name, nil, class: 'required' %>
@@ -30,7 +32,7 @@
     <div class="form-group">
         <div class="col-md-10 text-right">
             <button class="btn btn-warning">
-                <%= t '.transfer_btn' %>
+                <%= t '.submit_btn' %>
             </button>
         </div>
     </div>

app/views/registrar/domain_transfers/form/_batch.html.erb

@@ -1,19 +0,0 @@
-<%= form_tag registrar_domain_transfers_path, multipart: true, class: 'form-horizontal' do %>
-    <div class="form-group">
-        <div class="col-md-3 control-label">
-            <%= label_tag :batch_file %>
-        </div>
-        <div class="col-md-7">
-            <%= file_field_tag :batch_file, required: true %>
-            <span class="help-block"><%= t '.batch_file_help' %></span>
-        </div>
-    </div>
-
-    <div class="form-group">
-        <div class="col-md-10 text-right">
-            <button class="btn btn-warning">
-                <%= t '.transfer_btn' %>
-            </button>
-        </div>
-    </div>
-<% end %>

app/views/registrar/domain_transfers/new.html.erb

@@ -6,24 +6,6 @@
 
 <div class="row">
     <div class="col-md-8">
-        <ul class="nav nav-tabs">
-            <li class="active">
-                <a href="#single" data-toggle="tab"><%= t '.single' %></a>
-            </li>
-
-            <li>
-                <a href="#batch" data-toggle="tab"><%= t '.batch' %></a>
-            </li>
-        </ul>
-
-        <div class="tab-content">
-            <div class="tab-pane active" id="single">
-                <%= render 'registrar/domain_transfers/form/single' %>
-            </div>
-
-            <div class="tab-pane" id="batch">
-                <%= render 'registrar/domain_transfers/form/batch' %>
-            </div>
-        </div>
+        <%= render 'form' %>
     </div>
 </div>

app/views/registrar/domains/index.html.erb

@@ -1,13 +1,13 @@
 <div class="page-header">
     <div class="row">
-        <div class="col-sm-7">
+        <div class="col-sm-5">
             <h1><%= t '.header' %></h1>
         </div>
 
-        <div class="col-sm-5 text-right">
+        <div class="col-sm-7 text-right">
             <%= link_to t('.new_btn'), new_registrar_domain_path, class: 'btn btn-primary' %>
             <%= link_to t('.transfer_btn'), new_registrar_domain_transfer_path, class: 'btn btn-default' %>
-            <%= link_to t('.replace_nameserver_btn'), registrar_edit_registrar_nameserver_path,
+            <%= link_to t('.bulk_change_btn'), new_registrar_bulk_change_path,
                         class: 'btn btn-default' %>
         </div>
     </div>
@@ -24,22 +24,22 @@
         <div class="table-responsive">
             <table class="table table-hover table-bordered table-condensed">
                 <thead>
-                    <tr>
-                        <th class="col-xs-2">
-                            <%= sort_link(@q, 'name') %>
-                        </th>
-                        <th class="col-xs-2">
-                            <%= sort_link @q, 'registrant_name', Registrant.model_name.human %>
-                        </th>
-                        <th class="col-xs-2">
-                            <%= sort_link @q, 'valid_to', Domain.human_attribute_name(:expire_time) %>
-                        </th>
-                        <th class="col-xs-2"></th>
-                    </tr>
+                <tr>
+                    <th class="col-xs-2">
+                        <%= sort_link(@q, 'name') %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link @q, 'registrant_name', Registrant.model_name.human %>
+                    </th>
+                    <th class="col-xs-2">
+                        <%= sort_link @q, 'valid_to', Domain.human_attribute_name(:expire_time) %>
+                    </th>
+                    <th class="col-xs-2"></th>
+                </tr>
                 </thead>
 
                 <tbody>
-                    <%= render @domains %>
+                <%= render @domains %>
                 </tbody>
             </table>
         </div>

app/views/registrar/registrar_nameservers/edit.html.erb

@@ -1,11 +0,0 @@
-<ol class="breadcrumb">
-    <li><%= link_to t('registrar.domains.index.header'), registrar_domains_path %></li>
-</ol>
-
-<div class="page-header">
-    <h1><%= t '.header' %></h1>
-</div>
-
-<%= render 'registrar/domain_transfers/form/api_errors' %>
-
-<%= render 'form' %>