From f05019548b3d75d8f852b5ca9941f3d464560b30 Mon Sep 17 00:00:00 2001 From: Sawy Date: Mon, 15 Jun 2026 16:53:55 +0300 Subject: [PATCH] CV2-6721: fix smooch_secret_key_secret nil value --- app/models/concerns/smooch_zendesk.rb | 3 ++- test/controllers/graphql_controller_7_test.rb | 4 ++-- test/models/concerns/smooch_zendesk_test.rb | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/models/concerns/smooch_zendesk.rb b/app/models/concerns/smooch_zendesk.rb index 02968f9c9..406fa411a 100644 --- a/app/models/concerns/smooch_zendesk.rb +++ b/app/models/concerns/smooch_zendesk.rb @@ -41,7 +41,8 @@ def zendesk_api_get_app_data(app_id) def zendesk_api_client payload = { scope: 'app' } jwt_header = { kid: self.config['smooch_secret_key_key_id'] } - token = JWT.encode payload, self.config['smooch_secret_key_secret'], 'HS256', jwt_header + smooch_secret_key_secret = self.config['smooch_secret_key_secret'] || ' ' + token = JWT.encode payload, smooch_secret_key_secret, 'HS256', jwt_header config = SmoochApi::Configuration.new config.api_key['Authorization'] = token config.api_key_prefix['Authorization'] = 'Bearer' diff --git a/test/controllers/graphql_controller_7_test.rb b/test/controllers/graphql_controller_7_test.rb index 9cd0175f3..e1e30930b 100644 --- a/test/controllers/graphql_controller_7_test.rb +++ b/test/controllers/graphql_controller_7_test.rb @@ -115,7 +115,7 @@ def teardown t = create_team private: true b = create_team_bot login: 'smooch', set_approved: true app_id = random_string - tbi = create_team_bot_installation team_id: t.id, user_id: b.id, settings: { smooch_app_id: app_id, smooch_secret_key_secret: random_string } + tbi = create_team_bot_installation team_id: t.id, user_id: b.id, settings: { smooch_app_id: app_id } u = create_user create_team_user user: u, team: t, role: 'admin' @@ -148,7 +148,7 @@ def teardown t = create_team private: true b = create_team_bot login: 'smooch', set_approved: true app_id = random_string - tbi = create_team_bot_installation team_id: t.id, user_id: b.id, settings: { smooch_app_id: app_id, smooch_secret_key_secret: random_string} + tbi = create_team_bot_installation team_id: t.id, user_id: b.id, settings: { smooch_app_id: app_id } u = create_user create_team_user user: u, team: t, role: 'admin' diff --git a/test/models/concerns/smooch_zendesk_test.rb b/test/models/concerns/smooch_zendesk_test.rb index 11df59a90..3d7eba628 100644 --- a/test/models/concerns/smooch_zendesk_test.rb +++ b/test/models/concerns/smooch_zendesk_test.rb @@ -7,7 +7,7 @@ class << self # Mock out config, which is normally set in the Smooch class as # RequestStore.store[:smooch_bot_settings] def config - { "smooch_app_id" => 'app-id', "smooch_secret_key_secret" => 'app-secret-key' } + { "smooch_app_id" => 'app-id' } end def replace_placeholders(uid, text)