From 260ee5106b258f93d9fca32f2f13ce10a4e68576 Mon Sep 17 00:00:00 2001 From: Shousan Liao Date: Fri, 3 Nov 2023 15:49:52 -0400 Subject: [PATCH] yarn install passport-atlassian-oauth2 and pass test case Signed-off-by: Shousan Liao --- plugins/auth-backend-module-atlassian-provider/package.json | 2 +- .../auth-backend-module-atlassian-provider/src/authenticator.ts | 2 +- .../auth-backend-module-atlassian-provider/src/module.test.ts | 1 - plugins/auth-backend-module-atlassian-provider/src/types.d.ts | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/auth-backend-module-atlassian-provider/package.json b/plugins/auth-backend-module-atlassian-provider/package.json index cdc1bfe439..dc00aad712 100644 --- a/plugins/auth-backend-module-atlassian-provider/package.json +++ b/plugins/auth-backend-module-atlassian-provider/package.json @@ -28,7 +28,7 @@ "@backstage/plugin-auth-node": "workspace:^", "express": "^4.18.2", "passport": "^0.6.0", - "passport-atlassian2": "^5.0.0" + "passport-atlassian-oauth2": "^2.1.0" }, "devDependencies": { "@backstage/backend-defaults": "workspace:^", diff --git a/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts b/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts index 8756b10660..3e5ed50246 100644 --- a/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts +++ b/plugins/auth-backend-module-atlassian-provider/src/authenticator.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -import { Strategy as AtlassianStrategy } from 'passport-atlassian2'; +import { Strategy as AtlassianStrategy } from 'passport-atlassian-oauth2'; import { createOAuthAuthenticator, PassportOAuthAuthenticatorHelper, 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 b70d5da1a4..8d02b0b7a5 100644 --- a/plugins/auth-backend-module-atlassian-provider/src/module.test.ts +++ b/plugins/auth-backend-module-atlassian-provider/src/module.test.ts @@ -64,7 +64,6 @@ describe('authModuleAtlassianProvider', () => { expect(startUrl.pathname).toBe('/oauth/authorize'); expect(Object.fromEntries(startUrl.searchParams)).toEqual({ response_type: 'code', - scope: 'read_user', client_id: 'my-client-id', redirect_uri: `http://localhost:${server.port()}/api/auth/atlassian/handler/frame`, state: expect.any(String), diff --git a/plugins/auth-backend-module-atlassian-provider/src/types.d.ts b/plugins/auth-backend-module-atlassian-provider/src/types.d.ts index 3b377cbdfd..5fd47bf885 100644 --- a/plugins/auth-backend-module-atlassian-provider/src/types.d.ts +++ b/plugins/auth-backend-module-atlassian-provider/src/types.d.ts @@ -14,7 +14,7 @@ * limitations under the License. */ -declare module 'passport-atlassian2' { +declare module 'passport-atlassian-oauth2' { import { Request } from 'express'; import { StrategyCreated } from 'passport';