From 61c90b73cafdba31cdf22d7b012abbc2b183d0f2 Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Mon, 7 Feb 2022 11:16:43 +0200 Subject: [PATCH] added billing staging endpoint --- app/services/eis_billing/base.rb | 7 ++++++- app/services/eis_billing/get_invoice_number.rb | 12 +++++++++++- config/application.yml.sample | 4 +++- lib/tasks/eis_billing_import_data.rake | 7 ++++++- 4 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/services/eis_billing/base.rb b/app/services/eis_billing/base.rb index 7957b1c20..19d9cb0e4 100644 --- a/app/services/eis_billing/base.rb +++ b/app/services/eis_billing/base.rb @@ -7,7 +7,12 @@ module EisBilling # irb(main):048:0> decrypted_back = crypt.decrypt_and_verify(encrypted_data) # => TOKEN = 'Bearer WA9UvDmzR9UcE5rLqpWravPQtdS8eDMAIynzGdSOTw==--9ZShwwij3qmLeuMJ--NE96w2PnfpfyIuuNzDJTGw=='.freeze - BASE_URL = ENV['eis_billing_system_base_url'] + BASE_URL = "" + if Rails.env.staging? + BASE_URL = ENV['eis_billing_system_base_url_staging'] + else + BASE_URL = ENV['eis_billing_system_base_url_dev'] + end INITIATOR = 'registry' end end diff --git a/app/services/eis_billing/get_invoice_number.rb b/app/services/eis_billing/get_invoice_number.rb index e24a7e6ac..fdfe6b8fa 100644 --- a/app/services/eis_billing/get_invoice_number.rb +++ b/app/services/eis_billing/get_invoice_number.rb @@ -1,7 +1,14 @@ module EisBilling class GetInvoiceNumber < EisBilling::Base def self.send_invoice - base_request + result = base_request + + Rails.logger.info "---------->" + Rails.logger.info result.body + Rails.logger.info invoice_generator_url + Rails.logger.info "---------->" + + result end private @@ -15,6 +22,9 @@ module EisBilling 'Accept' => TOKEN } + http.use_ssl = true + http.verify_mode = OpenSSL::SSL::VERIFY_NONE + http.post(invoice_generator_url, nil, headers) end diff --git a/config/application.yml.sample b/config/application.yml.sample index d39f3617c..b565f5acc 100644 --- a/config/application.yml.sample +++ b/config/application.yml.sample @@ -235,4 +235,6 @@ registry_demo_accredited_users_url: 'http://registry.test/api/v1/accreditation_c a_and_aaaa_validation_timeout: '1' nameserver_validation_timeout: '1' -eis_billing_system_base_url: 'http://eis_billing_system:3000' +eis_billing_system_base_url_dev: 'http://eis_billing_system:3000' +eis_billing_system_base_url_staging: 'https://st-billing.infra.tld.ee' +eis_token: diff --git a/lib/tasks/eis_billing_import_data.rake b/lib/tasks/eis_billing_import_data.rake index d9bce59bf..1f46d04c1 100644 --- a/lib/tasks/eis_billing_import_data.rake +++ b/lib/tasks/eis_billing_import_data.rake @@ -1,5 +1,10 @@ TOKEN = ENV['eis_token'] -BASE_URL = ENV['eis_billing_system_base_url'] +BASE_URL = "" +if Rails.env.staging? + BASE_URL = ENV['eis_billing_system_base_url_staging'] +else + BASE_URL = ENV['eis_billing_system_base_url_dev'] +end namespace :eis_billing do desc 'One time task to export invoice data to billing system'