From 1e3ee833dc208766569ead510627be1753ce45ca Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 27 Nov 2024 13:30:21 +0100 Subject: [PATCH 1/2] chore: include the requested scopes in the auth handler for google Signed-off-by: blam --- plugins/auth-backend-module-google-provider/src/authenticator.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/auth-backend-module-google-provider/src/authenticator.ts b/plugins/auth-backend-module-google-provider/src/authenticator.ts index 9f1e298ae8..b0c58b777b 100644 --- a/plugins/auth-backend-module-google-provider/src/authenticator.ts +++ b/plugins/auth-backend-module-google-provider/src/authenticator.ts @@ -73,6 +73,7 @@ export const googleAuthenticator = createOAuthAuthenticator({ return helper.start(input, { accessType: 'offline', prompt: 'consent', + includeGrantedScopes: 'true', }); }, From 79b055a4ed04c682048a295a94e30903416a1af1 Mon Sep 17 00:00:00 2001 From: blam Date: Wed, 27 Nov 2024 13:32:16 +0100 Subject: [PATCH 2/2] chore: tests and changeset Signed-off-by: blam --- .changeset/stale-rats-tease.md | 5 +++++ .../auth-backend-module-google-provider/src/module.test.ts | 1 + 2 files changed, 6 insertions(+) create mode 100644 .changeset/stale-rats-tease.md diff --git a/.changeset/stale-rats-tease.md b/.changeset/stale-rats-tease.md new file mode 100644 index 0000000000..3564742cc6 --- /dev/null +++ b/.changeset/stale-rats-tease.md @@ -0,0 +1,5 @@ +--- +'@backstage/plugin-auth-backend-module-google-provider': patch +--- + +Pass through `includeGrantedScopes` in order to persist scopes across refresh calls diff --git a/plugins/auth-backend-module-google-provider/src/module.test.ts b/plugins/auth-backend-module-google-provider/src/module.test.ts index 8ece0c1942..608428d9f5 100644 --- a/plugins/auth-backend-module-google-provider/src/module.test.ts +++ b/plugins/auth-backend-module-google-provider/src/module.test.ts @@ -67,6 +67,7 @@ describe('authModuleGoogleProvider', () => { prompt: 'consent', response_type: 'code', client_id: 'my-client-id', + include_granted_scopes: 'true', redirect_uri: `http://localhost:${server.port()}/api/auth/google/handler/frame`, state: expect.any(String), scope: