test(identity): update the identity mocks to adapt to the Env changes

Signed-off-by: Mircea Nistor <mirceanis@gmail.com>

Author: mirceanis

package.json

@@ -129,7 +129,7 @@
     "attributions:generate": "./development/generate-attributions.sh"
   },
   "resolutions": {
-    "@metamask/profile-sync-controller": "npm:@metamask-previews/profile-sync-controller@21.0.0-preview-91d59c3",
+    "@metamask/profile-sync-controller": "npm:@metamask-previews/profile-sync-controller@21.0.0-preview-34e39226",
     "http-cache-semantics": "^4.1.1",
     "semver-regex": "^3.1.4",
     "base-x@^3.0.x": "^3.0.11",

privacy-snapshot.json

@@ -12,7 +12,7 @@
   "app.ens.domains",
   "arbitrum-mainnet.infura.io",
   "auth-service.dev-api.cx.metamask.io",
-  "authentication.api.cx.metamask.io",
+  "authentication.dev-api.cx.metamask.io",
   "bafkreifvhjdf6ve4jfv6qytqtux5nd4nwnelioeiqx5x2ez5yrgrzk7ypi.ipfs.dweb.link",
   "bafybeidxfmwycgzcp4v2togflpqh2gnibuexjy4m4qqwxp7nh3jx5zlh4y.ipfs.dweb.link",
   "base-mainnet.infura.io",
@@ -65,7 +65,7 @@
   "node-4.dev-node.web3auth.io",
   "node-5.dev-node.web3auth.io",
   "notification.api.cx.metamask.io",
-  "oidc.api.cx.metamask.io",
+  "oidc.dev-api.cx.metamask.io",
   "on-ramp-content.api.cx.metamask.io",
   "on-ramp-content.uat-api.cx.metamask.io",
   "phishing-detection.api.cx.metamask.io",
@@ -102,7 +102,7 @@
   "tx-sentinel-ethereum-mainnet.api.cx.metamask.io",
   "unresponsive-rpc.test",
   "unresponsive-rpc.url",
-  "user-storage.api.cx.metamask.io",
+  "user-storage.dev-api.cx.metamask.io",
   "verify.walletconnect.com",
   "www.4byte.directory"
 ]

test/e2e/tests/identity/mocks.ts

@@ -1,6 +1,9 @@
 import { Mockttp, RequestRuleBuilder } from 'mockttp';
 import { AuthenticationController } from '@metamask/profile-sync-controller';
-import { USER_STORAGE_FEATURE_NAMES } from '@metamask/profile-sync-controller/sdk';
+import {
+  Env,
+  USER_STORAGE_FEATURE_NAMES,
+} from '@metamask/profile-sync-controller/sdk';
 import {
   UserStorageMockttpController,
   UserStorageResponseData,
@@ -12,22 +15,26 @@ type MockResponse = {
   url: string | RegExp;
   requestMethod: 'GET' | 'POST' | 'PUT' | 'DELETE';
   response: unknown;
+  statusCode?: number;
 };
 
 /**
  * E2E mock setup for identity APIs (Auth, UserStorage, Backup and sync)
  *
  * @param server - server obj used to mock our endpoints
  * @param userStorageMockttpControllerInstance - optional instance of UserStorageMockttpController, useful if you need persisted user storage between tests
+ * @param env - optional environment (defaults to Env.DEV)
  */
 export async function mockIdentityServices(
   server: Mockttp,
   userStorageMockttpControllerInstance: UserStorageMockttpController = new UserStorageMockttpController(),
+  env: Env = Env.DEV,
 ) {
   // Auth
-  mockAPICall(server, AuthMocks.getMockAuthNonceResponse());
-  mockAPICall(server, AuthMocks.getMockAuthLoginResponse());
-  mockAPICall(server, AuthMocks.getMockAuthAccessTokenResponse());
+  mockAPICall(server, AuthMocks.getMockAuthNonceResponse(env));
+  mockAPICall(server, AuthMocks.getMockAuthLoginResponse(env));
+  mockAPICall(server, AuthMocks.getMockAuthAccessTokenResponse(env));
+  mockAPICall(server, AuthMocks.getMockPairSocialTokenResponse(env));
 
   // Storage
   if (
@@ -114,7 +121,7 @@ function mockAPICall(server: Mockttp, response: MockResponse) {
     )(requestBody, path, getE2ESrpIdentifierForPublicKey);
 
     return {
-      statusCode: 200,
+      statusCode: response.statusCode ?? 200,
       json,
     };
   });
@@ -123,6 +130,7 @@ function mockAPICall(server: Mockttp, response: MockResponse) {
 type MockInfuraAndAccountSyncOptions = {
   accountsToMockBalances?: string[];
   accountsSyncResponse?: UserStorageResponseData[];
+  env?: Env;
 };
 
 const MOCK_ETH_BALANCE = '0xde0b6b3a7640000';
@@ -177,7 +185,11 @@ export async function mockInfuraAndAccountSync(
     });
   }
 
-  mockIdentityServices(mockServer, userStorageMockttpController);
+  await mockIdentityServices(
+    mockServer,
+    userStorageMockttpController,
+    options.env ?? Env.DEV,
+  );
 }
 
 /**

yarn.lock

@@ -7073,9 +7073,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/profile-sync-controller@npm:@metamask-previews/profile-sync-controller@21.0.0-preview-91d59c3":
-  version: 21.0.0-preview-91d59c3
-  resolution: "@metamask-previews/profile-sync-controller@npm:21.0.0-preview-91d59c3"
+"@metamask/profile-sync-controller@npm:@metamask-previews/profile-sync-controller@21.0.0-preview-34e39226":
+  version: 21.0.0-preview-34e39226
+  resolution: "@metamask-previews/profile-sync-controller@npm:21.0.0-preview-34e39226"
   dependencies:
     "@metamask/base-controller": "npm:^8.0.1"
     "@metamask/snaps-sdk": "npm:^9.0.0"
@@ -7092,7 +7092,7 @@ __metadata:
     "@metamask/seedless-onboarding-controller": ^2.1.0
     "@metamask/snaps-controllers": ^14.0.0
     webextension-polyfill: ^0.10.0 || ^0.11.0 || ^0.12.0
-  checksum: 10/4fb18215ad06ef6a2676835ee4c8ad2093e176c4ec674f7e5f8f16a5423225df827c291c260df92d3a0090363885142650c9b934b45a657727a104d9c2e632fe
+  checksum: 10/4ec53e7eeca1bcce0adb74c85b8048b4406b208779623ac90352649f54c8b2c0e6e9de8d09c7b0837f2b44acad598d1254953ffd51ed0f3890a5bbc9458efb81
   languageName: node
   linkType: hard