From 10268db7254b5769e669de0ce883d765c9d39ab8 Mon Sep 17 00:00:00 2001
From: Severin Wischmann <severinwischmann@nianticlabs.com>
Date: Fri, 1 Mar 2024 10:44:42 +0100
Subject: [PATCH] Removed unused config value

The config value `audience` was used to set the baseUrl which has a static value.
The audience parameter is static in the used library. Therefore, the reading of the config value was removed.

Signed-off-by: Severin Wischmann <severinwischmann@nianticlabs.com>
---
 .../src/authenticator.ts                                  | 3 +--
 .../src/module.test.ts                                    | 2 +-
 plugins/auth-backend/src/providers/atlassian/provider.ts  | 8 ++++----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts b/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts
index 6f3309a4ab..340c61052c 100644
--- a/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts
+++ b/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts
@@ -29,8 +29,7 @@ export const atlassianAuthenticator = createOAuthAuthenticator({
   initialize({ callbackUrl, config }) {
     const clientId = config.getString('clientId');
     const clientSecret = config.getString('clientSecret');
-    const baseUrl =
-      config.getOptionalString('audience') || 'https://api.atlassian.com';
+    const baseUrl = 'https://auth.atlassian.com';
 
     return PassportOAuthAuthenticatorHelper.from(
       new AtlassianStrategy(
diff --git a/plugins/auth-backend-module-atlassian-provider/src/module.test.ts b/plugins/auth-backend-module-atlassian-provider/src/module.test.ts
index 0b50dc1371..024a45d43d 100644
--- a/plugins/auth-backend-module-atlassian-provider/src/module.test.ts
+++ b/plugins/auth-backend-module-atlassian-provider/src/module.test.ts
@@ -60,7 +60,7 @@ describe('authModuleAtlassianProvider', () => {
     expect(nonceCookie).toBeDefined();
 
     const startUrl = new URL(res.get('location'));
-    expect(startUrl.origin).toBe('https://api.atlassian.com');
+    expect(startUrl.origin).toBe('https://auth.atlassian.com');
     expect(startUrl.pathname).toBe('/authorize');
     expect(Object.fromEntries(startUrl.searchParams)).toEqual({
       response_type: 'code',
diff --git a/plugins/auth-backend/src/providers/atlassian/provider.ts b/plugins/auth-backend/src/providers/atlassian/provider.ts
index 0cd95e19d7..22db26fd85 100644
--- a/plugins/auth-backend/src/providers/atlassian/provider.ts
+++ b/plugins/auth-backend/src/providers/atlassian/provider.ts
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import { AuthHandler } from '../types';
-import { OAuthResult } from '../../lib/oauth';
-import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
+import { atlassianAuthenticator } from '@backstage/plugin-auth-backend-module-atlassian-provider';
 import {
   SignInResolver,
   createOAuthProviderFactory,
@@ -25,7 +23,9 @@ import {
   adaptLegacyOAuthHandler,
   adaptLegacyOAuthSignInResolver,
 } from '../../lib/legacy';
-import { atlassianAuthenticator } from '@backstage/plugin-auth-backend-module-atlassian-provider';
+import { OAuthResult } from '../../lib/oauth';
+import { createAuthProviderIntegration } from '../createAuthProviderIntegration';
+import { AuthHandler } from '../types';
 
 /**
  * Auth provider integration for Atlassian auth