@metamask/profile-sync-controller 3.1.0 → 3.2.0

package/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.2.0]
+
+### Added
+
+- feat: improve profile sync services logs ([#5101](https://github.com/MetaMask/core/pull/5101))
+
+### Changed
+
+- feat: decouple account sync logic from `UserStorageController` ([#5078](https://github.com/MetaMask/core/pull/5078))
+- Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
+
+## [3.1.1]
+
+### Changed
+
+- Use new `@metamask/keyring-internal-api@^1.0.0`( [#4695](https://github.com/MetaMask/core/pull/4695))
+  - This package has been split out from the Keyring API.
+- Bump `@metamask/keyring-api` from `^10.1.0` to `^12.0.0` ([#4695](https://github.com/MetaMask/core/pull/4695))
+
 ## [3.1.0]
 
 ### Changed
@@ -370,7 +389,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@3.1.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@3.2.0...HEAD
+[3.2.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@3.1.1...@metamask/profile-sync-controller@3.2.0
+[3.1.1]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@3.1.0...@metamask/profile-sync-controller@3.1.1
 [3.1.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@3.0.0...@metamask/profile-sync-controller@3.1.0
 [3.0.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@2.0.0...@metamask/profile-sync-controller@3.0.0
 [2.0.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@1.0.2...@metamask/profile-sync-controller@2.0.0

package/dist/controllers/authentication/services.cjs

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLoginRawMessage = exports.getAccessToken = exports.login = exports.getNonce = exports.OIDC_TOKENS_ENDPOINT = exports.AUTH_LOGIN_ENDPOINT = exports.AUTH_NONCE_ENDPOINT = void 0;
+const loglevel_1 = __importDefault(require("loglevel"));
 const env_1 = require("../../shared/env.cjs");
 const ENV_URLS = (0, env_1.getEnvUrls)(env_1.Env.PRD);
 const AUTH_ENDPOINT = ENV_URLS.authApiUrl;
@@ -30,13 +34,14 @@ async function getNonce(publicKey) {
     try {
         const nonceResponse = await fetch(nonceUrl.toString());
         if (!nonceResponse.ok) {
+            loglevel_1.default.error(`authentication-controller/services: unable to get nonce - HTTP ${nonceResponse.status}`);
             return null;
         }
         const nonceJson = await nonceResponse.json();
         return nonceJson?.nonce ?? null;
     }
     catch (e) {
-        console.error('authentication-controller/services: unable to get nonce', e);
+        loglevel_1.default.error('authentication-controller/services: unable to get nonce', e);
         return null;
     }
 }
@@ -68,13 +73,14 @@ async function login(rawMessage, signature, clientMetaMetrics) {
             }),
         });
         if (!response.ok) {
+            loglevel_1.default.error(`authentication-controller/services: unable to login - HTTP ${response.status}`);
             return null;
         }
         const loginResponse = await response.json();
         return loginResponse ?? null;
     }
     catch (e) {
-        console.error('authentication-controller/services: unable to login', e);
+        loglevel_1.default.error('authentication-controller/services: unable to login', e);
         return null;
     }
 }
@@ -102,13 +108,14 @@ async function getAccessToken(jwtToken, platform) {
             body: urlEncodedBody.toString(),
         });
         if (!response.ok) {
+            loglevel_1.default.error(`authentication-controller/services: unable to get access token - HTTP ${response.status}`);
             return null;
         }
         const accessTokenResponse = await response.json();
         return accessTokenResponse?.access_token ?? null;
     }
     catch (e) {
-        console.error('authentication-controller/services: unable to get access token', e);
+        loglevel_1.default.error('authentication-controller/services: unable to get access token', e);
         return null;
     }
 }

package/dist/controllers/authentication/services.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"services.cjs","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"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","sourcesContent":["import { Env, Platform, getEnvUrls, getOidcClientId } from '../../shared/env';\n\nconst ENV_URLS = getEnvUrls(Env.PRD);\n\nconst AUTH_ENDPOINT: string = ENV_URLS.authApiUrl;\nexport const AUTH_NONCE_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/nonce`;\nexport const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/srp/login`;\n\nconst OIDC_ENDPOINT: string = ENV_URLS.oidcApiUrl || '';\nexport const OIDC_TOKENS_ENDPOINT = `${OIDC_ENDPOINT}/oauth2/token`;\nconst OIDC_CLIENT_ID = (platform: 'mobile' | 'extension') => {\n  if (platform === 'extension') {\n    return getOidcClientId(Env.PRD, Platform.EXTENSION);\n  }\n  if (platform === 'mobile') {\n    return getOidcClientId(Env.PRD, Platform.MOBILE);\n  }\n\n  throw new Error(`Unsupported platform - ${platform as string}`);\n};\nconst OIDC_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer';\n\nexport type NonceResponse = {\n  nonce: string;\n};\n\n/**\n * Auth Service - Get Nonce. Used for the initial JWTBearer flow\n *\n * @param publicKey - public key to associate a nonce with\n * @returns the nonce or null if failed\n */\nexport async function getNonce(publicKey: string): Promise<string | null> {\n  const nonceUrl = new URL(AUTH_NONCE_ENDPOINT);\n  nonceUrl.searchParams.set('identifier', publicKey);\n\n  try {\n    const nonceResponse = await fetch(nonceUrl.toString());\n    if (!nonceResponse.ok) {\n      return null;\n    }\n\n    const nonceJson: NonceResponse = await nonceResponse.json();\n    return nonceJson?.nonce ?? null;\n  } catch (e) {\n    console.error('authentication-controller/services: unable to get nonce', e);\n    return null;\n  }\n}\n\n/**\n * The Login API Server Response Shape\n */\nexport type LoginResponse = {\n  token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: string;\n  /**\n   * Contains anonymous information about the logged in profile.\n   *\n   * @property identifier_id - a deterministic unique identifier on the method used to sign in\n   * @property profile_id - a unique id for a given profile\n   * @property metametrics_id - an anonymous server id\n   */\n  profile: {\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    identifier_id: string;\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    profile_id: string;\n  };\n};\n\ntype ClientMetaMetrics = {\n  metametricsId: string;\n  agent: 'extension' | 'mobile';\n};\n\n/**\n * Auth Service - Login. Will perform login with a given signature and will return a single use JWT Token.\n *\n * @param rawMessage - the original message before signing\n * @param signature - the signed message\n * @param clientMetaMetrics - optional client metametrics id (to associate on backend)\n * @returns The Login Response\n */\nexport async function login(\n  rawMessage: string,\n  signature: string,\n  clientMetaMetrics: ClientMetaMetrics,\n): Promise<LoginResponse | null> {\n  try {\n    const response = await fetch(AUTH_LOGIN_ENDPOINT, {\n      method: 'POST',\n      headers: {\n        'Content-Type': 'application/json',\n      },\n      body: JSON.stringify({\n        signature,\n        // eslint-disable-next-line @typescript-eslint/naming-convention\n        raw_message: rawMessage,\n        metametrics: {\n          // eslint-disable-next-line @typescript-eslint/naming-convention\n          metametrics_id: clientMetaMetrics.metametricsId,\n          agent: clientMetaMetrics.agent,\n        },\n      }),\n    });\n\n    if (!response.ok) {\n      return null;\n    }\n\n    const loginResponse: LoginResponse = await response.json();\n    return loginResponse ?? null;\n  } catch (e) {\n    console.error('authentication-controller/services: unable to login', e);\n    return null;\n  }\n}\n\n/**\n * The Auth API Token Response Shape\n */\nexport type OAuthTokenResponse = {\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  access_token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: number;\n};\n\n/**\n * OIDC Service - Access Token. Trades the Auth Token for an access token (to be used for other authenticated endpoints)\n * NOTE - the access token is short lived, which means it is best practice to validate session before calling authenticated endpoints\n *\n * @param jwtToken - the JWT Auth Token, received from `/login`\n * @param platform - the OIDC platform to retrieve access token\n * @returns JWT Access token to store and use on authorized endpoints.\n */\nexport async function getAccessToken(\n  jwtToken: string,\n  platform: ClientMetaMetrics['agent'],\n): Promise<string | null> {\n  const headers = new Headers({\n    'Content-Type': 'application/x-www-form-urlencoded',\n  });\n\n  const urlEncodedBody = new URLSearchParams();\n  urlEncodedBody.append('grant_type', OIDC_GRANT_TYPE);\n  urlEncodedBody.append('client_id', OIDC_CLIENT_ID(platform));\n  urlEncodedBody.append('assertion', jwtToken);\n\n  try {\n    const response = await fetch(OIDC_TOKENS_ENDPOINT, {\n      method: 'POST',\n      headers,\n      body: urlEncodedBody.toString(),\n    });\n\n    if (!response.ok) {\n      return null;\n    }\n\n    const accessTokenResponse: OAuthTokenResponse = await response.json();\n    return accessTokenResponse?.access_token ?? null;\n  } catch (e) {\n    console.error(\n      'authentication-controller/services: unable to get access token',\n      e,\n    );\n    return null;\n  }\n}\n\n/**\n * Utility to create the raw login message for the JWT bearer flow (via SRP)\n *\n * @param nonce - nonce received from `/nonce` endpoint\n * @param publicKey - public key used to retrieve nonce and for message signing\n * @returns Raw Message which will be used for signing & logging in.\n */\nexport function createLoginRawMessage(\n  nonce: string,\n  publicKey: string,\n): `metamask:${string}:${string}` {\n  return `metamask:${nonce}:${publicKey}` as const;\n}\n"]}
+{"version":3,"file":"services.cjs","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA2B;AAE3B,8CAA8E;AAE9E,MAAM,QAAQ,GAAG,IAAA,gBAAU,EAAC,SAAG,CAAC,GAAG,CAAC,CAAC;AAErC,MAAM,aAAa,GAAW,QAAQ,CAAC,UAAU,CAAC;AACrC,QAAA,mBAAmB,GAAG,GAAG,aAAa,eAAe,CAAC;AACtD,QAAA,mBAAmB,GAAG,GAAG,aAAa,mBAAmB,CAAC;AAEvE,MAAM,aAAa,GAAW,QAAQ,CAAC,UAAU,IAAI,EAAE,CAAC;AAC3C,QAAA,oBAAoB,GAAG,GAAG,aAAa,eAAe,CAAC;AACpE,MAAM,cAAc,GAAG,CAAC,QAAgC,EAAE,EAAE;IAC1D,IAAI,QAAQ,KAAK,WAAW,EAAE;QAC5B,OAAO,IAAA,qBAAe,EAAC,SAAG,CAAC,GAAG,EAAE,cAAQ,CAAC,SAAS,CAAC,CAAC;KACrD;IACD,IAAI,QAAQ,KAAK,QAAQ,EAAE;QACzB,OAAO,IAAA,qBAAe,EAAC,SAAG,CAAC,GAAG,EAAE,cAAQ,CAAC,MAAM,CAAC,CAAC;KAClD;IAED,MAAM,IAAI,KAAK,CAAC,0BAA0B,QAAkB,EAAE,CAAC,CAAC;AAClE,CAAC,CAAC;AACF,MAAM,eAAe,GAAG,6CAA6C,CAAC;AAMtE;;;;;GAKG;AACI,KAAK,UAAU,QAAQ,CAAC,SAAiB;IAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,2BAAmB,CAAC,CAAC;IAC9C,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAEnD,IAAI;QACF,MAAM,aAAa,GAAG,MAAM,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvD,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE;YACrB,kBAAG,CAAC,KAAK,CACP,kEAAkE,aAAa,CAAC,MAAM,EAAE,CACzF,CAAC;YACF,OAAO,IAAI,CAAC;SACb;QAED,MAAM,SAAS,GAAkB,MAAM,aAAa,CAAC,IAAI,EAAE,CAAC;QAC5D,OAAO,SAAS,EAAE,KAAK,IAAI,IAAI,CAAC;KACjC;IAAC,OAAO,CAAC,EAAE;QACV,kBAAG,CAAC,KAAK,CAAC,yDAAyD,EAAE,CAAC,CAAC,CAAC;QACxE,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AAnBD,4BAmBC;AA6BD;;;;;;;GAOG;AACI,KAAK,UAAU,KAAK,CACzB,UAAkB,EAClB,SAAiB,EACjB,iBAAoC;IAEpC,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,2BAAmB,EAAE;YAChD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,SAAS;gBACT,gEAAgE;gBAChE,WAAW,EAAE,UAAU;gBACvB,WAAW,EAAE;oBACX,gEAAgE;oBAChE,cAAc,EAAE,iBAAiB,CAAC,aAAa;oBAC/C,KAAK,EAAE,iBAAiB,CAAC,KAAK;iBAC/B;aACF,CAAC;SACH,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,kBAAG,CAAC,KAAK,CACP,8DAA8D,QAAQ,CAAC,MAAM,EAAE,CAChF,CAAC;YACF,OAAO,IAAI,CAAC;SACb;QAED,MAAM,aAAa,GAAkB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3D,OAAO,aAAa,IAAI,IAAI,CAAC;KAC9B;IAAC,OAAO,CAAC,EAAE;QACV,kBAAG,CAAC,KAAK,CAAC,qDAAqD,EAAE,CAAC,CAAC,CAAC;QACpE,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AApCD,sBAoCC;AAYD;;;;;;;GAOG;AACI,KAAK,UAAU,cAAc,CAClC,QAAgB,EAChB,QAAoC;IAEpC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC;QAC1B,cAAc,EAAE,mCAAmC;KACpD,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,IAAI,eAAe,EAAE,CAAC;IAC7C,cAAc,CAAC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,CAAC;IACrD,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7D,cAAc,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;IAE7C,IAAI;QACF,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,4BAAoB,EAAE;YACjD,MAAM,EAAE,MAAM;YACd,OAAO;YACP,IAAI,EAAE,cAAc,CAAC,QAAQ,EAAE;SAChC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;YAChB,kBAAG,CAAC,KAAK,CACP,yEAAyE,QAAQ,CAAC,MAAM,EAAE,CAC3F,CAAC;YACF,OAAO,IAAI,CAAC;SACb;QAED,MAAM,mBAAmB,GAAuB,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;QACtE,OAAO,mBAAmB,EAAE,YAAY,IAAI,IAAI,CAAC;KAClD;IAAC,OAAO,CAAC,EAAE;QACV,kBAAG,CAAC,KAAK,CACP,gEAAgE,EAChE,CAAC,CACF,CAAC;QACF,OAAO,IAAI,CAAC;KACb;AACH,CAAC;AApCD,wCAoCC;AAED;;;;;;GAMG;AACH,SAAgB,qBAAqB,CACnC,KAAa,EACb,SAAiB;IAEjB,OAAO,YAAY,KAAK,IAAI,SAAS,EAAW,CAAC;AACnD,CAAC;AALD,sDAKC","sourcesContent":["import log from 'loglevel';\n\nimport { Env, Platform, getEnvUrls, getOidcClientId } from '../../shared/env';\n\nconst ENV_URLS = getEnvUrls(Env.PRD);\n\nconst AUTH_ENDPOINT: string = ENV_URLS.authApiUrl;\nexport const AUTH_NONCE_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/nonce`;\nexport const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/srp/login`;\n\nconst OIDC_ENDPOINT: string = ENV_URLS.oidcApiUrl || '';\nexport const OIDC_TOKENS_ENDPOINT = `${OIDC_ENDPOINT}/oauth2/token`;\nconst OIDC_CLIENT_ID = (platform: 'mobile' | 'extension') => {\n  if (platform === 'extension') {\n    return getOidcClientId(Env.PRD, Platform.EXTENSION);\n  }\n  if (platform === 'mobile') {\n    return getOidcClientId(Env.PRD, Platform.MOBILE);\n  }\n\n  throw new Error(`Unsupported platform - ${platform as string}`);\n};\nconst OIDC_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer';\n\nexport type NonceResponse = {\n  nonce: string;\n};\n\n/**\n * Auth Service - Get Nonce. Used for the initial JWTBearer flow\n *\n * @param publicKey - public key to associate a nonce with\n * @returns the nonce or null if failed\n */\nexport async function getNonce(publicKey: string): Promise<string | null> {\n  const nonceUrl = new URL(AUTH_NONCE_ENDPOINT);\n  nonceUrl.searchParams.set('identifier', publicKey);\n\n  try {\n    const nonceResponse = await fetch(nonceUrl.toString());\n    if (!nonceResponse.ok) {\n      log.error(\n        `authentication-controller/services: unable to get nonce - HTTP ${nonceResponse.status}`,\n      );\n      return null;\n    }\n\n    const nonceJson: NonceResponse = await nonceResponse.json();\n    return nonceJson?.nonce ?? null;\n  } catch (e) {\n    log.error('authentication-controller/services: unable to get nonce', e);\n    return null;\n  }\n}\n\n/**\n * The Login API Server Response Shape\n */\nexport type LoginResponse = {\n  token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: string;\n  /**\n   * Contains anonymous information about the logged in profile.\n   *\n   * @property identifier_id - a deterministic unique identifier on the method used to sign in\n   * @property profile_id - a unique id for a given profile\n   * @property metametrics_id - an anonymous server id\n   */\n  profile: {\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    identifier_id: string;\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    profile_id: string;\n  };\n};\n\ntype ClientMetaMetrics = {\n  metametricsId: string;\n  agent: 'extension' | 'mobile';\n};\n\n/**\n * Auth Service - Login. Will perform login with a given signature and will return a single use JWT Token.\n *\n * @param rawMessage - the original message before signing\n * @param signature - the signed message\n * @param clientMetaMetrics - optional client metametrics id (to associate on backend)\n * @returns The Login Response\n */\nexport async function login(\n  rawMessage: string,\n  signature: string,\n  clientMetaMetrics: ClientMetaMetrics,\n): Promise<LoginResponse | null> {\n  try {\n    const response = await fetch(AUTH_LOGIN_ENDPOINT, {\n      method: 'POST',\n      headers: {\n        'Content-Type': 'application/json',\n      },\n      body: JSON.stringify({\n        signature,\n        // eslint-disable-next-line @typescript-eslint/naming-convention\n        raw_message: rawMessage,\n        metametrics: {\n          // eslint-disable-next-line @typescript-eslint/naming-convention\n          metametrics_id: clientMetaMetrics.metametricsId,\n          agent: clientMetaMetrics.agent,\n        },\n      }),\n    });\n\n    if (!response.ok) {\n      log.error(\n        `authentication-controller/services: unable to login - HTTP ${response.status}`,\n      );\n      return null;\n    }\n\n    const loginResponse: LoginResponse = await response.json();\n    return loginResponse ?? null;\n  } catch (e) {\n    log.error('authentication-controller/services: unable to login', e);\n    return null;\n  }\n}\n\n/**\n * The Auth API Token Response Shape\n */\nexport type OAuthTokenResponse = {\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  access_token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: number;\n};\n\n/**\n * OIDC Service - Access Token. Trades the Auth Token for an access token (to be used for other authenticated endpoints)\n * NOTE - the access token is short lived, which means it is best practice to validate session before calling authenticated endpoints\n *\n * @param jwtToken - the JWT Auth Token, received from `/login`\n * @param platform - the OIDC platform to retrieve access token\n * @returns JWT Access token to store and use on authorized endpoints.\n */\nexport async function getAccessToken(\n  jwtToken: string,\n  platform: ClientMetaMetrics['agent'],\n): Promise<string | null> {\n  const headers = new Headers({\n    'Content-Type': 'application/x-www-form-urlencoded',\n  });\n\n  const urlEncodedBody = new URLSearchParams();\n  urlEncodedBody.append('grant_type', OIDC_GRANT_TYPE);\n  urlEncodedBody.append('client_id', OIDC_CLIENT_ID(platform));\n  urlEncodedBody.append('assertion', jwtToken);\n\n  try {\n    const response = await fetch(OIDC_TOKENS_ENDPOINT, {\n      method: 'POST',\n      headers,\n      body: urlEncodedBody.toString(),\n    });\n\n    if (!response.ok) {\n      log.error(\n        `authentication-controller/services: unable to get access token - HTTP ${response.status}`,\n      );\n      return null;\n    }\n\n    const accessTokenResponse: OAuthTokenResponse = await response.json();\n    return accessTokenResponse?.access_token ?? null;\n  } catch (e) {\n    log.error(\n      'authentication-controller/services: unable to get access token',\n      e,\n    );\n    return null;\n  }\n}\n\n/**\n * Utility to create the raw login message for the JWT bearer flow (via SRP)\n *\n * @param nonce - nonce received from `/nonce` endpoint\n * @param publicKey - public key used to retrieve nonce and for message signing\n * @returns Raw Message which will be used for signing & logging in.\n */\nexport function createLoginRawMessage(\n  nonce: string,\n  publicKey: string,\n): `metamask:${string}:${string}` {\n  return `metamask:${nonce}:${publicKey}` as const;\n}\n"]}

package/dist/controllers/authentication/services.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.cts","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,QAAkC,CAAC;AACnE,eAAO,MAAM,mBAAmB,QAAsC,CAAC;AAGvE,eAAO,MAAM,oBAAoB,QAAkC,CAAC;AAapE,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgBxE;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;OAMG;IACH,OAAO,EAAE;QAEP,aAAa,EAAE,MAAM,CAAC;QAEtB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,KAAK,CACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA6B/B;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAE/B,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8BxB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,YAAY,MAAM,IAAI,MAAM,EAAE,CAEhC"}
+{"version":3,"file":"services.d.cts","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,mBAAmB,QAAkC,CAAC;AACnE,eAAO,MAAM,mBAAmB,QAAsC,CAAC;AAGvE,eAAO,MAAM,oBAAoB,QAAkC,CAAC;AAapE,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmBxE;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;OAMG;IACH,OAAO,EAAE;QAEP,aAAa,EAAE,MAAM,CAAC;QAEtB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,KAAK,CACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAgC/B;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAE/B,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiCxB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,YAAY,MAAM,IAAI,MAAM,EAAE,CAEhC"}

package/dist/controllers/authentication/services.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.mts","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,QAAkC,CAAC;AACnE,eAAO,MAAM,mBAAmB,QAAsC,CAAC;AAGvE,eAAO,MAAM,oBAAoB,QAAkC,CAAC;AAapE,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgBxE;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;OAMG;IACH,OAAO,EAAE;QAEP,aAAa,EAAE,MAAM,CAAC;QAEtB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,KAAK,CACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CA6B/B;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAE/B,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA8BxB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,YAAY,MAAM,IAAI,MAAM,EAAE,CAEhC"}
+{"version":3,"file":"services.d.mts","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,mBAAmB,QAAkC,CAAC;AACnE,eAAO,MAAM,mBAAmB,QAAsC,CAAC;AAGvE,eAAO,MAAM,oBAAoB,QAAkC,CAAC;AAapE,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAmBxE;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IAEd,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;OAMG;IACH,OAAO,EAAE;QAEP,aAAa,EAAE,MAAM,CAAC;QAEtB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;CACH,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,WAAW,GAAG,QAAQ,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,KAAK,CACzB,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,iBAAiB,EAAE,iBAAiB,GACnC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAgC/B;AAED;;GAEG;AACH,MAAM,MAAM,kBAAkB,GAAG;IAE/B,YAAY,EAAE,MAAM,CAAC;IAErB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,iBAAiB,CAAC,OAAO,CAAC,GACnC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAiCxB;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,GAChB,YAAY,MAAM,IAAI,MAAM,EAAE,CAEhC"}

package/dist/controllers/authentication/services.mjs

@@ -1,3 +1,11 @@
+function $importDefault(module) {
+    if (module?.__esModule) {
+        return module.default;
+    }
+    return module;
+}
+import $log from "loglevel";
+const log = $importDefault($log);
 import { Env, Platform, getEnvUrls, getOidcClientId } from "../../shared/env.mjs";
 const ENV_URLS = getEnvUrls(Env.PRD);
 const AUTH_ENDPOINT = ENV_URLS.authApiUrl;
@@ -27,13 +35,14 @@ export async function getNonce(publicKey) {
     try {
         const nonceResponse = await fetch(nonceUrl.toString());
         if (!nonceResponse.ok) {
+            log.error(`authentication-controller/services: unable to get nonce - HTTP ${nonceResponse.status}`);
             return null;
         }
         const nonceJson = await nonceResponse.json();
         return nonceJson?.nonce ?? null;
     }
     catch (e) {
-        console.error('authentication-controller/services: unable to get nonce', e);
+        log.error('authentication-controller/services: unable to get nonce', e);
         return null;
     }
 }
@@ -64,13 +73,14 @@ export async function login(rawMessage, signature, clientMetaMetrics) {
             }),
         });
         if (!response.ok) {
+            log.error(`authentication-controller/services: unable to login - HTTP ${response.status}`);
             return null;
         }
         const loginResponse = await response.json();
         return loginResponse ?? null;
     }
     catch (e) {
-        console.error('authentication-controller/services: unable to login', e);
+        log.error('authentication-controller/services: unable to login', e);
         return null;
     }
 }
@@ -97,13 +107,14 @@ export async function getAccessToken(jwtToken, platform) {
             body: urlEncodedBody.toString(),
         });
         if (!response.ok) {
+            log.error(`authentication-controller/services: unable to get access token - HTTP ${response.status}`);
             return null;
         }
         const accessTokenResponse = await response.json();
         return accessTokenResponse?.access_token ?? null;
     }
     catch (e) {
-        console.error('authentication-controller/services: unable to get access token', e);
+        log.error('authentication-controller/services: unable to get access token', e);
         return null;
     }
 }

package/dist/controllers/authentication/services.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"services.mjs","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"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","sourcesContent":["import { Env, Platform, getEnvUrls, getOidcClientId } from '../../shared/env';\n\nconst ENV_URLS = getEnvUrls(Env.PRD);\n\nconst AUTH_ENDPOINT: string = ENV_URLS.authApiUrl;\nexport const AUTH_NONCE_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/nonce`;\nexport const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/srp/login`;\n\nconst OIDC_ENDPOINT: string = ENV_URLS.oidcApiUrl || '';\nexport const OIDC_TOKENS_ENDPOINT = `${OIDC_ENDPOINT}/oauth2/token`;\nconst OIDC_CLIENT_ID = (platform: 'mobile' | 'extension') => {\n  if (platform === 'extension') {\n    return getOidcClientId(Env.PRD, Platform.EXTENSION);\n  }\n  if (platform === 'mobile') {\n    return getOidcClientId(Env.PRD, Platform.MOBILE);\n  }\n\n  throw new Error(`Unsupported platform - ${platform as string}`);\n};\nconst OIDC_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer';\n\nexport type NonceResponse = {\n  nonce: string;\n};\n\n/**\n * Auth Service - Get Nonce. Used for the initial JWTBearer flow\n *\n * @param publicKey - public key to associate a nonce with\n * @returns the nonce or null if failed\n */\nexport async function getNonce(publicKey: string): Promise<string | null> {\n  const nonceUrl = new URL(AUTH_NONCE_ENDPOINT);\n  nonceUrl.searchParams.set('identifier', publicKey);\n\n  try {\n    const nonceResponse = await fetch(nonceUrl.toString());\n    if (!nonceResponse.ok) {\n      return null;\n    }\n\n    const nonceJson: NonceResponse = await nonceResponse.json();\n    return nonceJson?.nonce ?? null;\n  } catch (e) {\n    console.error('authentication-controller/services: unable to get nonce', e);\n    return null;\n  }\n}\n\n/**\n * The Login API Server Response Shape\n */\nexport type LoginResponse = {\n  token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: string;\n  /**\n   * Contains anonymous information about the logged in profile.\n   *\n   * @property identifier_id - a deterministic unique identifier on the method used to sign in\n   * @property profile_id - a unique id for a given profile\n   * @property metametrics_id - an anonymous server id\n   */\n  profile: {\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    identifier_id: string;\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    profile_id: string;\n  };\n};\n\ntype ClientMetaMetrics = {\n  metametricsId: string;\n  agent: 'extension' | 'mobile';\n};\n\n/**\n * Auth Service - Login. Will perform login with a given signature and will return a single use JWT Token.\n *\n * @param rawMessage - the original message before signing\n * @param signature - the signed message\n * @param clientMetaMetrics - optional client metametrics id (to associate on backend)\n * @returns The Login Response\n */\nexport async function login(\n  rawMessage: string,\n  signature: string,\n  clientMetaMetrics: ClientMetaMetrics,\n): Promise<LoginResponse | null> {\n  try {\n    const response = await fetch(AUTH_LOGIN_ENDPOINT, {\n      method: 'POST',\n      headers: {\n        'Content-Type': 'application/json',\n      },\n      body: JSON.stringify({\n        signature,\n        // eslint-disable-next-line @typescript-eslint/naming-convention\n        raw_message: rawMessage,\n        metametrics: {\n          // eslint-disable-next-line @typescript-eslint/naming-convention\n          metametrics_id: clientMetaMetrics.metametricsId,\n          agent: clientMetaMetrics.agent,\n        },\n      }),\n    });\n\n    if (!response.ok) {\n      return null;\n    }\n\n    const loginResponse: LoginResponse = await response.json();\n    return loginResponse ?? null;\n  } catch (e) {\n    console.error('authentication-controller/services: unable to login', e);\n    return null;\n  }\n}\n\n/**\n * The Auth API Token Response Shape\n */\nexport type OAuthTokenResponse = {\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  access_token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: number;\n};\n\n/**\n * OIDC Service - Access Token. Trades the Auth Token for an access token (to be used for other authenticated endpoints)\n * NOTE - the access token is short lived, which means it is best practice to validate session before calling authenticated endpoints\n *\n * @param jwtToken - the JWT Auth Token, received from `/login`\n * @param platform - the OIDC platform to retrieve access token\n * @returns JWT Access token to store and use on authorized endpoints.\n */\nexport async function getAccessToken(\n  jwtToken: string,\n  platform: ClientMetaMetrics['agent'],\n): Promise<string | null> {\n  const headers = new Headers({\n    'Content-Type': 'application/x-www-form-urlencoded',\n  });\n\n  const urlEncodedBody = new URLSearchParams();\n  urlEncodedBody.append('grant_type', OIDC_GRANT_TYPE);\n  urlEncodedBody.append('client_id', OIDC_CLIENT_ID(platform));\n  urlEncodedBody.append('assertion', jwtToken);\n\n  try {\n    const response = await fetch(OIDC_TOKENS_ENDPOINT, {\n      method: 'POST',\n      headers,\n      body: urlEncodedBody.toString(),\n    });\n\n    if (!response.ok) {\n      return null;\n    }\n\n    const accessTokenResponse: OAuthTokenResponse = await response.json();\n    return accessTokenResponse?.access_token ?? null;\n  } catch (e) {\n    console.error(\n      'authentication-controller/services: unable to get access token',\n      e,\n    );\n    return null;\n  }\n}\n\n/**\n * Utility to create the raw login message for the JWT bearer flow (via SRP)\n *\n * @param nonce - nonce received from `/nonce` endpoint\n * @param publicKey - public key used to retrieve nonce and for message signing\n * @returns Raw Message which will be used for signing & logging in.\n */\nexport function createLoginRawMessage(\n  nonce: string,\n  publicKey: string,\n): `metamask:${string}:${string}` {\n  return `metamask:${nonce}:${publicKey}` as const;\n}\n"]}
+{"version":3,"file":"services.mjs","sourceRoot":"","sources":["../../../src/controllers/authentication/services.ts"],"names":[],"mappings":"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","sourcesContent":["import log from 'loglevel';\n\nimport { Env, Platform, getEnvUrls, getOidcClientId } from '../../shared/env';\n\nconst ENV_URLS = getEnvUrls(Env.PRD);\n\nconst AUTH_ENDPOINT: string = ENV_URLS.authApiUrl;\nexport const AUTH_NONCE_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/nonce`;\nexport const AUTH_LOGIN_ENDPOINT = `${AUTH_ENDPOINT}/api/v2/srp/login`;\n\nconst OIDC_ENDPOINT: string = ENV_URLS.oidcApiUrl || '';\nexport const OIDC_TOKENS_ENDPOINT = `${OIDC_ENDPOINT}/oauth2/token`;\nconst OIDC_CLIENT_ID = (platform: 'mobile' | 'extension') => {\n  if (platform === 'extension') {\n    return getOidcClientId(Env.PRD, Platform.EXTENSION);\n  }\n  if (platform === 'mobile') {\n    return getOidcClientId(Env.PRD, Platform.MOBILE);\n  }\n\n  throw new Error(`Unsupported platform - ${platform as string}`);\n};\nconst OIDC_GRANT_TYPE = 'urn:ietf:params:oauth:grant-type:jwt-bearer';\n\nexport type NonceResponse = {\n  nonce: string;\n};\n\n/**\n * Auth Service - Get Nonce. Used for the initial JWTBearer flow\n *\n * @param publicKey - public key to associate a nonce with\n * @returns the nonce or null if failed\n */\nexport async function getNonce(publicKey: string): Promise<string | null> {\n  const nonceUrl = new URL(AUTH_NONCE_ENDPOINT);\n  nonceUrl.searchParams.set('identifier', publicKey);\n\n  try {\n    const nonceResponse = await fetch(nonceUrl.toString());\n    if (!nonceResponse.ok) {\n      log.error(\n        `authentication-controller/services: unable to get nonce - HTTP ${nonceResponse.status}`,\n      );\n      return null;\n    }\n\n    const nonceJson: NonceResponse = await nonceResponse.json();\n    return nonceJson?.nonce ?? null;\n  } catch (e) {\n    log.error('authentication-controller/services: unable to get nonce', e);\n    return null;\n  }\n}\n\n/**\n * The Login API Server Response Shape\n */\nexport type LoginResponse = {\n  token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: string;\n  /**\n   * Contains anonymous information about the logged in profile.\n   *\n   * @property identifier_id - a deterministic unique identifier on the method used to sign in\n   * @property profile_id - a unique id for a given profile\n   * @property metametrics_id - an anonymous server id\n   */\n  profile: {\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    identifier_id: string;\n    // eslint-disable-next-line @typescript-eslint/naming-convention\n    profile_id: string;\n  };\n};\n\ntype ClientMetaMetrics = {\n  metametricsId: string;\n  agent: 'extension' | 'mobile';\n};\n\n/**\n * Auth Service - Login. Will perform login with a given signature and will return a single use JWT Token.\n *\n * @param rawMessage - the original message before signing\n * @param signature - the signed message\n * @param clientMetaMetrics - optional client metametrics id (to associate on backend)\n * @returns The Login Response\n */\nexport async function login(\n  rawMessage: string,\n  signature: string,\n  clientMetaMetrics: ClientMetaMetrics,\n): Promise<LoginResponse | null> {\n  try {\n    const response = await fetch(AUTH_LOGIN_ENDPOINT, {\n      method: 'POST',\n      headers: {\n        'Content-Type': 'application/json',\n      },\n      body: JSON.stringify({\n        signature,\n        // eslint-disable-next-line @typescript-eslint/naming-convention\n        raw_message: rawMessage,\n        metametrics: {\n          // eslint-disable-next-line @typescript-eslint/naming-convention\n          metametrics_id: clientMetaMetrics.metametricsId,\n          agent: clientMetaMetrics.agent,\n        },\n      }),\n    });\n\n    if (!response.ok) {\n      log.error(\n        `authentication-controller/services: unable to login - HTTP ${response.status}`,\n      );\n      return null;\n    }\n\n    const loginResponse: LoginResponse = await response.json();\n    return loginResponse ?? null;\n  } catch (e) {\n    log.error('authentication-controller/services: unable to login', e);\n    return null;\n  }\n}\n\n/**\n * The Auth API Token Response Shape\n */\nexport type OAuthTokenResponse = {\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  access_token: string;\n  // eslint-disable-next-line @typescript-eslint/naming-convention\n  expires_in: number;\n};\n\n/**\n * OIDC Service - Access Token. Trades the Auth Token for an access token (to be used for other authenticated endpoints)\n * NOTE - the access token is short lived, which means it is best practice to validate session before calling authenticated endpoints\n *\n * @param jwtToken - the JWT Auth Token, received from `/login`\n * @param platform - the OIDC platform to retrieve access token\n * @returns JWT Access token to store and use on authorized endpoints.\n */\nexport async function getAccessToken(\n  jwtToken: string,\n  platform: ClientMetaMetrics['agent'],\n): Promise<string | null> {\n  const headers = new Headers({\n    'Content-Type': 'application/x-www-form-urlencoded',\n  });\n\n  const urlEncodedBody = new URLSearchParams();\n  urlEncodedBody.append('grant_type', OIDC_GRANT_TYPE);\n  urlEncodedBody.append('client_id', OIDC_CLIENT_ID(platform));\n  urlEncodedBody.append('assertion', jwtToken);\n\n  try {\n    const response = await fetch(OIDC_TOKENS_ENDPOINT, {\n      method: 'POST',\n      headers,\n      body: urlEncodedBody.toString(),\n    });\n\n    if (!response.ok) {\n      log.error(\n        `authentication-controller/services: unable to get access token - HTTP ${response.status}`,\n      );\n      return null;\n    }\n\n    const accessTokenResponse: OAuthTokenResponse = await response.json();\n    return accessTokenResponse?.access_token ?? null;\n  } catch (e) {\n    log.error(\n      'authentication-controller/services: unable to get access token',\n      e,\n    );\n    return null;\n  }\n}\n\n/**\n * Utility to create the raw login message for the JWT bearer flow (via SRP)\n *\n * @param nonce - nonce received from `/nonce` endpoint\n * @param publicKey - public key used to retrieve nonce and for message signing\n * @returns Raw Message which will be used for signing & logging in.\n */\nexport function createLoginRawMessage(\n  nonce: string,\n  publicKey: string,\n): `metamask:${string}:${string}` {\n  return `metamask:${nonce}:${publicKey}` as const;\n}\n"]}

package/dist/controllers/user-storage/UserStorageController.cjs

@@ -10,17 +10,15 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _UserStorageController_instances, _UserStorageController_env, _UserStorageController_auth, _UserStorageController_accounts, _UserStorageController_config, _UserStorageController_notificationServices, _UserStorageController_isUnlocked, _UserStorageController_keyringController, _UserStorageController_nativeScryptCrypto, _UserStorageController_registerMessageHandlers, _UserStorageController_getStorageOptions, _UserStorageController_assertProfileSyncingEnabled, _UserStorageController_getStorageKeyAndBearerToken, _UserStorageController_createStorageKey, _UserStorageController__snapSignMessageCache, _UserStorageController_snapSignMessage, _UserStorageController_setIsProfileSyncingUpdateLoading;
+var _UserStorageController_instances, _UserStorageController_env, _UserStorageController_auth, _UserStorageController_config, _UserStorageController_notificationServices, _UserStorageController_isUnlocked, _UserStorageController_keyringController, _UserStorageController_nativeScryptCrypto, _UserStorageController_registerMessageHandlers, _UserStorageController_getStorageOptions, _UserStorageController_assertProfileSyncingEnabled, _UserStorageController_getStorageKeyAndBearerToken, _UserStorageController_createStorageKey, _UserStorageController__snapSignMessageCache, _UserStorageController_snapSignMessage, _UserStorageController_setIsProfileSyncingUpdateLoading;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultState = void 0;
 const base_controller_1 = require("@metamask/base-controller");
-const keyring_api_1 = require("@metamask/keyring-api");
-const keyring_controller_1 = require("@metamask/keyring-controller");
 const encryption_1 = require("../../shared/encryption/index.cjs");
-const storage_schema_1 = require("../../shared/storage-schema.cjs");
 const auth_snap_requests_1 = require("../authentication/auth-snap-requests.cjs");
-const user_storage_1 = require("./accounts/user-storage.cjs");
-const controller_integration_1 = require("./network-syncing/controller-integration.cjs");
+const controller_integration_1 = require("./account-syncing/controller-integration.cjs");
+const setup_subscriptions_1 = require("./account-syncing/setup-subscriptions.cjs");
+const controller_integration_2 = require("./network-syncing/controller-integration.cjs");
 const services_1 = require("./services.cjs");
 const controllerName = 'UserStorageController';
 exports.defaultState = {
@@ -28,6 +26,7 @@ exports.defaultState = {
     isProfileSyncingUpdateLoading: false,
     hasAccountSyncingSyncedAtLeastOnce: false,
     isAccountSyncingReadyToBeDispatched: false,
+    isAccountSyncingInProgress: false,
 };
 const metadata = {
     isProfileSyncingEnabled: {
@@ -46,6 +45,10 @@ const metadata = {
         persist: false,
         anonymous: false,
     },
+    isAccountSyncingInProgress: {
+        persist: false,
+        anonymous: false,
+    },
     hasNetworkSyncingSyncedAtLeastOnce: {
         persist: true,
         anonymous: false,
@@ -92,80 +95,6 @@ class UserStorageController extends base_controller_1.BaseController {
                 return this.messagingSystem.call('AuthenticationController:performSignOut');
             },
         });
-        _UserStorageController_accounts.set(this, {
-            isAccountSyncingInProgress: false,
-            maxNumberOfAccountsToAdd: 0,
-            canSync: () => {
-                try {
-                    __classPrivateFieldGet(this, _UserStorageController_instances, "m", _UserStorageController_assertProfileSyncingEnabled).call(this);
-                    if (__classPrivateFieldGet(this, _UserStorageController_accounts, "f").isAccountSyncingInProgress) {
-                        return false;
-                    }
-                    if (!__classPrivateFieldGet(this, _UserStorageController_env, "f").isAccountSyncingEnabled) {
-                        return false;
-                    }
-                    if (!__classPrivateFieldGet(this, _UserStorageController_auth, "f").isAuthEnabled()) {
-                        return false;
-                    }
-                    return true;
-                }
-                catch {
-                    return false;
-                }
-            },
-            setupAccountSyncingSubscriptions: () => {
-                this.messagingSystem.subscribe('AccountsController:accountAdded', 
-                // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                async (account) => {
-                    if (!__classPrivateFieldGet(this, _UserStorageController_accounts, "f").canSync() ||
-                        !this.state.hasAccountSyncingSyncedAtLeastOnce) {
-                        return;
-                    }
-                    await this.saveInternalAccountToUserStorage(account);
-                });
-                this.messagingSystem.subscribe('AccountsController:accountRenamed', 
-                // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                async (account) => {
-                    if (!__classPrivateFieldGet(this, _UserStorageController_accounts, "f").canSync() ||
-                        !this.state.hasAccountSyncingSyncedAtLeastOnce) {
-                        return;
-                    }
-                    await this.saveInternalAccountToUserStorage(account);
-                });
-            },
-            doesInternalAccountHaveCorrectKeyringType: (account) => {
-                return account.metadata.keyring.type === keyring_controller_1.KeyringTypes.hd;
-            },
-            getInternalAccountsList: async () => {
-                // eslint-disable-next-line @typescript-eslint/await-thenable
-                const internalAccountsList = await this.messagingSystem.call('AccountsController:listAccounts');
-                return internalAccountsList?.filter(__classPrivateFieldGet(this, _UserStorageController_accounts, "f").doesInternalAccountHaveCorrectKeyringType);
-            },
-            getUserStorageAccountsList: async () => {
-                const rawAccountsListResponse = await this.performGetStorageAllFeatureEntries(storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts);
-                return (rawAccountsListResponse?.map((rawAccount) => JSON.parse(rawAccount)) ??
-                    null);
-            },
-            saveInternalAccountToUserStorage: async (internalAccount) => {
-                // Map the internal account to the user storage account schema
-                const mappedAccount = (0, user_storage_1.mapInternalAccountToUserStorageAccount)(internalAccount);
-                await this.performSetStorage(
-                // ESLint is confused here.
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                `${storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts}.${internalAccount.address}`, JSON.stringify(mappedAccount));
-            },
-            saveInternalAccountsListToUserStorage: async () => {
-                const internalAccountsList = await __classPrivateFieldGet(this, _UserStorageController_accounts, "f").getInternalAccountsList();
-                if (!internalAccountsList) {
-                    return;
-                }
-                const internalAccountsListFormattedForUserStorage = internalAccountsList.map(user_storage_1.mapInternalAccountToUserStorageAccount);
-                await this.performBatchSetStorage(storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts, internalAccountsListFormattedForUserStorage.map((account) => [
-                    account.a,
-                    JSON.stringify(account),
-                ]));
-            },
-        });
         _UserStorageController_config.set(this, void 0);
         _UserStorageController_notificationServices.set(this, {
             disableNotificationServices: async () => {
@@ -193,16 +122,20 @@ class UserStorageController extends base_controller_1.BaseController {
         __classPrivateFieldGet(this, _UserStorageController_env, "f").isAccountSyncingEnabled = Boolean(env?.isAccountSyncingEnabled);
         __classPrivateFieldGet(this, _UserStorageController_env, "f").isNetworkSyncingEnabled = Boolean(env?.isNetworkSyncingEnabled);
         __classPrivateFieldSet(this, _UserStorageController_config, config, "f");
-        __classPrivateFieldGet(this, _UserStorageController_accounts, "f").maxNumberOfAccountsToAdd =
-            config?.accountSyncing?.maxNumberOfAccountsToAdd ?? 100;
         this.getMetaMetricsState = getMetaMetricsState;
         __classPrivateFieldGet(this, _UserStorageController_keyringController, "f").setupLockedStateSubscriptions();
         __classPrivateFieldGet(this, _UserStorageController_instances, "m", _UserStorageController_registerMessageHandlers).call(this);
         __classPrivateFieldSet(this, _UserStorageController_nativeScryptCrypto, nativeScryptCrypto, "f");
-        __classPrivateFieldGet(this, _UserStorageController_accounts, "f").setupAccountSyncingSubscriptions();
+        // Account Syncing
+        if (__classPrivateFieldGet(this, _UserStorageController_env, "f").isAccountSyncingEnabled) {
+            (0, setup_subscriptions_1.setupAccountSyncingSubscriptions)({ isAccountSyncingEnabled: true }, {
+                getUserStorageControllerInstance: () => this,
+                getMessenger: () => this.messagingSystem,
+            });
+        }
         // Network Syncing
         if (__classPrivateFieldGet(this, _UserStorageController_env, "f").isNetworkSyncingEnabled) {
-            (0, controller_integration_1.startNetworkSyncing)({
+            (0, controller_integration_2.startNetworkSyncing)({
                 messenger,
                 getStorageConfig: () => __classPrivateFieldGet(this, _UserStorageController_instances, "m", _UserStorageController_getStorageOptions).call(this),
                 isMutationSyncBlocked: () => !this.state.hasNetworkSyncingSyncedAtLeastOnce,
@@ -401,157 +334,45 @@ class UserStorageController extends base_controller_1.BaseController {
                 isAccountSyncingReadyToBeDispatched;
         });
     }
+    async setIsAccountSyncingInProgress(isAccountSyncingInProgress) {
+        this.update((state) => {
+            state.isAccountSyncingInProgress = isAccountSyncingInProgress;
+        });
+    }
     /**
      * Syncs the internal accounts list with the user storage accounts list.
      * This method is used to make sure that the internal accounts list is up-to-date with the user storage accounts list and vice-versa.
      * It will add new accounts to the internal accounts list, update/merge conflicting names and re-upload the results in some cases to the user storage.
      */
     async syncInternalAccountsWithUserStorage() {
-        if (!__classPrivateFieldGet(this, _UserStorageController_accounts, "f").canSync()) {
-            return;
-        }
-        try {
-            __classPrivateFieldGet(this, _UserStorageController_accounts, "f").isAccountSyncingInProgress = true;
-            const profileId = await __classPrivateFieldGet(this, _UserStorageController_auth, "f").getProfileId();
-            const userStorageAccountsList = await __classPrivateFieldGet(this, _UserStorageController_accounts, "f").getUserStorageAccountsList();
-            if (!userStorageAccountsList || !userStorageAccountsList.length) {
-                await __classPrivateFieldGet(this, _UserStorageController_accounts, "f").saveInternalAccountsListToUserStorage();
-                await this.setHasAccountSyncingSyncedAtLeastOnce(true);
-                return;
-            }
-            // Prepare an array of internal accounts to be saved to the user storage
-            const internalAccountsToBeSavedToUserStorage = [];
-            // Compare internal accounts list with user storage accounts list
-            // First step: compare lengths
-            const internalAccountsList = await __classPrivateFieldGet(this, _UserStorageController_accounts, "f").getInternalAccountsList();
-            if (!internalAccountsList || !internalAccountsList.length) {
-                throw new Error(`Failed to get internal accounts list`);
-            }
-            const hasMoreUserStorageAccountsThanInternalAccounts = userStorageAccountsList.length > internalAccountsList.length;
-            // We don't want to remove existing accounts for a user
-            // so we only add new accounts if the user has more accounts in user storage than internal accounts
-            if (hasMoreUserStorageAccountsThanInternalAccounts) {
-                const numberOfAccountsToAdd = Math.min(userStorageAccountsList.length, __classPrivateFieldGet(this, _UserStorageController_accounts, "f").maxNumberOfAccountsToAdd) - internalAccountsList.length;
-                // Create new accounts to match the user storage accounts list
-                for (let i = 0; i < numberOfAccountsToAdd; i++) {
-                    await this.messagingSystem.call('KeyringController:addNewAccount');
-                    __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountAdded?.(profileId);
-                }
-            }
-            // Second step: compare account names
-            // Get the internal accounts list again since new accounts might have been added in the previous step
-            const refreshedInternalAccountsList = await __classPrivateFieldGet(this, _UserStorageController_accounts, "f").getInternalAccountsList();
-            const newlyAddedAccounts = refreshedInternalAccountsList.filter((account) => !internalAccountsList.find((a) => a.address === account.address));
-            for (const internalAccount of refreshedInternalAccountsList) {
-                const userStorageAccount = userStorageAccountsList.find((account) => account.a === internalAccount.address);
-                // If the account is not present in user storage
-                if (!userStorageAccount) {
-                    // If the account was just added in the previous step, skip saving it, it's likely to be a bogus account
-                    if (newlyAddedAccounts.includes(internalAccount)) {
-                        __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountSyncErroneousSituation?.(profileId, 'An account was added to the internal accounts list but was not present in the user storage accounts list');
-                        continue;
-                    }
-                    // Otherwise, it means that this internal account was present before the sync, and needs to be saved to the user storage
-                    internalAccountsToBeSavedToUserStorage.push(internalAccount);
-                    continue;
-                }
-                // From this point on, we know that the account is present in
-                // both the internal accounts list and the user storage accounts list
-                // One or both accounts have default names
-                const isInternalAccountNameDefault = (0, user_storage_1.isNameDefaultAccountName)(internalAccount.metadata.name);
-                const isUserStorageAccountNameDefault = (0, user_storage_1.isNameDefaultAccountName)(userStorageAccount.n);
-                // Internal account has default name
-                if (isInternalAccountNameDefault) {
-                    if (!isUserStorageAccountNameDefault) {
-                        this.messagingSystem.call('AccountsController:updateAccountMetadata', internalAccount.id, {
-                            name: userStorageAccount.n,
-                        });
-                        __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountNameUpdated?.(profileId);
-                    }
-                    continue;
-                }
-                // Internal account has custom name but user storage account has default name
-                if (isUserStorageAccountNameDefault) {
-                    internalAccountsToBeSavedToUserStorage.push(internalAccount);
-                    continue;
-                }
-                // Both accounts have custom names
-                // User storage account has a nameLastUpdatedAt timestamp
-                // Note: not storing the undefined checks in constants to act as a type guard
-                if (userStorageAccount.nlu !== undefined) {
-                    if (internalAccount.metadata.nameLastUpdatedAt !== undefined) {
-                        const isInternalAccountNameNewer = internalAccount.metadata.nameLastUpdatedAt >
-                            userStorageAccount.nlu;
-                        if (isInternalAccountNameNewer) {
-                            internalAccountsToBeSavedToUserStorage.push(internalAccount);
-                            continue;
-                        }
-                    }
-                    this.messagingSystem.call('AccountsController:updateAccountMetadata', internalAccount.id, {
-                        name: userStorageAccount.n,
-                        nameLastUpdatedAt: userStorageAccount.nlu,
-                    });
-                    const areInternalAndUserStorageAccountNamesEqual = internalAccount.metadata.name === userStorageAccount.n;
-                    if (!areInternalAndUserStorageAccountNamesEqual) {
-                        __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountNameUpdated?.(profileId);
-                    }
-                    continue;
-                }
-                else if (internalAccount.metadata.nameLastUpdatedAt !== undefined) {
-                    internalAccountsToBeSavedToUserStorage.push(internalAccount);
-                    continue;
-                }
-            }
-            // Save the internal accounts list to the user storage
-            if (internalAccountsToBeSavedToUserStorage.length) {
-                await this.performBatchSetStorage(storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts, internalAccountsToBeSavedToUserStorage.map((account) => [
-                    account.address,
-                    JSON.stringify((0, user_storage_1.mapInternalAccountToUserStorageAccount)(account)),
-                ]));
-            }
-            // In case we have corrupted user storage with accounts that don't exist in the internal accounts list
-            // Delete those accounts from the user storage
-            const userStorageAccountsToBeDeleted = userStorageAccountsList.filter((account) => !refreshedInternalAccountsList.find((a) => a.address === account.a));
-            if (userStorageAccountsToBeDeleted.length) {
-                await this.performBatchDeleteStorage(storage_schema_1.USER_STORAGE_FEATURE_NAMES.accounts, userStorageAccountsToBeDeleted.map((account) => account.a));
-                __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountSyncErroneousSituation?.(profileId, 'An account was present in the user storage accounts list but was not found in the internal accounts list after the sync');
-            }
-            // We do this here and not in the finally statement because we want to make sure that
-            // the accounts are saved / updated / deleted at least once before we set this flag
-            await this.setHasAccountSyncingSyncedAtLeastOnce(true);
-        }
-        catch (e) {
-            const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);
-            throw new Error(`${controllerName} - failed to sync user storage accounts list - ${errorMessage}`);
-        }
-        finally {
-            __classPrivateFieldGet(this, _UserStorageController_accounts, "f").isAccountSyncingInProgress = false;
-        }
+        const profileId = await __classPrivateFieldGet(this, _UserStorageController_auth, "f").getProfileId();
+        await (0, controller_integration_1.syncInternalAccountsWithUserStorage)({
+            isAccountSyncingEnabled: __classPrivateFieldGet(this, _UserStorageController_env, "f").isAccountSyncingEnabled,
+            maxNumberOfAccountsToAdd: __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.maxNumberOfAccountsToAdd,
+            onAccountAdded: () => __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountAdded?.(profileId),
+            onAccountNameUpdated: () => __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountNameUpdated?.(profileId),
+            onAccountSyncErroneousSituation: (situationMessage) => __classPrivateFieldGet(this, _UserStorageController_config, "f")?.accountSyncing?.onAccountSyncErroneousSituation?.(profileId, situationMessage),
+        }, {
+            getMessenger: () => this.messagingSystem,
+            getUserStorageControllerInstance: () => this,
+        });
     }
     /**
      * Saves an individual internal account to the user storage.
      * @param internalAccount - The internal account to save
      */
     async saveInternalAccountToUserStorage(internalAccount) {
-        if (!__classPrivateFieldGet(this, _UserStorageController_accounts, "f").canSync() ||
-            !(0, keyring_api_1.isEvmAccountType)(internalAccount.type) ||
-            !__classPrivateFieldGet(this, _UserStorageController_accounts, "f").doesInternalAccountHaveCorrectKeyringType(internalAccount)) {
-            return;
-        }
-        try {
-            await __classPrivateFieldGet(this, _UserStorageController_accounts, "f").saveInternalAccountToUserStorage(internalAccount);
-        }
-        catch (e) {
-            const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);
-            throw new Error(`${controllerName} - failed to save account to user storage - ${errorMessage}`);
-        }
+        await (0, controller_integration_1.saveInternalAccountToUserStorage)(internalAccount, { isAccountSyncingEnabled: __classPrivateFieldGet(this, _UserStorageController_env, "f").isAccountSyncingEnabled }, {
+            getMessenger: () => this.messagingSystem,
+            getUserStorageControllerInstance: () => this,
+        });
     }
     async syncNetworks() {
         if (!__classPrivateFieldGet(this, _UserStorageController_env, "f").isNetworkSyncingEnabled) {
             return;
         }
         const profileId = await __classPrivateFieldGet(this, _UserStorageController_auth, "f").getProfileId();
-        await (0, controller_integration_1.performMainNetworkSync)({
+        await (0, controller_integration_2.performMainNetworkSync)({
             messenger: this.messagingSystem,
             getStorageConfig: () => __classPrivateFieldGet(this, _UserStorageController_instances, "m", _UserStorageController_getStorageOptions).call(this),
             maxNetworksToAdd: __classPrivateFieldGet(this, _UserStorageController_config, "f")?.networkSyncing?.maxNumberOfNetworksToAdd,
@@ -564,7 +385,7 @@ class UserStorageController extends base_controller_1.BaseController {
         });
     }
 }
-_UserStorageController_env = new WeakMap(), _UserStorageController_auth = new WeakMap(), _UserStorageController_accounts = new WeakMap(), _UserStorageController_config = new WeakMap(), _UserStorageController_notificationServices = new WeakMap(), _UserStorageController_isUnlocked = new WeakMap(), _UserStorageController_keyringController = new WeakMap(), _UserStorageController_nativeScryptCrypto = new WeakMap(), _UserStorageController__snapSignMessageCache = new WeakMap(), _UserStorageController_instances = new WeakSet(), _UserStorageController_registerMessageHandlers = function _UserStorageController_registerMessageHandlers() {
+_UserStorageController_env = new WeakMap(), _UserStorageController_auth = new WeakMap(), _UserStorageController_config = new WeakMap(), _UserStorageController_notificationServices = new WeakMap(), _UserStorageController_isUnlocked = new WeakMap(), _UserStorageController_keyringController = new WeakMap(), _UserStorageController_nativeScryptCrypto = new WeakMap(), _UserStorageController__snapSignMessageCache = new WeakMap(), _UserStorageController_instances = new WeakSet(), _UserStorageController_registerMessageHandlers = function _UserStorageController_registerMessageHandlers() {
     this.messagingSystem.registerActionHandler('UserStorageController:performGetStorage', this.performGetStorage.bind(this));
     this.messagingSystem.registerActionHandler('UserStorageController:performGetStorageAllFeatureEntries', this.performGetStorageAllFeatureEntries.bind(this));
     this.messagingSystem.registerActionHandler('UserStorageController:performSetStorage', this.performSetStorage.bind(this));