🔄 synced local 'src/' with remote 'src/'

Author: circle-github-action-bot

src/index.test.ts

@@ -312,3 +312,104 @@ describe('W3SSdk > Apple OAuth', () => {
     expect(handleLoginFailureSpy).toHaveBeenCalledTimes(1)
   })
 })
+
+describe('W3SSdk > Google OAuth > selectAccountPrompt is true', () => {
+  let sdk: W3SSdk
+  const configs: Configs = {
+    appSettings: {
+      appId: 'test-app-id',
+    },
+    loginConfigs: {
+      deviceToken: 'device-token',
+      deviceEncryptionKey: 'device-encryption-key',
+      google: {
+        clientId: 'test-client-id',
+        redirectUri: 'test-redirect-uri',
+        selectAccountPrompt: true,
+      },
+    },
+  }
+
+  beforeEach(() => {
+    ;(W3SSdk as any).instance = null
+    jest.resetAllMocks()
+
+    const onLoginComplete = jest.fn()
+    sdk = new W3SSdk(configs, onLoginComplete)
+  })
+
+  it('should generate the right parameters', async () => {
+    const performGoogleLoginSpy = jest.spyOn(sdk as any, 'performGoogleLogin')
+
+    const generateOauthUrlWithParamsSpy = jest.spyOn(
+      sdk as any,
+      'generateOauthUrlWithParams',
+    )
+
+    await sdk.performLogin(SocialLoginProvider.GOOGLE)
+
+    expect(performGoogleLoginSpy).toHaveBeenCalled()
+    expect(generateOauthUrlWithParamsSpy).toHaveBeenLastCalledWith(
+      'Google',
+      'test-client-id',
+      'test-redirect-uri',
+      true,
+    )
+  })
+
+  it('should update the global this location href correctly', async () => {
+    await sdk.performLogin(SocialLoginProvider.GOOGLE)
+
+    expect(window.location.href).toContain('prompt=select_account')
+  })
+})
+
+describe('W3SSdk > Google OAuth > selectAccountPrompt is false or empty', () => {
+  let sdk: W3SSdk
+  const configs: Configs = {
+    appSettings: {
+      appId: 'test-app-id',
+    },
+    loginConfigs: {
+      deviceToken: 'device-token',
+      deviceEncryptionKey: 'device-encryption-key',
+      google: {
+        clientId: 'test-client-id',
+        redirectUri: 'test-redirect-uri',
+      },
+    },
+  }
+
+  beforeEach(() => {
+    ;(W3SSdk as any).instance = null
+    jest.resetAllMocks()
+
+    const onLoginComplete = jest.fn()
+    sdk = new W3SSdk(configs, onLoginComplete)
+  })
+
+  it('should generate the right parameters', async () => {
+    const performGoogleLoginSpy = jest.spyOn(sdk as any, 'performGoogleLogin')
+
+    const generateOauthUrlWithParamsSpy = jest.spyOn(
+      sdk as any,
+      'generateOauthUrlWithParams',
+    )
+
+    await sdk.performLogin(SocialLoginProvider.GOOGLE)
+
+    expect(performGoogleLoginSpy).toHaveBeenCalled()
+    expect(generateOauthUrlWithParamsSpy).toHaveBeenLastCalledWith(
+      'Google',
+      'test-client-id',
+      'test-redirect-uri',
+      undefined,
+    )
+  })
+
+  it('should update the global this location href correctly', async () => {
+    await sdk.performLogin(SocialLoginProvider.GOOGLE)
+
+    expect(window.location.href).toContain('prompt=none')
+  })
+})

src/index.ts

@@ -460,7 +460,8 @@ export class W3SSdk {
       return
     }
 
-    const { clientId, redirectUri } = this.configs.loginConfigs.google
+    const { clientId, redirectUri, selectAccountPrompt } =
+      this.configs.loginConfigs.google
 
     const {
       url = '',
@@ -470,6 +471,7 @@ export class W3SSdk {
       SocialLoginProvider.GOOGLE,
       clientId,
       redirectUri,
+      selectAccountPrompt,
     ) || {}
 
     this.saveOAuthInfo(SocialLoginProvider.GOOGLE, state, nonce)
@@ -481,12 +483,14 @@ export class W3SSdk {
    * @param provider - Social login provider.
    * @param id - Client ID or Application ID.
    * @param redirectUri - Redirect URI.
+   * @param selectAccountPrompt - Indicates whether the user should select the account. Default is false.
    * @returns OAuth URL with the necessary parameters.
    */
   private generateOauthUrlWithParams(
     provider: SocialLoginProvider,
     id: string,
     redirectUri: string,
+    selectAccountPrompt: boolean = false,
   ):
     | {
         url: string
@@ -506,7 +510,9 @@ export class W3SSdk {
       return {
         url: `https://accounts.google.com/o/oauth2/v2/auth?client_id=${id}&redirect_uri=${encodeURIComponent(
           redirectUri,
-        )}&scope=${scope}&state=${state}&response_type=${responseType}&nonce=${nonce}`,
+        )}&scope=${scope}&state=${state}&response_type=${responseType}&nonce=${nonce}&prompt=${
+          selectAccountPrompt ? 'select_account' : 'none'
+        }`,
         state,
         nonce,
       }

src/types.ts

@@ -194,6 +194,10 @@ export interface LoginConfigs {
          * Google redirect URI.
          */
         redirectUri: string
+        /**
+         * Google prompt for account selection.
+         */
+        selectAccountPrompt?: boolean
       }
     | undefined
   facebook?: