update clientId in mocks

Author: grvgoel81

app/core/OAuthService/OAuthService.test.ts

@@ -6,7 +6,7 @@ import { OAuthError, OAuthErrorType } from './error';
 import { Web3AuthNetwork } from '@metamask/seedless-onboarding-controller';
 import { TraceName, TraceOperation } from '../../util/trace';
 import { signOut as acmSignOut } from '@metamask/react-native-acm';
-import { SET_SEEDLESS_ONBOARDING } from '../../actions/onboarding';
+import { OAUTH_CONFIG } from './OAuthLoginHandlers/config';
 
 const MOCK_JWT_TOKEN =
   'eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6InN3bmFtOTA5QGdtYWlsLmNvbSIsInN1YiI6InN3bmFtOTA5QGdtYWlsLmNvbSIsImlzcyI6Im1ldGFtYXNrIiwiYXVkIjoibWV0YW1hc2siLCJpYXQiOjE3NDUyMDc1NjYsImVhdCI6MTc0NTIwNzg2NiwiZXhwIjoxNzQ1MjA3ODY2fQ.nXRRLB7fglRll7tMzFFCU0u7Pu6EddqEYf_DMyRgOENQ6tJ8OLtVknNf83_5a67kl_YKHFO-0PEjvJviPID6xg';
@@ -121,7 +121,7 @@ const mockGetAuthTokens = jest.fn().mockImplementation(() => ({
 const mockCreateLoginHandler = jest.fn().mockImplementation(() => ({
   authConnection: AuthConnection.Google,
   options: {
-    clientId: 'e2e-mock-google-client-id',
+    clientId: OAUTH_CONFIG.main_uat.GOOGLE_GROUPED_AUTH_CONNECTION_ID,
     authServerUrl: 'https://auth.example.com',
     web3AuthNetwork: 'sapphire_mainnet',
   },
@@ -219,7 +219,7 @@ describe('OAuth login service', () => {
       }),
     );
     expect(mockDispatch).toHaveBeenCalledWith({
-      type: SET_SEEDLESS_ONBOARDING,
+      type: 'SET_SEEDLESS_ONBOARDING',
       clientId: 'clientId',
       authConnection: AuthConnection.Google,
     });
@@ -654,7 +654,9 @@ describe('OAuth login service', () => {
       const body = JSON.parse(
         (fetchSpy.mock.calls[0][1] as RequestInit).body as string,
       );
-      expect(body.client_id).toBe('e2e-mock-google-client-id');
+      expect(body.client_id).toBe(
+        OAUTH_CONFIG.main_uat.GOOGLE_GROUPED_AUTH_CONNECTION_ID,
+      );
       expect(body.login_provider).toBe(AuthConnection.Google);
       expect(body.access_type).toBe('offline');
       expect(body.email_id).toMatch(/^[a-z0-9]+\d+\+e2e@web3auth\.io$/);

app/core/OAuthService/QAMockOAuthService.test.ts

@@ -29,12 +29,13 @@ jest.mock('./OAuthLoginHandlers/constants', () => {
 });
 
 import { QAMockOAuthService } from './QAMockOAuthService';
+import { OAUTH_CONFIG } from './OAuthLoginHandlers/config';
 
 const createStubLoginHandler = (): BaseLoginHandler =>
   ({
     authConnection: AuthConnection.Google,
     options: {
-      clientId: 'e2e-mock-google-client-id',
+      clientId: OAUTH_CONFIG.main_uat.GOOGLE_GROUPED_AUTH_CONNECTION_ID,
       authServerUrl: 'https://auth.example.com',
       web3AuthNetwork: 'sapphire_mainnet',
     },
@@ -148,6 +149,9 @@ describe('QAMockOAuthService', () => {
     });
 
     it('POSTs QA mock URL and returns data userId and accountName', async () => {
+      mockGetE2EMockOAuthEmailForQaMock.mockReturnValue(
+        'newuser+e2e@web3auth.io',
+      );
       const envelope = {
         success: true,
         data: {
@@ -185,7 +189,7 @@ describe('QAMockOAuthService', () => {
       );
       expect(body).toMatchObject({
         email_id: 'newuser+e2e@web3auth.io',
-        client_id: 'e2e-mock-google-client-id',
+        client_id: OAUTH_CONFIG.main_uat.GOOGLE_GROUPED_AUTH_CONNECTION_ID,
         login_provider: AuthConnection.Google,
         access_type: 'offline',
       });

tests/api-mocking/seedless-onboarding/OAuthMockttpService.ts

@@ -16,8 +16,20 @@ import {
   SSSNodeKeyPairs,
 } from './constants';
 
+import { OAUTH_CONFIG } from '../../../app/core/OAuthService/OAuthLoginHandlers/config';
+
 import { OAuthMockttpServiceOptions, SecretType } from './types';
 
+const UAT_GROUPED_AUTH = OAUTH_CONFIG.main_uat;
+
+function defaultMockGroupedAuthClientId(
+  loginProvider: E2ELoginProvider,
+): string {
+  return loginProvider === E2ELoginProvider.APPLE
+    ? UAT_GROUPED_AUTH.APPLE_GROUPED_AUTH_CONNECTION_ID
+    : UAT_GROUPED_AUTH.GOOGLE_GROUPED_AUTH_CONNECTION_ID;
+}
+
 /**
  * Configuration for E2E OAuth mock
  */
@@ -265,7 +277,9 @@ export class OAuthMockttpService {
 
           const mockRequestBody = {
             email_id: emailForMock,
-            client_id: body.client_id || 'e2e-mock-client-id',
+            client_id:
+              body.client_id ||
+              defaultMockGroupedAuthClientId(this.config.loginProvider),
             login_provider: this.config.loginProvider,
             access_type: 'offline',
           };
@@ -361,7 +375,9 @@ export class OAuthMockttpService {
 
           const mockRequestBody = {
             email_id: emailForMock,
-            client_id: body.client_id || 'e2e-mock-client-id',
+            client_id:
+              body.client_id ||
+              defaultMockGroupedAuthClientId(this.config.loginProvider),
             login_provider: this.config.loginProvider,
           };
 
@@ -433,7 +449,9 @@ export class OAuthMockttpService {
 
           const mockRequestBody = {
             email_id: emailForMock,
-            client_id: body.client_id || 'e2e-mock-client-id',
+            client_id:
+              body.client_id ||
+              defaultMockGroupedAuthClientId(this.config.loginProvider),
             login_provider: this.config.loginProvider,
             refresh_token: body.refresh_token,
           };

tests/module-mocking/oauth/OAuthLoginHandlers/index.ts

@@ -13,8 +13,11 @@ import {
   AuthServerUrl,
   web3AuthNetwork,
 } from '../../../../app/core/OAuthService/OAuthLoginHandlers/constants';
+import { OAUTH_CONFIG } from '../../../../app/core/OAuthService/OAuthLoginHandlers/config';
 import type { BaseHandlerOptions } from '../../../../app/core/OAuthService/OAuthLoginHandlers/baseHandler';
 
+const UAT_GROUPED_AUTH = OAUTH_CONFIG.main_uat;
+
 /**
  * Login result type
  */
@@ -247,12 +250,12 @@ export function createLoginHandler(
   switch (provider) {
     case 'google':
       return new MockGoogleLoginHandler({
-        clientId: 'e2e-mock-google-client-id',
+        clientId: UAT_GROUPED_AUTH.GOOGLE_GROUPED_AUTH_CONNECTION_ID,
         redirectUri: 'metamask://e2e',
       });
     case 'apple':
       return new MockAppleLoginHandler({
-        clientId: 'e2e-mock-apple-client-id',
+        clientId: UAT_GROUPED_AUTH.APPLE_GROUPED_AUTH_CONNECTION_ID,
       });
     default:
       throw new Error(`[E2E Mock] Unsupported provider: ${provider}`);