From 167f457803168ab6d675d4e13aa3a0e52c9a906f Mon Sep 17 00:00:00 2001 From: headphonejames Date: Fri, 3 Feb 2023 12:18:50 -0800 Subject: [PATCH] fix missing code fixes from update after PR review. Signed-off-by: headphonejames --- .../implementations/OAuthRequestApi/MockOAuthApi.test.ts | 4 ++++ .../apis/implementations/OAuthRequestApi/MockOAuthApi.ts | 4 ++++ .../OAuthRequestApi/OAuthRequestManager.test.ts | 1 + plugins/auth-backend/src/lib/flow/index.ts | 6 +----- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts index a64fadeb3e..a22fc24626 100644 --- a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts +++ b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.test.ts @@ -25,12 +25,14 @@ describe('MockOAuthApi', () => { const requester1 = mock.createAuthRequester({ provider: { icon: () => null, title: 'Test', id: 'test-provider' }, onAuthRequest: authHandler1, + authFlow: 'popup', }); const authHandler2 = jest.fn().mockResolvedValue('other'); const requester2 = mock.createAuthRequester({ provider: { icon: () => null, title: 'Test', id: 'test-provider' }, onAuthRequest: authHandler2, + authFlow: 'popup', }); const promises = [ @@ -68,12 +70,14 @@ describe('MockOAuthApi', () => { const requester1 = mock.createAuthRequester({ provider: { icon: () => null, title: 'Test', id: 'test-provider' }, onAuthRequest: authHandler1, + authFlow: 'popup', }); const authHandler2 = jest.fn(); const requester2 = mock.createAuthRequester({ provider: { icon: () => null, title: 'Test', id: 'test-provider' }, onAuthRequest: authHandler2, + authFlow: 'popup', }); const promises = [ diff --git a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts index 193c474361..4ca0ffc645 100644 --- a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts +++ b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/MockOAuthApi.ts @@ -55,4 +55,8 @@ export default class MockOAuthApi implements OAuthRequestApi { }); }); } + + authFlow() { + return 'popup'; + } } diff --git a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts index 4dd6af715e..54cfc8e41b 100644 --- a/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts +++ b/packages/core-app-api/src/apis/implementations/OAuthRequestApi/OAuthRequestManager.test.ts @@ -30,6 +30,7 @@ describe('OAuthRequestManager', () => { icon: () => null, }, onAuthRequest: async () => 'hello', + authFlow: 'popup', }); expect(reqSpy).toHaveBeenCalledTimes(0); diff --git a/plugins/auth-backend/src/lib/flow/index.ts b/plugins/auth-backend/src/lib/flow/index.ts index ebc3fe2ebe..f7b4491edb 100644 --- a/plugins/auth-backend/src/lib/flow/index.ts +++ b/plugins/auth-backend/src/lib/flow/index.ts @@ -14,10 +14,6 @@ * limitations under the License. */ -export { - ensuresXRequestedWith, - postMessageResponse, - redirectMessageResponse, -} from './authFlowHelpers'; +export { ensuresXRequestedWith, postMessageResponse } from './authFlowHelpers'; export type { WebMessageResponse } from './types';