mirror of
https://github.com/internetee/registry.git
synced 2025-07-03 09:43:36 +02:00
Registrant domain update confirmation
This commit is contained in:
parent
254849494f
commit
ee39181094
16 changed files with 236 additions and 10 deletions
|
@ -32,3 +32,15 @@ h1, h2, h3, h4
|
||||||
|
|
||||||
.semifooter
|
.semifooter
|
||||||
padding: 42px 0 80px 0
|
padding: 42px 0 80px 0
|
||||||
|
|
||||||
|
.confirmation
|
||||||
|
padding: 40px 0 20px 0
|
||||||
|
.column-keys
|
||||||
|
text-align: right
|
||||||
|
width: 49%
|
||||||
|
float: left
|
||||||
|
.column-values
|
||||||
|
float: right
|
||||||
|
font-weight: bold
|
||||||
|
text-align: left
|
||||||
|
width: 49%
|
||||||
|
|
|
@ -0,0 +1,12 @@
|
||||||
|
class Registrant::DomainDeleteConfirmsController < RegistrantController
|
||||||
|
skip_before_action :authenticate_user!, only: [:show, :create]
|
||||||
|
skip_authorization_check only: [:show, :create]
|
||||||
|
|
||||||
|
def show
|
||||||
|
@domain = Domain.find(params[:id])
|
||||||
|
@domain = nil unless @domain.registrant_delete_confirmable?(params[:token])
|
||||||
|
end
|
||||||
|
|
||||||
|
def create
|
||||||
|
end
|
||||||
|
end
|
|
@ -1,12 +1,40 @@
|
||||||
class Registrant::DomainUpdateConfirmsController < RegistrantController
|
class Registrant::DomainUpdateConfirmsController < RegistrantController
|
||||||
skip_before_action :authenticate_user!, only: [:show, :create]
|
skip_before_action :authenticate_user!, only: [:show, :update]
|
||||||
skip_authorization_check only: [:show, :create]
|
skip_authorization_check only: [:show, :update]
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
return if params[:confirmed] || params[:rejected]
|
||||||
@domain = Domain.find(params[:id])
|
@domain = Domain.find(params[:id])
|
||||||
@domain = nil unless @domain.registrant_update_confirmable?(params[:token])
|
@domain = nil unless @domain.registrant_update_confirmable?(params[:token])
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def update
|
||||||
|
@domain = Domain.find(params[:id])
|
||||||
|
unless @domain.registrant_update_confirmable?(params[:token])
|
||||||
|
flash[:alert] = t(:registrant_domain_verification_failed)
|
||||||
|
return render 'show'
|
||||||
|
end
|
||||||
|
|
||||||
|
@registrant_verification = RegistrantVerification.new(domain_id: @domain.id,
|
||||||
|
domain_name: @domain.name,
|
||||||
|
verification_token: params[:token])
|
||||||
|
|
||||||
|
if params[:rejected]
|
||||||
|
if @registrant_verification.domain_registrant_change_reject!
|
||||||
|
flash[:notice] = t(:registrant_domain_verification_rejected)
|
||||||
|
redirect_to registrant_domain_update_confirm_path(@domain.id, rejected: true)
|
||||||
|
else
|
||||||
|
flash[:alert] = t(:registrant_domain_verification_rejected_failed)
|
||||||
|
return render 'show'
|
||||||
|
end
|
||||||
|
elsif params[:confirmed]
|
||||||
|
if @registrant_verification.domain_registrant_change_confirm!
|
||||||
|
flash[:notice] = t(:registrant_domain_verification_confirmed)
|
||||||
|
redirect_to registrant_domain_update_confirm_path(@domain.id, confirmed: true)
|
||||||
|
else
|
||||||
|
flash[:alert] = t(:registrant_domain_verification_confirmed_failed)
|
||||||
|
return render 'show'
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -198,6 +198,15 @@ class Domain < ActiveRecord::Base
|
||||||
true
|
true
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def registrant_delete_confirmable?(token)
|
||||||
|
return false unless pending_delete?
|
||||||
|
return false if registrant_verification_token.blank?
|
||||||
|
return false if registrant_verification_asked_at.blank?
|
||||||
|
return false if token.blank?
|
||||||
|
return false if registrant_verification_token != token
|
||||||
|
true
|
||||||
|
end
|
||||||
|
|
||||||
def registrant_verification_asked?
|
def registrant_verification_asked?
|
||||||
registrant_verification_asked_at.present? && registrant_verification_token.present?
|
registrant_verification_asked_at.present? && registrant_verification_token.present?
|
||||||
end
|
end
|
||||||
|
@ -275,6 +284,15 @@ class Domain < ActiveRecord::Base
|
||||||
name
|
name
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def pending_registrant_name
|
||||||
|
return '' if pending_json.blank?
|
||||||
|
return '' if pending_json['domain'].blank?
|
||||||
|
return '' if pending_json['domain']['registrant_id'].blank?
|
||||||
|
registrant = Registrant.find_by(id: pending_json['domain']['registrant_id'].last)
|
||||||
|
registrant.try(:name)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
# rubocop:disable Lint/Loop
|
# rubocop:disable Lint/Loop
|
||||||
def generate_auth_info
|
def generate_auth_info
|
||||||
begin
|
begin
|
||||||
|
|
|
@ -1,5 +1,28 @@
|
||||||
# Used in Registrant portal to collect registrant verifications
|
# Used in Registrant portal to collect registrant verifications
|
||||||
# Registrant postgres user can access this table directly.
|
# Registrant postgres user can access this table directly.
|
||||||
class RegistrantVerification < ActiveRecord::Base
|
class RegistrantVerification < ActiveRecord::Base
|
||||||
validates :verification_token, :domain_name, presence: true
|
# actions
|
||||||
|
CONFIRMED = 'confirmed'
|
||||||
|
REJECTED = 'rejected'
|
||||||
|
|
||||||
|
# action types
|
||||||
|
DOMAIN_REGISTRANT_CHANGE = 'domain_registrant_change'
|
||||||
|
DOMAIN_DELETE = 'domain_delete'
|
||||||
|
|
||||||
|
belongs_to :domain
|
||||||
|
|
||||||
|
validates :verification_token, :domain_name, :domain, :action, :action_type, presence: true
|
||||||
|
validates :domain, uniqueness: { scope: [:domain_id, :verification_token] }
|
||||||
|
|
||||||
|
def domain_registrant_change_confirm!
|
||||||
|
self.action_type = DOMAIN_REGISTRANT_CHANGE
|
||||||
|
self.action = CONFIRMED
|
||||||
|
save
|
||||||
|
end
|
||||||
|
|
||||||
|
def domain_registrant_change_reject!
|
||||||
|
self.action_type = DOMAIN_REGISTRANT_CHANGE
|
||||||
|
self.action = REJECTED
|
||||||
|
save
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
4
app/views/registrant/domain_delete_confirms/show.haml
Normal file
4
app/views/registrant/domain_delete_confirms/show.haml
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
- if @domain.present?
|
||||||
|
- else
|
||||||
|
%h1= t(:not_valid_domain_verification_title).html_safe
|
||||||
|
%p= t(:not_valid_domain_verification_body).html_safe
|
|
@ -1,4 +1,46 @@
|
||||||
|
- if params[:confirmed].present?
|
||||||
|
.row
|
||||||
|
.col-md-12
|
||||||
|
%h1= t(:domain_registrant_change_confirmed_title)
|
||||||
|
.row
|
||||||
|
.col-md-12
|
||||||
|
%p= t(:domain_registrant_change_confirmed_body)
|
||||||
|
- elsif params[:rejected].present?
|
||||||
|
.row
|
||||||
|
.col-md-12
|
||||||
|
%h1= t(:domain_registrant_change_rejected_title)
|
||||||
|
.row
|
||||||
|
.col-md-12
|
||||||
|
%p= t(:domain_registrant_change_rejected_body)
|
||||||
|
- else
|
||||||
- if @domain.present?
|
- if @domain.present?
|
||||||
|
.row
|
||||||
|
.col-md-12
|
||||||
|
%h1= t(:domain_registrant_change_title)
|
||||||
|
.row
|
||||||
|
.col-md-12
|
||||||
|
%p= t(:domain_registrant_change_body)
|
||||||
|
|
||||||
|
%hr
|
||||||
|
.row
|
||||||
|
.col-md-12.text-center.confirmation
|
||||||
|
.column-keys
|
||||||
|
%p= t(:domain_name) + ':'
|
||||||
|
%p= t(:current_registrant) + ':'
|
||||||
|
%p= t(:new_pending_registrant) + ':'
|
||||||
|
.column-values
|
||||||
|
%p= @domain.name
|
||||||
|
%p= @domain.registrant_name
|
||||||
|
%p= @domain.pending_registrant_name
|
||||||
|
|
||||||
|
.row
|
||||||
|
.col-md-12.text-center
|
||||||
|
.confirmation
|
||||||
|
= form_for registrant_domain_update_confirm_path(@domain.id), method: :patch do |f|
|
||||||
|
= hidden_field_tag :token, params[:token]
|
||||||
|
= f.button t(:confirm_domain_registrant_update), name: 'confirmed', class: 'btn btn-primary'
|
||||||
|
= f.button t(:reject_domain_registrant_update), name: 'rejected', class: 'btn btn-warning'
|
||||||
|
%hr
|
||||||
- else
|
- else
|
||||||
%h1= t(:not_valid_domain_verification_title).html_safe
|
%h1= t(:not_valid_domain_verification_title).html_safe
|
||||||
%p= t(:not_valid_domain_verification_body).html_safe
|
%p= t(:not_valid_domain_verification_body).html_safe
|
||||||
|
|
|
@ -540,7 +540,6 @@ en:
|
||||||
password: 'Password'
|
password: 'Password'
|
||||||
log_in: 'Log in'
|
log_in: 'Log in'
|
||||||
log_out: 'Log out (%{user})'
|
log_out: 'Log out (%{user})'
|
||||||
domain_name: 'Domain name'
|
|
||||||
domains: 'Domains'
|
domains: 'Domains'
|
||||||
register: 'Register'
|
register: 'Register'
|
||||||
check: 'Check'
|
check: 'Check'
|
||||||
|
@ -773,3 +772,20 @@ en:
|
||||||
not_valid_domain_verification_body: This could mean your verification has been expired or done already.<br><br>Please contact us if you think something is wrong.
|
not_valid_domain_verification_body: This could mean your verification has been expired or done already.<br><br>Please contact us if you think something is wrong.
|
||||||
upload_crt: 'Upload CRT'
|
upload_crt: 'Upload CRT'
|
||||||
crt_or_csr_must_be_present: 'CRT or CSR must be present'
|
crt_or_csr_must_be_present: 'CRT or CSR must be present'
|
||||||
|
confirm_domain_delete: 'Confirm domain delete'
|
||||||
|
reject_domain_delete: 'Reject domain delete'
|
||||||
|
confirm_domain_registrant_update: 'Confirm domain ownership change'
|
||||||
|
reject_domain_registrant_update: 'Reject domain ownership change'
|
||||||
|
domain_registrant_change_title: 'Please confirm or reject domain ownership change'
|
||||||
|
domain_registrant_change_body: 'There is a request to change domain ownership. Before doing it we need your confirmation.'
|
||||||
|
new_pending_registrant: 'New owner'
|
||||||
|
current_registrant: 'Current owner'
|
||||||
|
registrant_domain_verification_failed: 'Domain verification not available'
|
||||||
|
domain_registrant_change_confirmed_title: 'Domain owner change has been confirmed'
|
||||||
|
domain_registrant_change_confirmed_body: 'You have successfully confirmed domain owner change.'
|
||||||
|
registrant_domain_verification_confirmed: 'Domain owner change has successfully confirmed.'
|
||||||
|
registrant_domain_verification_confirmed_failed: 'Something went wrong'
|
||||||
|
domain_registrant_change_rejected_title: 'Domain owner change has been rejected'
|
||||||
|
domain_registrant_change_rejected_body: 'You have rejected domain owner change.'
|
||||||
|
registrant_domain_verification_rejected: 'Domain owner change has been rejected successfully.'
|
||||||
|
registrant_domain_verification_rejected_failed: 'Something went wrong'
|
||||||
|
|
|
@ -105,6 +105,7 @@ Rails.application.routes.draw do
|
||||||
# resources :account_activities
|
# resources :account_activities
|
||||||
|
|
||||||
resources :domain_update_confirms
|
resources :domain_update_confirms
|
||||||
|
resources :domain_delete_confirms
|
||||||
|
|
||||||
devise_scope :user do
|
devise_scope :user do
|
||||||
get 'login' => 'sessions#login'
|
get 'login' => 'sessions#login'
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
class AddAcitonToRegistrantVerification < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :registrant_verifications, :action, :string
|
||||||
|
end
|
||||||
|
end
|
|
@ -0,0 +1,6 @@
|
||||||
|
class AddDomainIdToRegistrantVerifications < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :registrant_verifications, :domain_id, :integer
|
||||||
|
add_index :registrant_verifications, :domain_id
|
||||||
|
end
|
||||||
|
end
|
|
@ -0,0 +1,5 @@
|
||||||
|
class AddActionTypeToRegistrantVerifications < ActiveRecord::Migration
|
||||||
|
def change
|
||||||
|
add_column :registrant_verifications, :action_type, :string
|
||||||
|
end
|
||||||
|
end
|
|
@ -11,7 +11,7 @@
|
||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema.define(version: 20150518084324) do
|
ActiveRecord::Schema.define(version: 20150519102521) do
|
||||||
|
|
||||||
# These are extensions that must be enabled in order to support this database
|
# These are extensions that must be enabled in order to support this database
|
||||||
enable_extension "plpgsql"
|
enable_extension "plpgsql"
|
||||||
|
@ -845,9 +845,13 @@ ActiveRecord::Schema.define(version: 20150518084324) do
|
||||||
t.string "verification_token"
|
t.string "verification_token"
|
||||||
t.datetime "created_at"
|
t.datetime "created_at"
|
||||||
t.datetime "updated_at"
|
t.datetime "updated_at"
|
||||||
|
t.string "action"
|
||||||
|
t.integer "domain_id"
|
||||||
|
t.string "action_type"
|
||||||
end
|
end
|
||||||
|
|
||||||
add_index "registrant_verifications", ["created_at"], name: "index_registrant_verifications_on_created_at", using: :btree
|
add_index "registrant_verifications", ["created_at"], name: "index_registrant_verifications_on_created_at", using: :btree
|
||||||
|
add_index "registrant_verifications", ["domain_id"], name: "index_registrant_verifications_on_domain_id", using: :btree
|
||||||
|
|
||||||
create_table "registrars", force: :cascade do |t|
|
create_table "registrars", force: :cascade do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
Fabricator(:registrant_verification) do
|
Fabricator(:registrant_verification) do
|
||||||
domain_name { sequence(:name) { |i| "domain#{i}.ee" } }
|
domain_name { sequence(:name) { |i| "domain#{i}.ee" } }
|
||||||
|
domain(fabricate: :domain)
|
||||||
verification_token '123'
|
verification_token '123'
|
||||||
|
action 'confirmed'
|
||||||
|
action_type 'registrant_change'
|
||||||
end
|
end
|
||||||
|
|
44
spec/features/registrant/domain_delete_confirm_spec.rb
Normal file
44
spec/features/registrant/domain_delete_confirm_spec.rb
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
require 'rails_helper'
|
||||||
|
|
||||||
|
feature 'DomainDeleteConfirm', type: :feature do
|
||||||
|
context 'as unknown user with domain without token' do
|
||||||
|
before :all do
|
||||||
|
@domain = Fabricate(:domain)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should see warning info if token is missing request' do
|
||||||
|
visit "/registrant/domain_delete_confirms/#{@domain.id}"
|
||||||
|
current_path.should == "/registrant/domain_delete_confirms/#{@domain.id}"
|
||||||
|
page.should have_text('Domain verification not available')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should see warning info if token is missing request' do
|
||||||
|
visit "/registrant/domain_delete_confirms/#{@domain.id}"
|
||||||
|
current_path.should == "/registrant/domain_delete_confirms/#{@domain.id}"
|
||||||
|
page.should have_text('Domain verification not available')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
context 'as unknown user with domain with token' do
|
||||||
|
before :all do
|
||||||
|
@domain = Fabricate(
|
||||||
|
:domain,
|
||||||
|
registrant_verification_token: '123',
|
||||||
|
registrant_verification_asked_at: Time.zone.now
|
||||||
|
)
|
||||||
|
@domain.domain_statuses.create(value: DomainStatus::PENDING_DELETE)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should see warning info if token is missing in request' do
|
||||||
|
visit "/registrant/domain_delete_confirms/#{@domain.id}?token=wrong_token"
|
||||||
|
current_path.should == "/registrant/domain_delete_confirms/#{@domain.id}"
|
||||||
|
page.should have_text('Domain verification not available')
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should show domain info and confirm buttons' do
|
||||||
|
visit "/registrant/domain_delete_confirms/#{@domain.id}?token=123"
|
||||||
|
current_path.should == "/registrant/domain_delete_confirms/#{@domain.id}"
|
||||||
|
page.should_not have_text('Domain verification not available')
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -10,7 +10,10 @@ describe RegistrantVerification do
|
||||||
@registrant_verification.valid?
|
@registrant_verification.valid?
|
||||||
@registrant_verification.errors.full_messages.should match_array([
|
@registrant_verification.errors.full_messages.should match_array([
|
||||||
"Domain name is missing",
|
"Domain name is missing",
|
||||||
"Verification token is missing"
|
"Verification token is missing",
|
||||||
|
"Action is missing",
|
||||||
|
"Action type is missing",
|
||||||
|
"Domain is missing"
|
||||||
])
|
])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue