LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: Use installation config URL for captain app URL (#9874)

Browse Source 
Use `InstallationConfig.where(name: 'CAPTAIN_APP_URL')` instead of
`ENV.fetch('CAPTAIN_APP_URL', '')`
This commit is contained in:
Pranav
2024-08-02 00:47:55 -07:00
committed by GitHub
parent 829bb842fd
commit 8696a4c135
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/v1/accounts/integrations/captain_controller.rb
View File

@@ -8,7 +8,9 @@ class Api::V1::Accounts::Integrations::CaptainController < Api::V1::Accounts::Ba
"&email=#{URI.encode_www_form_component(@hook['settings']['account_email'])}" \ "&email=#{URI.encode_www_form_component(@hook['settings']['account_email'])}" \
"&account_id=#{URI.encode_www_form_component(@hook['settings']['account_id'])}" "&account_id=#{URI.encode_www_form_component(@hook['settings']['account_id'])}"
sso_url = "#{ENV.fetch('CAPTAIN_APP_URL', '')}/sso?#{params_string}" installation_config = InstallationConfig.find_by(name: 'CAPTAIN_APP_URL')
sso_url = "#{installation_config.value}/sso?#{params_string}"
render json: { sso_url: sso_url }, status: :ok render json: { sso_url: sso_url }, status: :ok
end end

6
spec/controllers/api/v1/accounts/integrations/captain_controller_spec.rb
View File

@@ -37,6 +37,8 @@ RSpec.describe 'Captain Integrations API', type: :request do
end end
it 'returns sso url if hook is available' do it 'returns sso url if hook is available' do
InstallationConfig.where(name: 'CAPTAIN_APP_URL').first_or_create(value: 'https://app.chatwoot.com')
hook = create(:integrations_hook, account: account, app_id: 'captain', settings: { hook = create(:integrations_hook, account: account, app_id: 'captain', settings: {
access_token: SecureRandom.hex, access_token: SecureRandom.hex,
account_email: Faker::Internet.email, account_email: Faker::Internet.email,
@@ -45,7 +47,6 @@ RSpec.describe 'Captain Integrations API', type: :request do
inbox_ids: '1' inbox_ids: '1'
}) })
with_modified_env CAPTAIN_APP_URL: 'https://app.example.com' do
get sso_url_api_v1_account_integrations_captain_url(account_id: account.id), get sso_url_api_v1_account_integrations_captain_url(account_id: account.id),
params: {}, params: {},
headers: admin.create_new_auth_token, headers: admin.create_new_auth_token,
@@ -57,10 +58,9 @@ RSpec.describe 'Captain Integrations API', type: :request do
"&email=#{URI.encode_www_form_component(hook['settings']['account_email'])}" \ "&email=#{URI.encode_www_form_component(hook['settings']['account_email'])}" \
"&account_id=#{URI.encode_www_form_component(hook['settings']['account_id'])}" "&account_id=#{URI.encode_www_form_component(hook['settings']['account_id'])}"
sso_url = "https://app.example.com/sso?#{params_string}" sso_url = "https://app.chatwoot.com/sso?#{params_string}"
expect(data['sso_url']).to eq(sso_url) expect(data['sso_url']).to eq(sso_url)
end end
end end
end end
end end
end