From a606421b8b508b3bc42e43b6bad426dae71f1438 Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Tue, 11 Apr 2017 14:27:19 +0300 Subject: [PATCH 1/4] log digidoc to same place as rails #448 --- app/controllers/registrant/sessions_controller.rb | 2 ++ app/controllers/registrar/sessions_controller.rb | 2 ++ config/initializers/digidoc.rb | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 config/initializers/digidoc.rb diff --git a/app/controllers/registrant/sessions_controller.rb b/app/controllers/registrant/sessions_controller.rb index 91589d510..d1fd1e004 100644 --- a/app/controllers/registrant/sessions_controller.rb +++ b/app/controllers/registrant/sessions_controller.rb @@ -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 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 client.session_code = session[:mid_session_code] auth_status = client.authentication_status diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index 2d04c6fdd..ebdbb04bb 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -100,6 +100,7 @@ class Registrar::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 # country_codes = {'+372' => 'EST'} phone.gsub!('+372', '') @@ -135,6 +136,7 @@ class Registrar::SessionsController < Devise::SessionsController def mid_status endpoint = "#{ENV['sk_digi_doc_service_endpoint']}" client = Digidoc::Client.new(endpoint) + client.logger = Rails.application.config.logger client.session_code = session[:mid_session_code] auth_status = client.authentication_status diff --git a/config/initializers/digidoc.rb b/config/initializers/digidoc.rb deleted file mode 100644 index 0090c420d..000000000 --- a/config/initializers/digidoc.rb +++ /dev/null @@ -1 +0,0 @@ -#Digidoc::Client.logger = Rails.application.config.logger From aa141b50d6c223a6644df99d3f35fa1626379d8b Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Wed, 12 Apr 2017 16:02:22 +0300 Subject: [PATCH 2/4] skip client.logger in TEST env --- app/controllers/registrant/sessions_controller.rb | 4 ++-- app/controllers/registrar/sessions_controller.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/registrant/sessions_controller.rb b/app/controllers/registrant/sessions_controller.rb index d1fd1e004..e1523c919 100644 --- a/app/controllers/registrant/sessions_controller.rb +++ b/app/controllers/registrant/sessions_controller.rb @@ -29,7 +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 + client.logger = Rails.application.config.logger unless Rails.env.test? if Rails.env.test? && phone == "123" @user = ApiUser.find_by(identity_code: "14212128025") @@ -71,7 +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 + client.logger = Rails.application.config.logger unless Rails.env.test? client.session_code = session[:mid_session_code] auth_status = client.authentication_status diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index ebdbb04bb..a66d6f034 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -100,7 +100,7 @@ class Registrar::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 + client.logger = Rails.application.config.logger unless Rails.env.test? # country_codes = {'+372' => 'EST'} phone.gsub!('+372', '') @@ -136,7 +136,7 @@ class Registrar::SessionsController < Devise::SessionsController def mid_status endpoint = "#{ENV['sk_digi_doc_service_endpoint']}" client = Digidoc::Client.new(endpoint) - client.logger = Rails.application.config.logger + client.logger = Rails.application.config.logger Rails.env.test? client.session_code = session[:mid_session_code] auth_status = client.authentication_status From cc58c687b668d64e11f34a42cd112e5be16d916a Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Wed, 12 Apr 2017 16:39:38 +0300 Subject: [PATCH 3/4] lock digidoc_client to commit, fix typo --- Gemfile | 2 +- app/controllers/registrar/sessions_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 4d039cd92..0249290fa 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,7 @@ gem 'deep_cloneable', '2.1.1' # gem 'digidoc_client', '0.3.0' gem 'digidoc_client', github: 'tarmotalu/digidoc_client', - branch: 'master' + ref: '1645e83a5a548addce383f75703b0275c5310c32' gem 'epp', '1.5.0', github: 'internetee/epp' diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index a66d6f034..8c148acc2 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -136,7 +136,7 @@ class Registrar::SessionsController < Devise::SessionsController def mid_status endpoint = "#{ENV['sk_digi_doc_service_endpoint']}" client = Digidoc::Client.new(endpoint) - client.logger = Rails.application.config.logger Rails.env.test? + client.logger = Rails.application.config.logger unless Rails.env.test? client.session_code = session[:mid_session_code] auth_status = client.authentication_status From c38bef5af0dd1c466880ec1c6acbab43f823a9ef Mon Sep 17 00:00:00 2001 From: Georg Kahest Date: Wed, 12 Apr 2017 16:56:56 +0300 Subject: [PATCH 4/4] fix Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c314d836d..59ba30d96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -47,7 +47,7 @@ GIT GIT remote: https://github.com/tarmotalu/digidoc_client.git revision: 1645e83a5a548addce383f75703b0275c5310c32 - branch: master + ref: 1645e83a5a548addce383f75703b0275c5310c32 specs: digidoc_client (0.3.0) crack (>= 0.1.8)