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

# 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

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

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