@metamask/profile-sync-controller 0.3.0 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (113) hide show
  1. package/CHANGELOG.md +25 -1
  2. package/dist/{chunk-NSSHFDIS.mjs → chunk-2VEMA6OE.mjs} +2 -2
  3. package/dist/{chunk-HMRRB4EX.js → chunk-4LMFZDL4.js} +22 -13
  4. package/dist/chunk-4LMFZDL4.js.map +1 -0
  5. package/dist/{chunk-JJ5BDCKD.js → chunk-4TMLEABQ.js} +18 -16
  6. package/dist/chunk-4TMLEABQ.js.map +1 -0
  7. package/dist/{chunk-EYZFHZR2.js → chunk-5MQUI24U.js} +3 -3
  8. package/dist/{chunk-QU4EXKJO.mjs → chunk-6DAK2U35.mjs} +2 -2
  9. package/dist/{chunk-LYDHYB6I.mjs → chunk-76NMME23.mjs} +20 -11
  10. package/dist/chunk-76NMME23.mjs.map +1 -0
  11. package/dist/{chunk-T3FNDVE3.js → chunk-BKQE7DB5.js} +30 -18
  12. package/dist/chunk-BKQE7DB5.js.map +1 -0
  13. package/dist/{chunk-K5UKU454.mjs → chunk-COBJUBZE.mjs} +31 -19
  14. package/dist/chunk-COBJUBZE.mjs.map +1 -0
  15. package/dist/{chunk-5TOWF6UW.mjs → chunk-KHASG4H3.mjs} +2 -2
  16. package/dist/{chunk-4WXZXVLI.mjs → chunk-M7AUA5W7.mjs} +10 -8
  17. package/dist/{chunk-4WXZXVLI.mjs.map → chunk-M7AUA5W7.mjs.map} +1 -1
  18. package/dist/{chunk-E7Z5TCQT.mjs → chunk-MK7ABX2V.mjs} +5 -5
  19. package/dist/{chunk-E7Z5TCQT.mjs.map → chunk-MK7ABX2V.mjs.map} +1 -1
  20. package/dist/{chunk-ZYYAQJ56.mjs → chunk-NEBLEB3X.mjs} +19 -15
  21. package/dist/chunk-NEBLEB3X.mjs.map +1 -0
  22. package/dist/{chunk-AK7OTIWA.js → chunk-NIUQ34PY.js} +3 -3
  23. package/dist/{chunk-M23ZCTKE.mjs → chunk-OLFO6R7Z.mjs} +55 -20
  24. package/dist/chunk-OLFO6R7Z.mjs.map +1 -0
  25. package/dist/{chunk-LNECIW4K.js → chunk-PQMPSEVJ.js} +59 -24
  26. package/dist/chunk-PQMPSEVJ.js.map +1 -0
  27. package/dist/{chunk-YKOMKXG4.mjs → chunk-PU7MAIST.mjs} +13 -4
  28. package/dist/chunk-PU7MAIST.mjs.map +1 -0
  29. package/dist/{chunk-PQ5T4GHY.js → chunk-QCQU4BQL.js} +15 -2
  30. package/dist/chunk-QCQU4BQL.js.map +1 -0
  31. package/dist/{chunk-J7NSK6BO.mjs → chunk-TP7SP3AG.mjs} +2 -2
  32. package/dist/{chunk-4ZGRRVMI.js → chunk-UEHMUVQQ.js} +4 -4
  33. package/dist/{chunk-5EBUFNAN.mjs → chunk-UEWCUBMX.mjs} +14 -1
  34. package/dist/chunk-UEWCUBMX.mjs.map +1 -0
  35. package/dist/chunk-UHX7HJAI.js +11 -0
  36. package/dist/{chunk-ZMQRPWJN.js → chunk-UIRAMHNM.js} +12 -12
  37. package/dist/chunk-UIRAMHNM.js.map +1 -0
  38. package/dist/{chunk-WAFY3R2F.js → chunk-VWDRFRJU.js} +27 -23
  39. package/dist/chunk-VWDRFRJU.js.map +1 -0
  40. package/dist/{chunk-Q5KTSMRE.js → chunk-Y45XUW33.js} +14 -5
  41. package/dist/chunk-Y45XUW33.js.map +1 -0
  42. package/dist/controllers/index.js +7 -7
  43. package/dist/controllers/index.mjs +6 -6
  44. package/dist/controllers/user-storage/UserStorageController.js +6 -6
  45. package/dist/controllers/user-storage/UserStorageController.mjs +5 -5
  46. package/dist/controllers/user-storage/encryption/encryption.js +2 -2
  47. package/dist/controllers/user-storage/encryption/encryption.mjs +1 -1
  48. package/dist/controllers/user-storage/encryption/index.js +3 -3
  49. package/dist/controllers/user-storage/encryption/index.mjs +2 -2
  50. package/dist/controllers/user-storage/index.js +7 -7
  51. package/dist/controllers/user-storage/index.mjs +6 -6
  52. package/dist/controllers/user-storage/schema.js +4 -4
  53. package/dist/controllers/user-storage/schema.mjs +3 -3
  54. package/dist/controllers/user-storage/services.js +5 -5
  55. package/dist/controllers/user-storage/services.mjs +4 -4
  56. package/dist/index.js +13 -13
  57. package/dist/index.mjs +12 -12
  58. package/dist/sdk/authentication-jwt-bearer/flow-srp.js +3 -3
  59. package/dist/sdk/authentication-jwt-bearer/flow-srp.mjs +2 -2
  60. package/dist/sdk/authentication.js +4 -4
  61. package/dist/sdk/authentication.mjs +3 -3
  62. package/dist/sdk/encryption.js +3 -3
  63. package/dist/sdk/encryption.mjs +2 -2
  64. package/dist/sdk/index.js +12 -10
  65. package/dist/sdk/index.mjs +13 -11
  66. package/dist/sdk/user-storage.js +6 -6
  67. package/dist/sdk/user-storage.mjs +5 -5
  68. package/dist/sdk/utils/messaging-signing-snap-requests.js +4 -2
  69. package/dist/sdk/utils/messaging-signing-snap-requests.mjs +5 -3
  70. package/dist/tsconfig.build.tsbuildinfo +1 -1
  71. package/dist/types/controllers/user-storage/UserStorageController.d.ts +5 -3
  72. package/dist/types/controllers/user-storage/UserStorageController.d.ts.map +1 -1
  73. package/dist/types/controllers/user-storage/__fixtures__/mockResponses.d.ts +4 -4
  74. package/dist/types/controllers/user-storage/__fixtures__/mockResponses.d.ts.map +1 -1
  75. package/dist/types/controllers/user-storage/__fixtures__/mockServices.d.ts +2 -2
  76. package/dist/types/controllers/user-storage/__fixtures__/mockServices.d.ts.map +1 -1
  77. package/dist/types/controllers/user-storage/__fixtures__/mockStorage.d.ts +1 -1
  78. package/dist/types/controllers/user-storage/__fixtures__/mockStorage.d.ts.map +1 -1
  79. package/dist/types/controllers/user-storage/encryption/encryption.d.ts +3 -2
  80. package/dist/types/controllers/user-storage/encryption/encryption.d.ts.map +1 -1
  81. package/dist/types/controllers/user-storage/services.d.ts +3 -0
  82. package/dist/types/controllers/user-storage/services.d.ts.map +1 -1
  83. package/dist/types/sdk/__fixtures__/mock-userstorage.d.ts +5 -5
  84. package/dist/types/sdk/__fixtures__/mock-userstorage.d.ts.map +1 -1
  85. package/dist/types/sdk/authentication.d.ts +1 -0
  86. package/dist/types/sdk/authentication.d.ts.map +1 -1
  87. package/dist/types/sdk/user-storage.d.ts.map +1 -1
  88. package/dist/types/sdk/utils/messaging-signing-snap-requests.d.ts +7 -0
  89. package/dist/types/sdk/utils/messaging-signing-snap-requests.d.ts.map +1 -1
  90. package/package.json +1 -1
  91. package/dist/chunk-5EBUFNAN.mjs.map +0 -1
  92. package/dist/chunk-HMRRB4EX.js.map +0 -1
  93. package/dist/chunk-JJ5BDCKD.js.map +0 -1
  94. package/dist/chunk-K5UKU454.mjs.map +0 -1
  95. package/dist/chunk-LDYHGAP4.js +0 -11
  96. package/dist/chunk-LNECIW4K.js.map +0 -1
  97. package/dist/chunk-LYDHYB6I.mjs.map +0 -1
  98. package/dist/chunk-M23ZCTKE.mjs.map +0 -1
  99. package/dist/chunk-PQ5T4GHY.js.map +0 -1
  100. package/dist/chunk-Q5KTSMRE.js.map +0 -1
  101. package/dist/chunk-T3FNDVE3.js.map +0 -1
  102. package/dist/chunk-WAFY3R2F.js.map +0 -1
  103. package/dist/chunk-YKOMKXG4.mjs.map +0 -1
  104. package/dist/chunk-ZMQRPWJN.js.map +0 -1
  105. package/dist/chunk-ZYYAQJ56.mjs.map +0 -1
  106. /package/dist/{chunk-NSSHFDIS.mjs.map → chunk-2VEMA6OE.mjs.map} +0 -0
  107. /package/dist/{chunk-EYZFHZR2.js.map → chunk-5MQUI24U.js.map} +0 -0
  108. /package/dist/{chunk-QU4EXKJO.mjs.map → chunk-6DAK2U35.mjs.map} +0 -0
  109. /package/dist/{chunk-5TOWF6UW.mjs.map → chunk-KHASG4H3.mjs.map} +0 -0
  110. /package/dist/{chunk-AK7OTIWA.js.map → chunk-NIUQ34PY.js.map} +0 -0
  111. /package/dist/{chunk-J7NSK6BO.mjs.map → chunk-TP7SP3AG.mjs.map} +0 -0
  112. /package/dist/{chunk-4ZGRRVMI.js.map → chunk-UEHMUVQQ.js.map} +0 -0
  113. /package/dist/{chunk-LDYHGAP4.js.map → chunk-UHX7HJAI.js.map} +0 -0
package/CHANGELOG.md CHANGED
@@ -7,6 +7,28 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
7
7
 
8
8
  ## [Unreleased]
9
9
 
10
+ ## [0.5.0]
11
+
12
+ ### Added
13
+
14
+ - add isSnapConnected method to the Authentication SDK ([#4668](https://github.com/MetaMask/core/pull/4668))
15
+ - add `accountAdded` and `accountRenamed` events when triggering account syncing ([#4665](https://github.com/MetaMask/core/pull/4665))
16
+ - prevent accounts controller events being used when sync is in progress ([#4675](https://github.com/MetaMask/core/pull/4675))
17
+ - add `isAccountSyncingInProgress` to `UserStorageController`
18
+ - add `isAccountSyncingInProgress` checks to abort processing `accountAdded` and `accountRenamed` events.
19
+
20
+ ### Removed
21
+
22
+ - account sync throttling ([#4675](https://github.com/MetaMask/core/pull/4675))
23
+ - remove `maxSyncInterval`; `lastSyncedAt`; `shouldSync` from `UserStorageController`
24
+
25
+ ## [0.4.0]
26
+
27
+ ### Added
28
+
29
+ - add `maxSyncInterval` for account syncing to `UserStorageController` prevent multiple sync requests ([#4659](https://github.com/MetaMask/core/pull/4659))
30
+ - add optional `NativeScrypt` property to `UserStorageController` to allow the scrypt implementation to be swapped out for a native version. Improving mobile performance ([#4656](https://github.com/MetaMask/core/pull/4656))
31
+
10
32
  ## [0.3.0]
11
33
 
12
34
  ### Added
@@ -127,7 +149,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
127
149
 
128
150
  - Initial release
129
151
 
130
- [Unreleased]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.3.0...HEAD
152
+ [Unreleased]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.5.0...HEAD
153
+ [0.5.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.4.0...@metamask/profile-sync-controller@0.5.0
154
+ [0.4.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.3.0...@metamask/profile-sync-controller@0.4.0
131
155
  [0.3.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.2.1...@metamask/profile-sync-controller@0.3.0
132
156
  [0.2.1]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.2.0...@metamask/profile-sync-controller@0.2.1
133
157
  [0.2.0]: https://github.com/MetaMask/core/compare/@metamask/profile-sync-controller@0.1.4...@metamask/profile-sync-controller@0.2.0
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  createSHA256Hash
3
- } from "./chunk-K5UKU454.mjs";
3
+ } from "./chunk-COBJUBZE.mjs";
4
4
 
5
5
  // src/controllers/user-storage/schema.ts
6
6
  var ALLOW_ARBITRARY_KEYS = "ALLOW_ARBITRARY_KEYS";
@@ -44,4 +44,4 @@ export {
44
44
  isPathWithFeatureAndKey,
45
45
  createEntryPath
46
46
  };
47
- //# sourceMappingURL=chunk-NSSHFDIS.mjs.map
47
+ //# sourceMappingURL=chunk-2VEMA6OE.mjs.map
@@ -1,9 +1,9 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
2
2
 
3
- var _chunkEYZFHZR2js = require('./chunk-EYZFHZR2.js');
3
+ var _chunk5MQUI24Ujs = require('./chunk-5MQUI24U.js');
4
4
 
5
5
 
6
- var _chunkAK7OTIWAjs = require('./chunk-AK7OTIWA.js');
6
+ var _chunkNIUQ34PYjs = require('./chunk-NIUQ34PY.js');
7
7
 
8
8
 
9
9
  var _chunkDF24ZX4Hjs = require('./chunk-DF24ZX4H.js');
@@ -15,8 +15,8 @@ var USER_STORAGE_API = ENV_URLS.userStorageApiUrl;
15
15
  var USER_STORAGE_ENDPOINT = `${USER_STORAGE_API}/api/v1/userstorage`;
16
16
  async function getUserStorage(opts) {
17
17
  try {
18
- const { bearerToken, path, storageKey } = opts;
19
- const encryptedPath = _chunkEYZFHZR2js.createEntryPath.call(void 0, path, storageKey);
18
+ const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;
19
+ const encryptedPath = _chunk5MQUI24Ujs.createEntryPath.call(void 0, path, storageKey);
20
20
  const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);
21
21
  const userStorageResponse = await fetch(url.toString(), {
22
22
  headers: {
@@ -35,9 +35,10 @@ async function getUserStorage(opts) {
35
35
  if (!encryptedData) {
36
36
  return null;
37
37
  }
38
- const decryptedData = _chunkAK7OTIWAjs.encryption_default.decryptString(
38
+ const decryptedData = await _chunkNIUQ34PYjs.encryption_default.decryptString(
39
39
  encryptedData,
40
- opts.storageKey
40
+ opts.storageKey,
41
+ nativeScryptCrypto
41
42
  );
42
43
  return decryptedData;
43
44
  } catch (e) {
@@ -47,7 +48,7 @@ async function getUserStorage(opts) {
47
48
  }
48
49
  async function getUserStorageAllFeatureEntries(opts) {
49
50
  try {
50
- const { bearerToken, path } = opts;
51
+ const { bearerToken, path, nativeScryptCrypto } = opts;
51
52
  const url = new URL(`${USER_STORAGE_ENDPOINT}/${path}`);
52
53
  const userStorageResponse = await fetch(url.toString(), {
53
54
  headers: {
@@ -69,18 +70,26 @@ async function getUserStorageAllFeatureEntries(opts) {
69
70
  if (!entry.Data) {
70
71
  return [];
71
72
  }
72
- return _chunkAK7OTIWAjs.encryption_default.decryptString(entry.Data, opts.storageKey);
73
+ return _chunkNIUQ34PYjs.encryption_default.decryptString(
74
+ entry.Data,
75
+ opts.storageKey,
76
+ nativeScryptCrypto
77
+ );
73
78
  });
74
- return decryptedData;
79
+ return (await Promise.allSettled(decryptedData)).map((d) => d.status === "fulfilled" ? d.value : void 0).filter((d) => d !== void 0);
75
80
  } catch (e) {
76
81
  _loglevel2.default.error("Failed to get user storage", e);
77
82
  return null;
78
83
  }
79
84
  }
80
85
  async function upsertUserStorage(data, opts) {
81
- const { bearerToken, path, storageKey } = opts;
82
- const encryptedData = _chunkAK7OTIWAjs.encryption_default.encryptString(data, opts.storageKey);
83
- const encryptedPath = _chunkEYZFHZR2js.createEntryPath.call(void 0, path, storageKey);
86
+ const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;
87
+ const encryptedData = await _chunkNIUQ34PYjs.encryption_default.encryptString(
88
+ data,
89
+ opts.storageKey,
90
+ nativeScryptCrypto
91
+ );
92
+ const encryptedPath = _chunk5MQUI24Ujs.createEntryPath.call(void 0, path, storageKey);
84
93
  const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);
85
94
  const res = await fetch(url.toString(), {
86
95
  method: "PUT",
@@ -102,4 +111,4 @@ async function upsertUserStorage(data, opts) {
102
111
 
103
112
 
104
113
  exports.USER_STORAGE_API = USER_STORAGE_API; exports.USER_STORAGE_ENDPOINT = USER_STORAGE_ENDPOINT; exports.getUserStorage = getUserStorage; exports.getUserStorageAllFeatureEntries = getUserStorageAllFeatureEntries; exports.upsertUserStorage = upsertUserStorage;
105
- //# sourceMappingURL=chunk-HMRRB4EX.js.map
114
+ //# sourceMappingURL=chunk-4LMFZDL4.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/controllers/user-storage/services.ts"],"names":[],"mappings":"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","sourcesContent":["import log from 'loglevel';\n\nimport { Env, getEnvUrls } from '../../sdk/env';\nimport encryption from './encryption';\nimport type {\n UserStoragePathWithFeatureAndKey,\n UserStoragePathWithFeatureOnly,\n} from './schema';\nimport { createEntryPath } from './schema';\nimport type { NativeScrypt } from './UserStorageController';\n\nconst ENV_URLS = getEnvUrls(Env.PRD);\n\nexport const USER_STORAGE_API: string = ENV_URLS.userStorageApiUrl;\nexport const USER_STORAGE_ENDPOINT = `${USER_STORAGE_API}/api/v1/userstorage`;\n\n/**\n * This is the Server Response shape for a feature entry.\n */\nexport type GetUserStorageResponse = {\n // eslint-disable-next-line @typescript-eslint/naming-convention\n HashedKey: string;\n // eslint-disable-next-line @typescript-eslint/naming-convention\n Data: string;\n};\n\nexport type GetUserStorageAllFeatureEntriesResponse = {\n // eslint-disable-next-line @typescript-eslint/naming-convention\n HashedKey: string;\n // eslint-disable-next-line @typescript-eslint/naming-convention\n Data: string;\n}[];\n\nexport type UserStorageBaseOptions = {\n bearerToken: string;\n storageKey: string;\n};\n\nexport type UserStorageOptions = UserStorageBaseOptions & {\n path: UserStoragePathWithFeatureAndKey;\n nativeScryptCrypto?: NativeScrypt;\n};\n\nexport type UserStorageAllFeatureEntriesOptions = UserStorageBaseOptions & {\n path: UserStoragePathWithFeatureOnly;\n nativeScryptCrypto?: NativeScrypt;\n};\n\n/**\n * User Storage Service - Get Storage Entry.\n *\n * @param opts - User Storage Options\n * @returns The storage entry, or null if fails to find entry\n */\nexport async function getUserStorage(\n opts: UserStorageOptions,\n): Promise<string | null> {\n try {\n const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;\n\n const encryptedPath = createEntryPath(path, storageKey);\n const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);\n\n const userStorageResponse = await fetch(url.toString(), {\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${bearerToken}`,\n },\n });\n\n // Acceptable error - since indicates entry does not exist.\n if (userStorageResponse.status === 404) {\n return null;\n }\n\n if (userStorageResponse.status !== 200) {\n throw new Error('Unable to get User Storage');\n }\n\n const userStorage: GetUserStorageResponse | null =\n await userStorageResponse.json();\n const encryptedData = userStorage?.Data ?? null;\n\n if (!encryptedData) {\n return null;\n }\n\n const decryptedData = await encryption.decryptString(\n encryptedData,\n opts.storageKey,\n nativeScryptCrypto,\n );\n\n return decryptedData;\n } catch (e) {\n log.error('Failed to get user storage', e);\n return null;\n }\n}\n\n/**\n * User Storage Service - Get all storage entries for a specific feature.\n *\n * @param opts - User Storage Options\n * @returns The storage entry, or null if fails to find entry\n */\nexport async function getUserStorageAllFeatureEntries(\n opts: UserStorageAllFeatureEntriesOptions,\n): Promise<string[] | null> {\n try {\n const { bearerToken, path, nativeScryptCrypto } = opts;\n const url = new URL(`${USER_STORAGE_ENDPOINT}/${path}`);\n\n const userStorageResponse = await fetch(url.toString(), {\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${bearerToken}`,\n },\n });\n\n // Acceptable error - since indicates feature does not exist.\n if (userStorageResponse.status === 404) {\n return null;\n }\n\n if (userStorageResponse.status !== 200) {\n throw new Error('Unable to get User Storage');\n }\n\n const userStorage: GetUserStorageAllFeatureEntriesResponse | null =\n await userStorageResponse.json();\n\n if (!Array.isArray(userStorage)) {\n return null;\n }\n\n const decryptedData = userStorage?.flatMap((entry) => {\n if (!entry.Data) {\n return [];\n }\n\n return encryption.decryptString(\n entry.Data,\n opts.storageKey,\n nativeScryptCrypto,\n );\n });\n\n return (await Promise.allSettled(decryptedData))\n .map((d) => (d.status === 'fulfilled' ? d.value : undefined))\n .filter((d): d is string => d !== undefined);\n } catch (e) {\n log.error('Failed to get user storage', e);\n return null;\n }\n}\n\n/**\n * User Storage Service - Set Storage Entry.\n *\n * @param data - data to store\n * @param opts - storage options\n */\nexport async function upsertUserStorage(\n data: string,\n opts: UserStorageOptions,\n): Promise<void> {\n const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;\n\n const encryptedData = await encryption.encryptString(\n data,\n opts.storageKey,\n nativeScryptCrypto,\n );\n const encryptedPath = createEntryPath(path, storageKey);\n const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);\n\n const res = await fetch(url.toString(), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${bearerToken}`,\n },\n body: JSON.stringify({ data: encryptedData }),\n });\n\n if (!res.ok) {\n throw new Error('user-storage - unable to upsert data');\n }\n}\n"]}
@@ -1,12 +1,12 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
- var _chunkQ5KTSMREjs = require('./chunk-Q5KTSMRE.js');
3
+ var _chunkY45XUW33js = require('./chunk-Y45XUW33.js');
4
4
 
5
5
 
6
6
  var _chunkKIVBL6OMjs = require('./chunk-KIVBL6OM.js');
7
7
 
8
8
 
9
- var _chunk4ZGRRVMIjs = require('./chunk-4ZGRRVMI.js');
9
+ var _chunkUEHMUVQQjs = require('./chunk-UEHMUVQQ.js');
10
10
 
11
11
 
12
12
  var _chunkPBRUOBEQjs = require('./chunk-PBRUOBEQ.js');
@@ -16,14 +16,15 @@ var _chunkPBRUOBEQjs = require('./chunk-PBRUOBEQ.js');
16
16
 
17
17
 
18
18
 
19
- var _chunkPQ5T4GHYjs = require('./chunk-PQ5T4GHY.js');
20
19
 
20
+ var _chunkQCQU4BQLjs = require('./chunk-QCQU4BQL.js');
21
21
 
22
22
 
23
- var _chunkZMQRPWJNjs = require('./chunk-ZMQRPWJN.js');
24
23
 
24
+ var _chunkUIRAMHNMjs = require('./chunk-UIRAMHNM.js');
25
25
 
26
- var _chunkT3FNDVE3js = require('./chunk-T3FNDVE3.js');
26
+
27
+ var _chunkBKQE7DB5js = require('./chunk-BKQE7DB5.js');
27
28
 
28
29
 
29
30
 
@@ -48,30 +49,31 @@ var sdk_exports = {};
48
49
  _chunkIGY2S5BCjs.__export.call(void 0, sdk_exports, {
49
50
  AuthType: () => _chunkPBRUOBEQjs.AuthType,
50
51
  Env: () => _chunkDF24ZX4Hjs.Env,
51
- JwtBearerAuth: () => _chunkQ5KTSMREjs.JwtBearerAuth,
52
- MESSAGE_SIGNING_SNAP: () => _chunkPQ5T4GHYjs.MESSAGE_SIGNING_SNAP,
52
+ JwtBearerAuth: () => _chunkY45XUW33js.JwtBearerAuth,
53
+ MESSAGE_SIGNING_SNAP: () => _chunkQCQU4BQLjs.MESSAGE_SIGNING_SNAP,
53
54
  NonceRetrievalError: () => _chunkMBTBE4P5js.NonceRetrievalError,
54
55
  NotFoundError: () => _chunkMBTBE4P5js.NotFoundError,
55
56
  PairError: () => _chunkMBTBE4P5js.PairError,
56
57
  Platform: () => _chunkDF24ZX4Hjs.Platform,
57
58
  SIWEJwtBearerAuth: () => _chunkKIVBL6OMjs.SIWEJwtBearerAuth,
58
- SNAP_ORIGIN: () => _chunkPQ5T4GHYjs.SNAP_ORIGIN,
59
- SRPJwtBearerAuth: () => _chunk4ZGRRVMIjs.SRPJwtBearerAuth,
60
- STORAGE_URL: () => _chunkZMQRPWJNjs.STORAGE_URL,
59
+ SNAP_ORIGIN: () => _chunkQCQU4BQLjs.SNAP_ORIGIN,
60
+ SRPJwtBearerAuth: () => _chunkUEHMUVQQjs.SRPJwtBearerAuth,
61
+ STORAGE_URL: () => _chunkUIRAMHNMjs.STORAGE_URL,
61
62
  SignInError: () => _chunkMBTBE4P5js.SignInError,
62
63
  UnsupportedAuthTypeError: () => _chunkMBTBE4P5js.UnsupportedAuthTypeError,
63
- UserStorage: () => _chunkZMQRPWJNjs.UserStorage,
64
+ UserStorage: () => _chunkUIRAMHNMjs.UserStorage,
64
65
  UserStorageError: () => _chunkMBTBE4P5js.UserStorageError,
65
66
  ValidationError: () => _chunkMBTBE4P5js.ValidationError,
66
- connectSnap: () => _chunkPQ5T4GHYjs.connectSnap,
67
- createSHA256Hash: () => _chunkT3FNDVE3js.createSHA256Hash,
67
+ connectSnap: () => _chunkQCQU4BQLjs.connectSnap,
68
+ createSHA256Hash: () => _chunkBKQE7DB5js.createSHA256Hash,
68
69
  getEnvUrls: () => _chunkDF24ZX4Hjs.getEnvUrls,
69
70
  getOidcClientId: () => _chunkDF24ZX4Hjs.getOidcClientId,
70
- getSnap: () => _chunkPQ5T4GHYjs.getSnap,
71
- getSnaps: () => _chunkPQ5T4GHYjs.getSnaps
71
+ getSnap: () => _chunkQCQU4BQLjs.getSnap,
72
+ getSnaps: () => _chunkQCQU4BQLjs.getSnaps,
73
+ isSnapConnected: () => _chunkQCQU4BQLjs.isSnapConnected
72
74
  });
73
75
 
74
76
 
75
77
 
76
78
  exports.sdk_exports = sdk_exports;
77
- //# sourceMappingURL=chunk-JJ5BDCKD.js.map
79
+ //# sourceMappingURL=chunk-4TMLEABQ.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/sdk/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA","sourcesContent":["export * from './authentication';\nexport * from './user-storage';\nexport * from './env';\nexport * from './errors';\nexport * from './encryption';\nexport * from './utils/messaging-signing-snap-requests';\n"]}
@@ -1,6 +1,6 @@
1
1
  "use strict";Object.defineProperty(exports, "__esModule", {value: true});
2
2
 
3
- var _chunkT3FNDVE3js = require('./chunk-T3FNDVE3.js');
3
+ var _chunkBKQE7DB5js = require('./chunk-BKQE7DB5.js');
4
4
 
5
5
  // src/controllers/user-storage/schema.ts
6
6
  var ALLOW_ARBITRARY_KEYS = "ALLOW_ARBITRARY_KEYS";
@@ -34,7 +34,7 @@ var isPathWithFeatureAndKey = (path) => {
34
34
  };
35
35
  function createEntryPath(path, storageKey) {
36
36
  const { feature, key } = getFeatureAndKeyFromPath(path);
37
- const hashedKey = _chunkT3FNDVE3js.createSHA256Hash.call(void 0, key + storageKey);
37
+ const hashedKey = _chunkBKQE7DB5js.createSHA256Hash.call(void 0, key + storageKey);
38
38
  return `/${feature}/${hashedKey}`;
39
39
  }
40
40
 
@@ -44,4 +44,4 @@ function createEntryPath(path, storageKey) {
44
44
 
45
45
 
46
46
  exports.USER_STORAGE_SCHEMA = USER_STORAGE_SCHEMA; exports.getFeatureAndKeyFromPath = getFeatureAndKeyFromPath; exports.isPathWithFeatureAndKey = isPathWithFeatureAndKey; exports.createEntryPath = createEntryPath;
47
- //# sourceMappingURL=chunk-EYZFHZR2.js.map
47
+ //# sourceMappingURL=chunk-5MQUI24U.js.map
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  encryption_default
3
- } from "./chunk-K5UKU454.mjs";
3
+ } from "./chunk-COBJUBZE.mjs";
4
4
 
5
5
  // src/sdk/encryption.ts
6
6
  var encryption_default2 = encryption_default;
@@ -8,4 +8,4 @@ var encryption_default2 = encryption_default;
8
8
  export {
9
9
  encryption_default2 as encryption_default
10
10
  };
11
- //# sourceMappingURL=chunk-QU4EXKJO.mjs.map
11
+ //# sourceMappingURL=chunk-6DAK2U35.mjs.map
@@ -1,9 +1,9 @@
1
1
  import {
2
2
  createEntryPath
3
- } from "./chunk-NSSHFDIS.mjs";
3
+ } from "./chunk-2VEMA6OE.mjs";
4
4
  import {
5
5
  encryption_default
6
- } from "./chunk-5TOWF6UW.mjs";
6
+ } from "./chunk-KHASG4H3.mjs";
7
7
  import {
8
8
  getEnvUrls
9
9
  } from "./chunk-KTCSRECK.mjs";
@@ -15,7 +15,7 @@ var USER_STORAGE_API = ENV_URLS.userStorageApiUrl;
15
15
  var USER_STORAGE_ENDPOINT = `${USER_STORAGE_API}/api/v1/userstorage`;
16
16
  async function getUserStorage(opts) {
17
17
  try {
18
- const { bearerToken, path, storageKey } = opts;
18
+ const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;
19
19
  const encryptedPath = createEntryPath(path, storageKey);
20
20
  const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);
21
21
  const userStorageResponse = await fetch(url.toString(), {
@@ -35,9 +35,10 @@ async function getUserStorage(opts) {
35
35
  if (!encryptedData) {
36
36
  return null;
37
37
  }
38
- const decryptedData = encryption_default.decryptString(
38
+ const decryptedData = await encryption_default.decryptString(
39
39
  encryptedData,
40
- opts.storageKey
40
+ opts.storageKey,
41
+ nativeScryptCrypto
41
42
  );
42
43
  return decryptedData;
43
44
  } catch (e) {
@@ -47,7 +48,7 @@ async function getUserStorage(opts) {
47
48
  }
48
49
  async function getUserStorageAllFeatureEntries(opts) {
49
50
  try {
50
- const { bearerToken, path } = opts;
51
+ const { bearerToken, path, nativeScryptCrypto } = opts;
51
52
  const url = new URL(`${USER_STORAGE_ENDPOINT}/${path}`);
52
53
  const userStorageResponse = await fetch(url.toString(), {
53
54
  headers: {
@@ -69,17 +70,25 @@ async function getUserStorageAllFeatureEntries(opts) {
69
70
  if (!entry.Data) {
70
71
  return [];
71
72
  }
72
- return encryption_default.decryptString(entry.Data, opts.storageKey);
73
+ return encryption_default.decryptString(
74
+ entry.Data,
75
+ opts.storageKey,
76
+ nativeScryptCrypto
77
+ );
73
78
  });
74
- return decryptedData;
79
+ return (await Promise.allSettled(decryptedData)).map((d) => d.status === "fulfilled" ? d.value : void 0).filter((d) => d !== void 0);
75
80
  } catch (e) {
76
81
  log.error("Failed to get user storage", e);
77
82
  return null;
78
83
  }
79
84
  }
80
85
  async function upsertUserStorage(data, opts) {
81
- const { bearerToken, path, storageKey } = opts;
82
- const encryptedData = encryption_default.encryptString(data, opts.storageKey);
86
+ const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;
87
+ const encryptedData = await encryption_default.encryptString(
88
+ data,
89
+ opts.storageKey,
90
+ nativeScryptCrypto
91
+ );
83
92
  const encryptedPath = createEntryPath(path, storageKey);
84
93
  const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);
85
94
  const res = await fetch(url.toString(), {
@@ -102,4 +111,4 @@ export {
102
111
  getUserStorageAllFeatureEntries,
103
112
  upsertUserStorage
104
113
  };
105
- //# sourceMappingURL=chunk-LYDHYB6I.mjs.map
114
+ //# sourceMappingURL=chunk-76NMME23.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/controllers/user-storage/services.ts"],"sourcesContent":["import log from 'loglevel';\n\nimport { Env, getEnvUrls } from '../../sdk/env';\nimport encryption from './encryption';\nimport type {\n UserStoragePathWithFeatureAndKey,\n UserStoragePathWithFeatureOnly,\n} from './schema';\nimport { createEntryPath } from './schema';\nimport type { NativeScrypt } from './UserStorageController';\n\nconst ENV_URLS = getEnvUrls(Env.PRD);\n\nexport const USER_STORAGE_API: string = ENV_URLS.userStorageApiUrl;\nexport const USER_STORAGE_ENDPOINT = `${USER_STORAGE_API}/api/v1/userstorage`;\n\n/**\n * This is the Server Response shape for a feature entry.\n */\nexport type GetUserStorageResponse = {\n // eslint-disable-next-line @typescript-eslint/naming-convention\n HashedKey: string;\n // eslint-disable-next-line @typescript-eslint/naming-convention\n Data: string;\n};\n\nexport type GetUserStorageAllFeatureEntriesResponse = {\n // eslint-disable-next-line @typescript-eslint/naming-convention\n HashedKey: string;\n // eslint-disable-next-line @typescript-eslint/naming-convention\n Data: string;\n}[];\n\nexport type UserStorageBaseOptions = {\n bearerToken: string;\n storageKey: string;\n};\n\nexport type UserStorageOptions = UserStorageBaseOptions & {\n path: UserStoragePathWithFeatureAndKey;\n nativeScryptCrypto?: NativeScrypt;\n};\n\nexport type UserStorageAllFeatureEntriesOptions = UserStorageBaseOptions & {\n path: UserStoragePathWithFeatureOnly;\n nativeScryptCrypto?: NativeScrypt;\n};\n\n/**\n * User Storage Service - Get Storage Entry.\n *\n * @param opts - User Storage Options\n * @returns The storage entry, or null if fails to find entry\n */\nexport async function getUserStorage(\n opts: UserStorageOptions,\n): Promise<string | null> {\n try {\n const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;\n\n const encryptedPath = createEntryPath(path, storageKey);\n const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);\n\n const userStorageResponse = await fetch(url.toString(), {\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${bearerToken}`,\n },\n });\n\n // Acceptable error - since indicates entry does not exist.\n if (userStorageResponse.status === 404) {\n return null;\n }\n\n if (userStorageResponse.status !== 200) {\n throw new Error('Unable to get User Storage');\n }\n\n const userStorage: GetUserStorageResponse | null =\n await userStorageResponse.json();\n const encryptedData = userStorage?.Data ?? null;\n\n if (!encryptedData) {\n return null;\n }\n\n const decryptedData = await encryption.decryptString(\n encryptedData,\n opts.storageKey,\n nativeScryptCrypto,\n );\n\n return decryptedData;\n } catch (e) {\n log.error('Failed to get user storage', e);\n return null;\n }\n}\n\n/**\n * User Storage Service - Get all storage entries for a specific feature.\n *\n * @param opts - User Storage Options\n * @returns The storage entry, or null if fails to find entry\n */\nexport async function getUserStorageAllFeatureEntries(\n opts: UserStorageAllFeatureEntriesOptions,\n): Promise<string[] | null> {\n try {\n const { bearerToken, path, nativeScryptCrypto } = opts;\n const url = new URL(`${USER_STORAGE_ENDPOINT}/${path}`);\n\n const userStorageResponse = await fetch(url.toString(), {\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${bearerToken}`,\n },\n });\n\n // Acceptable error - since indicates feature does not exist.\n if (userStorageResponse.status === 404) {\n return null;\n }\n\n if (userStorageResponse.status !== 200) {\n throw new Error('Unable to get User Storage');\n }\n\n const userStorage: GetUserStorageAllFeatureEntriesResponse | null =\n await userStorageResponse.json();\n\n if (!Array.isArray(userStorage)) {\n return null;\n }\n\n const decryptedData = userStorage?.flatMap((entry) => {\n if (!entry.Data) {\n return [];\n }\n\n return encryption.decryptString(\n entry.Data,\n opts.storageKey,\n nativeScryptCrypto,\n );\n });\n\n return (await Promise.allSettled(decryptedData))\n .map((d) => (d.status === 'fulfilled' ? d.value : undefined))\n .filter((d): d is string => d !== undefined);\n } catch (e) {\n log.error('Failed to get user storage', e);\n return null;\n }\n}\n\n/**\n * User Storage Service - Set Storage Entry.\n *\n * @param data - data to store\n * @param opts - storage options\n */\nexport async function upsertUserStorage(\n data: string,\n opts: UserStorageOptions,\n): Promise<void> {\n const { bearerToken, path, storageKey, nativeScryptCrypto } = opts;\n\n const encryptedData = await encryption.encryptString(\n data,\n opts.storageKey,\n nativeScryptCrypto,\n );\n const encryptedPath = createEntryPath(path, storageKey);\n const url = new URL(`${USER_STORAGE_ENDPOINT}${encryptedPath}`);\n\n const res = await fetch(url.toString(), {\n method: 'PUT',\n headers: {\n 'Content-Type': 'application/json',\n Authorization: `Bearer ${bearerToken}`,\n },\n body: JSON.stringify({ data: encryptedData }),\n });\n\n if (!res.ok) {\n throw new Error('user-storage - unable to upsert data');\n }\n}\n"],"mappings":"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","names":[]}
@@ -34,20 +34,20 @@ var EncryptorDecryptor = class {
34
34
  _chunkIGY2S5BCjs.__privateAdd.call(void 0, this, _decrypt);
35
35
  _chunkIGY2S5BCjs.__privateAdd.call(void 0, this, _getOrGenerateScryptKey);
36
36
  }
37
- encryptString(plaintext, password) {
37
+ async encryptString(plaintext, password, nativeScryptCrypto) {
38
38
  try {
39
- return _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _encryptStringV1, encryptStringV1_fn).call(this, plaintext, password);
39
+ return await _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _encryptStringV1, encryptStringV1_fn).call(this, plaintext, password, nativeScryptCrypto);
40
40
  } catch (e) {
41
41
  const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);
42
42
  throw new Error(`Unable to encrypt string - ${errorMessage}`);
43
43
  }
44
44
  }
45
- decryptString(encryptedDataStr, password) {
45
+ async decryptString(encryptedDataStr, password, nativeScryptCrypto) {
46
46
  try {
47
47
  const encryptedData = JSON.parse(encryptedDataStr);
48
48
  if (encryptedData.v === "1") {
49
49
  if (encryptedData.t === "scrypt") {
50
- return _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _decryptStringV1, decryptStringV1_fn).call(this, encryptedData, password);
50
+ return await _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _decryptStringV1, decryptStringV1_fn).call(this, encryptedData, password, nativeScryptCrypto);
51
51
  }
52
52
  }
53
53
  throw new Error(
@@ -60,13 +60,13 @@ var EncryptorDecryptor = class {
60
60
  }
61
61
  };
62
62
  _encryptStringV1 = new WeakSet();
63
- encryptStringV1_fn = function(plaintext, password) {
64
- const { key, salt } = _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
63
+ encryptStringV1_fn = async function(plaintext, password, nativeScryptCrypto) {
64
+ const { key, salt } = await _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
65
65
  N: SCRYPT_N,
66
66
  r: SCRYPT_r,
67
67
  p: SCRYPT_p,
68
68
  dkLen: ALGORITHM_KEY_SIZE
69
- });
69
+ }, _webcrypto.randomBytes.call(void 0, SCRYPT_SALT_SIZE), nativeScryptCrypto);
70
70
  const plaintextRaw = _utils.utf8ToBytes.call(void 0, plaintext);
71
71
  const ciphertextAndNonceAndSalt = _utils.concatBytes.call(void 0,
72
72
  salt,
@@ -88,7 +88,7 @@ encryptStringV1_fn = function(plaintext, password) {
88
88
  return JSON.stringify(encryptedPayload);
89
89
  };
90
90
  _decryptStringV1 = new WeakSet();
91
- decryptStringV1_fn = function(data, password) {
91
+ decryptStringV1_fn = async function(data, password, nativeScryptCrypto) {
92
92
  const { o, d: base64CiphertextAndNonceAndSalt, saltLen } = data;
93
93
  const ciphertextAndNonceAndSalt = _chunkPCOIRDTOjs.base64ToByteArray.call(void 0,
94
94
  base64CiphertextAndNonceAndSalt
@@ -98,12 +98,12 @@ decryptStringV1_fn = function(data, password) {
98
98
  saltLen,
99
99
  ciphertextAndNonceAndSalt.length
100
100
  );
101
- const { key } = _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
101
+ const { key } = await _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
102
102
  N: o.N,
103
103
  r: o.r,
104
104
  p: o.p,
105
105
  dkLen: o.dkLen
106
- }, salt);
106
+ }, salt, nativeScryptCrypto);
107
107
  return _chunkPCOIRDTOjs.bytesToUtf8.call(void 0, _chunkIGY2S5BCjs.__privateMethod.call(void 0, this, _decrypt, decrypt_fn).call(this, ciphertextAndNonce, key));
108
108
  };
109
109
  _encrypt = new WeakSet();
@@ -122,7 +122,7 @@ decrypt_fn = function(ciphertextAndNonce, key) {
122
122
  return _aes.gcm.call(void 0, key, nonce).decrypt(ciphertext);
123
123
  };
124
124
  _getOrGenerateScryptKey = new WeakSet();
125
- getOrGenerateScryptKey_fn = function(password, o, salt) {
125
+ getOrGenerateScryptKey_fn = async function(password, o, salt, nativeScryptCrypto) {
126
126
  const hashedPassword = createSHA256Hash(password);
127
127
  const cachedKey = salt ? _chunkUAXWZN5Jjs.getCachedKeyBySalt.call(void 0, hashedPassword, salt) : _chunkUAXWZN5Jjs.getAnyCachedKey.call(void 0, hashedPassword);
128
128
  if (cachedKey) {
@@ -132,12 +132,24 @@ getOrGenerateScryptKey_fn = function(password, o, salt) {
132
132
  };
133
133
  }
134
134
  const newSalt = salt ?? _webcrypto.randomBytes.call(void 0, SCRYPT_SALT_SIZE);
135
- const newKey = _scrypt.scrypt.call(void 0, password, newSalt, {
136
- N: o.N,
137
- r: o.r,
138
- p: o.p,
139
- dkLen: o.dkLen
140
- });
135
+ let newKey;
136
+ if (nativeScryptCrypto) {
137
+ newKey = await nativeScryptCrypto(
138
+ password,
139
+ newSalt,
140
+ o.N,
141
+ o.r,
142
+ o.p,
143
+ o.dkLen
144
+ );
145
+ } else {
146
+ newKey = await _scrypt.scryptAsync.call(void 0, password, newSalt, {
147
+ N: o.N,
148
+ r: o.r,
149
+ p: o.p,
150
+ dkLen: o.dkLen
151
+ });
152
+ }
141
153
  _chunkUAXWZN5Jjs.setCachedKey.call(void 0, hashedPassword, newSalt, newKey);
142
154
  return {
143
155
  key: newKey,
@@ -155,4 +167,4 @@ function createSHA256Hash(data) {
155
167
 
156
168
 
157
169
  exports.encryption_default = encryption_default; exports.createSHA256Hash = createSHA256Hash;
158
- //# sourceMappingURL=chunk-T3FNDVE3.js.map
170
+ //# sourceMappingURL=chunk-BKQE7DB5.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../src/controllers/user-storage/encryption/encryption.ts"],"names":[],"mappings":"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","sourcesContent":["import { gcm } from '@noble/ciphers/aes';\nimport { randomBytes } from '@noble/ciphers/webcrypto';\nimport { scryptAsync } from '@noble/hashes/scrypt';\nimport { sha256 } from '@noble/hashes/sha256';\nimport { utf8ToBytes, concatBytes, bytesToHex } from '@noble/hashes/utils';\n\nimport type { NativeScrypt } from '../UserStorageController';\nimport { getAnyCachedKey, getCachedKeyBySalt, setCachedKey } from './cache';\nimport { base64ToByteArray, byteArrayToBase64, bytesToUtf8 } from './utils';\n\nexport type EncryptedPayload = {\n // version\n v: '1';\n\n // key derivation function algorithm - scrypt\n t: 'scrypt';\n\n // data\n d: string;\n\n // encryption options - scrypt\n o: {\n // eslint-disable-next-line @typescript-eslint/naming-convention\n N: number;\n r: number;\n p: number;\n dkLen: number;\n };\n\n // Salt options\n saltLen: number;\n};\n\n// Nonce/Key Sizes\nconst ALGORITHM_NONCE_SIZE = 12; // 12 bytes\nconst ALGORITHM_KEY_SIZE = 16; // 16 bytes\n\n// Scrypt settings\n// see: https://cheatsheetseries.owasp.org/cheatsheets/Password_Storage_Cheat_Sheet.html#scrypt\nconst SCRYPT_SALT_SIZE = 16; // 16 bytes\nconst SCRYPT_N = 2 ** 17; // CPU/memory cost parameter (must be a power of 2, > 1)\n// eslint-disable-next-line @typescript-eslint/naming-convention\nconst SCRYPT_r = 8; // Block size parameter\n// eslint-disable-next-line @typescript-eslint/naming-convention\nconst SCRYPT_p = 1; // Parallelization parameter\n\nclass EncryptorDecryptor {\n async encryptString(\n plaintext: string,\n password: string,\n nativeScryptCrypto?: NativeScrypt,\n ): Promise<string> {\n try {\n return await this.#encryptStringV1(\n plaintext,\n password,\n nativeScryptCrypto,\n );\n } catch (e) {\n const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);\n throw new Error(`Unable to encrypt string - ${errorMessage}`);\n }\n }\n\n async decryptString(\n encryptedDataStr: string,\n password: string,\n nativeScryptCrypto?: NativeScrypt,\n ): Promise<string> {\n try {\n const encryptedData: EncryptedPayload = JSON.parse(encryptedDataStr);\n if (encryptedData.v === '1') {\n if (encryptedData.t === 'scrypt') {\n return await this.#decryptStringV1(\n encryptedData,\n password,\n nativeScryptCrypto,\n );\n }\n }\n throw new Error(\n `Unsupported encrypted data payload - ${encryptedDataStr}`,\n );\n } catch (e) {\n const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);\n throw new Error(`Unable to decrypt string - ${errorMessage}`);\n }\n }\n\n async #encryptStringV1(\n plaintext: string,\n password: string,\n nativeScryptCrypto?: NativeScrypt,\n ): Promise<string> {\n const { key, salt } = await this.#getOrGenerateScryptKey(\n password,\n {\n N: SCRYPT_N,\n r: SCRYPT_r,\n p: SCRYPT_p,\n dkLen: ALGORITHM_KEY_SIZE,\n },\n randomBytes(SCRYPT_SALT_SIZE),\n nativeScryptCrypto,\n );\n\n // Encrypt and prepend salt.\n const plaintextRaw = utf8ToBytes(plaintext);\n const ciphertextAndNonceAndSalt = concatBytes(\n salt,\n this.#encrypt(plaintextRaw, key),\n );\n\n // Convert to Base64\n const encryptedData = byteArrayToBase64(ciphertextAndNonceAndSalt);\n\n const encryptedPayload: EncryptedPayload = {\n v: '1',\n t: 'scrypt',\n d: encryptedData,\n o: {\n N: SCRYPT_N,\n r: SCRYPT_r,\n p: SCRYPT_p,\n dkLen: ALGORITHM_KEY_SIZE,\n },\n saltLen: SCRYPT_SALT_SIZE,\n };\n\n return JSON.stringify(encryptedPayload);\n }\n\n async #decryptStringV1(\n data: EncryptedPayload,\n password: string,\n nativeScryptCrypto?: NativeScrypt,\n ): Promise<string> {\n const { o, d: base64CiphertextAndNonceAndSalt, saltLen } = data;\n\n // Decode the base64.\n const ciphertextAndNonceAndSalt = base64ToByteArray(\n base64CiphertextAndNonceAndSalt,\n );\n\n // Create buffers of salt and ciphertextAndNonce.\n const salt = ciphertextAndNonceAndSalt.slice(0, saltLen);\n const ciphertextAndNonce = ciphertextAndNonceAndSalt.slice(\n saltLen,\n ciphertextAndNonceAndSalt.length,\n );\n\n // Derive the key.\n const { key } = await this.#getOrGenerateScryptKey(\n password,\n {\n N: o.N,\n r: o.r,\n p: o.p,\n dkLen: o.dkLen,\n },\n salt,\n nativeScryptCrypto,\n );\n\n // Decrypt and return result.\n return bytesToUtf8(this.#decrypt(ciphertextAndNonce, key));\n }\n\n #encrypt(plaintext: Uint8Array, key: Uint8Array): Uint8Array {\n const nonce = randomBytes(ALGORITHM_NONCE_SIZE);\n\n // Encrypt and prepend nonce.\n const ciphertext = gcm(key, nonce).encrypt(plaintext);\n\n return concatBytes(nonce, ciphertext);\n }\n\n #decrypt(ciphertextAndNonce: Uint8Array, key: Uint8Array): Uint8Array {\n // Create buffers of nonce and ciphertext.\n const nonce = ciphertextAndNonce.slice(0, ALGORITHM_NONCE_SIZE);\n const ciphertext = ciphertextAndNonce.slice(\n ALGORITHM_NONCE_SIZE,\n ciphertextAndNonce.length,\n );\n\n // Decrypt and return result.\n return gcm(key, nonce).decrypt(ciphertext);\n }\n\n async #getOrGenerateScryptKey(\n password: string,\n o: EncryptedPayload['o'],\n salt?: Uint8Array,\n nativeScryptCrypto?: NativeScrypt,\n ) {\n const hashedPassword = createSHA256Hash(password);\n const cachedKey = salt\n ? getCachedKeyBySalt(hashedPassword, salt)\n : getAnyCachedKey(hashedPassword);\n\n if (cachedKey) {\n return {\n key: cachedKey.key,\n salt: cachedKey.salt,\n };\n }\n\n const newSalt = salt ?? randomBytes(SCRYPT_SALT_SIZE);\n\n let newKey: Uint8Array;\n\n if (nativeScryptCrypto) {\n newKey = await nativeScryptCrypto(\n password,\n newSalt,\n o.N,\n o.r,\n o.p,\n o.dkLen,\n );\n } else {\n newKey = await scryptAsync(password, newSalt, {\n N: o.N,\n r: o.r,\n p: o.p,\n dkLen: o.dkLen,\n });\n }\n setCachedKey(hashedPassword, newSalt, newKey);\n\n return {\n key: newKey,\n salt: newSalt,\n };\n }\n}\n\nconst encryption = new EncryptorDecryptor();\nexport default encryption;\n\n/**\n * Receive a SHA256 hash from a given string\n * @param data - input\n * @returns sha256 hash\n */\nexport function createSHA256Hash(data: string): string {\n const hashedData = sha256(data);\n return bytesToHex(hashedData);\n}\n"]}
@@ -16,7 +16,7 @@ import {
16
16
  // src/controllers/user-storage/encryption/encryption.ts
17
17
  import { gcm } from "@noble/ciphers/aes";
18
18
  import { randomBytes } from "@noble/ciphers/webcrypto";
19
- import { scrypt } from "@noble/hashes/scrypt";
19
+ import { scryptAsync } from "@noble/hashes/scrypt";
20
20
  import { sha256 } from "@noble/hashes/sha256";
21
21
  import { utf8ToBytes, concatBytes, bytesToHex } from "@noble/hashes/utils";
22
22
  var ALGORITHM_NONCE_SIZE = 12;
@@ -34,20 +34,20 @@ var EncryptorDecryptor = class {
34
34
  __privateAdd(this, _decrypt);
35
35
  __privateAdd(this, _getOrGenerateScryptKey);
36
36
  }
37
- encryptString(plaintext, password) {
37
+ async encryptString(plaintext, password, nativeScryptCrypto) {
38
38
  try {
39
- return __privateMethod(this, _encryptStringV1, encryptStringV1_fn).call(this, plaintext, password);
39
+ return await __privateMethod(this, _encryptStringV1, encryptStringV1_fn).call(this, plaintext, password, nativeScryptCrypto);
40
40
  } catch (e) {
41
41
  const errorMessage = e instanceof Error ? e.message : JSON.stringify(e);
42
42
  throw new Error(`Unable to encrypt string - ${errorMessage}`);
43
43
  }
44
44
  }
45
- decryptString(encryptedDataStr, password) {
45
+ async decryptString(encryptedDataStr, password, nativeScryptCrypto) {
46
46
  try {
47
47
  const encryptedData = JSON.parse(encryptedDataStr);
48
48
  if (encryptedData.v === "1") {
49
49
  if (encryptedData.t === "scrypt") {
50
- return __privateMethod(this, _decryptStringV1, decryptStringV1_fn).call(this, encryptedData, password);
50
+ return await __privateMethod(this, _decryptStringV1, decryptStringV1_fn).call(this, encryptedData, password, nativeScryptCrypto);
51
51
  }
52
52
  }
53
53
  throw new Error(
@@ -60,13 +60,13 @@ var EncryptorDecryptor = class {
60
60
  }
61
61
  };
62
62
  _encryptStringV1 = new WeakSet();
63
- encryptStringV1_fn = function(plaintext, password) {
64
- const { key, salt } = __privateMethod(this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
63
+ encryptStringV1_fn = async function(plaintext, password, nativeScryptCrypto) {
64
+ const { key, salt } = await __privateMethod(this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
65
65
  N: SCRYPT_N,
66
66
  r: SCRYPT_r,
67
67
  p: SCRYPT_p,
68
68
  dkLen: ALGORITHM_KEY_SIZE
69
- });
69
+ }, randomBytes(SCRYPT_SALT_SIZE), nativeScryptCrypto);
70
70
  const plaintextRaw = utf8ToBytes(plaintext);
71
71
  const ciphertextAndNonceAndSalt = concatBytes(
72
72
  salt,
@@ -88,7 +88,7 @@ encryptStringV1_fn = function(plaintext, password) {
88
88
  return JSON.stringify(encryptedPayload);
89
89
  };
90
90
  _decryptStringV1 = new WeakSet();
91
- decryptStringV1_fn = function(data, password) {
91
+ decryptStringV1_fn = async function(data, password, nativeScryptCrypto) {
92
92
  const { o, d: base64CiphertextAndNonceAndSalt, saltLen } = data;
93
93
  const ciphertextAndNonceAndSalt = base64ToByteArray(
94
94
  base64CiphertextAndNonceAndSalt
@@ -98,12 +98,12 @@ decryptStringV1_fn = function(data, password) {
98
98
  saltLen,
99
99
  ciphertextAndNonceAndSalt.length
100
100
  );
101
- const { key } = __privateMethod(this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
101
+ const { key } = await __privateMethod(this, _getOrGenerateScryptKey, getOrGenerateScryptKey_fn).call(this, password, {
102
102
  N: o.N,
103
103
  r: o.r,
104
104
  p: o.p,
105
105
  dkLen: o.dkLen
106
- }, salt);
106
+ }, salt, nativeScryptCrypto);
107
107
  return bytesToUtf8(__privateMethod(this, _decrypt, decrypt_fn).call(this, ciphertextAndNonce, key));
108
108
  };
109
109
  _encrypt = new WeakSet();
@@ -122,7 +122,7 @@ decrypt_fn = function(ciphertextAndNonce, key) {
122
122
  return gcm(key, nonce).decrypt(ciphertext);
123
123
  };
124
124
  _getOrGenerateScryptKey = new WeakSet();
125
- getOrGenerateScryptKey_fn = function(password, o, salt) {
125
+ getOrGenerateScryptKey_fn = async function(password, o, salt, nativeScryptCrypto) {
126
126
  const hashedPassword = createSHA256Hash(password);
127
127
  const cachedKey = salt ? getCachedKeyBySalt(hashedPassword, salt) : getAnyCachedKey(hashedPassword);
128
128
  if (cachedKey) {
@@ -132,12 +132,24 @@ getOrGenerateScryptKey_fn = function(password, o, salt) {
132
132
  };
133
133
  }
134
134
  const newSalt = salt ?? randomBytes(SCRYPT_SALT_SIZE);
135
- const newKey = scrypt(password, newSalt, {
136
- N: o.N,
137
- r: o.r,
138
- p: o.p,
139
- dkLen: o.dkLen
140
- });
135
+ let newKey;
136
+ if (nativeScryptCrypto) {
137
+ newKey = await nativeScryptCrypto(
138
+ password,
139
+ newSalt,
140
+ o.N,
141
+ o.r,
142
+ o.p,
143
+ o.dkLen
144
+ );
145
+ } else {
146
+ newKey = await scryptAsync(password, newSalt, {
147
+ N: o.N,
148
+ r: o.r,
149
+ p: o.p,
150
+ dkLen: o.dkLen
151
+ });
152
+ }
141
153
  setCachedKey(hashedPassword, newSalt, newKey);
142
154
  return {
143
155
  key: newKey,
@@ -155,4 +167,4 @@ export {
155
167
  encryption_default,
156
168
  createSHA256Hash
157
169
  };
158
- //# sourceMappingURL=chunk-K5UKU454.mjs.map
170
+ //# sourceMappingURL=chunk-COBJUBZE.mjs.map