zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-06 01:35:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into change-registrar-area-controller-hierarchy

Browse source 
# Conflicts:
#	app/controllers/registrar/sessions_controller.rb
This commit is contained in:
Artur Beljajev 2017-04-13 11:36:00 +03:00
commit f592adcf06
21 changed files with 607 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/registrant/sessions_controller.rb
View file

@ -29,6 +29,7 @@ class Registrant::SessionsController < Devise::SessionsController
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 Rails.env.test? && phone == "123"
@user = ApiUser.find_by(identity_code: "14212128025")
@ -70,6 +71,7 @@ class Registrant::SessionsController < Devise::SessionsController
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

2
app/controllers/registrar/sessions_controller.rb
View file

@ -103,6 +103,7 @@ class Registrar
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', '')
@ -139,6 +140,7 @@ class Registrar
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

3
app/validators/domain_name_validator.rb
View file

@ -18,7 +18,6 @@ class DomainNameValidator < ActiveModel::EachValidator
return true if origins.include?(value)
general_domains = /(#{origins.join('|')})/
# general_domains = /(.pri.ee|.com.ee|.fie.ee|.med.ee|.ee)/
# it's punycode
if value[2] == '-' && value[3] == '-'
@ -39,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 == 0
ZonefileSetting.where(origin: value).count.zero?
end
end
end