@bitwarden/sdk-internal 0.2.0-main.408 → 0.2.0-main.409

package/node/bitwarden_wasm_internal.d.ts

@@ -383,19 +383,12 @@ export interface InitUserCryptoRequest {
    */
   email: string;
   /**
-   * The user\'s encrypted private key
+   * The user\'s account cryptographic state, containing their signature and
+   * public-key-encryption keys, along with the signed security state, protected by the user key
    */
-  privateKey: EncString;
-  /**
-   * The user\'s signing key
-   */
-  signingKey: EncString | undefined;
+  accountCryptographicState: WrappedAccountCryptographicState;
   /**
-   * The user\'s security state
-   */
-  securityState: SignedSecurityState | undefined;
-  /**
-   * The initialization method to use
+   * The method to decrypt the user\'s account symmetric key (user key)
    */
   method: InitUserCryptoMethod;
 }
@@ -674,6 +667,36 @@ export interface CryptoClientError extends Error {
 
 export function isCryptoClientError(error: any): error is CryptoClientError;
 
+/**
+ * Any keys / cryptographic protection \"downstream\" from the account symmetric key (user key).
+ * Private keys are protected by the user key.
+ */
+export type WrappedAccountCryptographicState =
+  | { V1: { private_key: EncString } }
+  | {
+      V2: {
+        private_key: EncString;
+        signed_public_key: SignedPublicKey | undefined;
+        signing_key: EncString;
+        security_state: SignedSecurityState;
+      };
+    };
+
+export interface AccountCryptographyInitializationError extends Error {
+  name: "AccountCryptographyInitializationError";
+  variant:
+    | "WrongUserKeyType"
+    | "WrongUserKey"
+    | "CorruptData"
+    | "TamperedData"
+    | "KeyStoreAlreadyInitialized"
+    | "GenericCrypto";
+}
+
+export function isAccountCryptographyInitializationError(
+  error: any,
+): error is AccountCryptographyInitializationError;
+
 export interface StatefulCryptoError extends Error {
   name: "StatefulCryptoError";
   variant: "MissingSecurityState" | "WrongAccountCryptoVersion" | "Crypto";
@@ -685,9 +708,7 @@ export interface EncryptionSettingsError extends Error {
   name: "EncryptionSettingsError";
   variant:
     | "Crypto"
-    | "InvalidPrivateKey"
-    | "InvalidSigningKey"
-    | "InvalidSecurityState"
+    | "CryptoInitialization"
     | "MissingPrivateKey"
     | "UserIdAlreadySet"
     | "WrongPin";
@@ -804,6 +825,7 @@ export interface CryptoError extends Error {
     | "MissingKeyId"
     | "KeyOperationNotSupported"
     | "ReadOnlyKeyStore"
+    | "InvalidKeyStoreOperation"
     | "InsufficientKdfParameters"
     | "EncString"
     | "Rsa"

package/node/bitwarden_wasm_internal.js

@@ -412,6 +412,19 @@ exports.isCryptoClientError = function (error) {
   }
 };
 
+/**
+ * @param {any} error
+ * @returns {boolean}
+ */
+exports.isAccountCryptographyInitializationError = function (error) {
+  try {
+    const ret = wasm.isAccountCryptographyInitializationError(addBorrowedObject(error));
+    return ret !== 0;
+  } finally {
+    heap[stack_pointer++] = undefined;
+  }
+};
+
 /**
  * @param {any} error
  * @returns {boolean}
@@ -4628,7 +4641,7 @@ exports.__wbg_call_e762c39fa8ea36bf = function () {
   }, arguments);
 };
 
-exports.__wbg_cipher_f62bf70f044b3d45 = function (arg0) {
+exports.__wbg_cipher_36ca200ffa394aff = function (arg0) {
   const ret = getObject(arg0).cipher;
   return isLikeNone(ret) ? 0 : addHeapObject(ret);
 };
@@ -4721,7 +4734,7 @@ exports.__wbg_fetch_f8ba0e29a9d6de0d = function (arg0, arg1) {
   return addHeapObject(ret);
 };
 
-exports.__wbg_folder_b2647abe8ccaa979 = function (arg0) {
+exports.__wbg_folder_3c40ff563bebbf4d = function (arg0) {
   const ret = getObject(arg0).folder;
   return isLikeNone(ret) ? 0 : addHeapObject(ret);
 };
@@ -4754,7 +4767,7 @@ exports.__wbg_getTime_14776bfb48a1bff9 = function (arg0) {
   return ret;
 };
 
-exports.__wbg_get_4e3650385d7407c5 = function () {
+exports.__wbg_get_7b829f8c26f7c83d = function () {
   return handleError(function (arg0, arg1, arg2) {
     let deferred0_0;
     let deferred0_1;
@@ -4769,7 +4782,12 @@ exports.__wbg_get_4e3650385d7407c5 = function () {
   }, arguments);
 };
 
-exports.__wbg_get_5d348cd2322d9dcb = function () {
+exports.__wbg_get_7bed016f185add81 = function (arg0, arg1) {
+  const ret = getObject(arg0)[arg1 >>> 0];
+  return addHeapObject(ret);
+};
+
+exports.__wbg_get_89216faf00e53685 = function () {
   return handleError(function (arg0, arg1, arg2) {
     let deferred0_0;
     let deferred0_1;
@@ -4784,12 +4802,7 @@ exports.__wbg_get_5d348cd2322d9dcb = function () {
   }, arguments);
 };
 
-exports.__wbg_get_7bed016f185add81 = function (arg0, arg1) {
-  const ret = getObject(arg0)[arg1 >>> 0];
-  return addHeapObject(ret);
-};
-
-exports.__wbg_get_access_token_e1ae00959dff169c = function (arg0) {
+exports.__wbg_get_access_token_7d219bb95b728b99 = function (arg0) {
   const ret = getObject(arg0).get_access_token();
   return addHeapObject(ret);
 };
@@ -4985,14 +4998,14 @@ exports.__wbg_length_cdd215e10d9dd507 = function (arg0) {
   return ret;
 };
 
-exports.__wbg_list_aadb272449db21e8 = function () {
+exports.__wbg_list_144ee93b8ba81d02 = function () {
   return handleError(function (arg0) {
     const ret = getObject(arg0).list();
     return addHeapObject(ret);
   }, arguments);
 };
 
-exports.__wbg_list_e4838ffa85142db1 = function () {
+exports.__wbg_list_239cef5c115c1faa = function () {
   return handleError(function (arg0) {
     const ret = getObject(arg0).list();
     return addHeapObject(ret);
@@ -5236,7 +5249,7 @@ exports.__wbg_randomFillSync_ac0988aba3254290 = function () {
   }, arguments);
 };
 
-exports.__wbg_remove_1dda6b5d117a41ab = function () {
+exports.__wbg_remove_10cb42bbbe564282 = function () {
   return handleError(function (arg0, arg1, arg2) {
     let deferred0_0;
     let deferred0_1;
@@ -5251,7 +5264,7 @@ exports.__wbg_remove_1dda6b5d117a41ab = function () {
   }, arguments);
 };
 
-exports.__wbg_remove_953de1641e4a5d83 = function () {
+exports.__wbg_remove_d480594d8d8e87d8 = function () {
   return handleError(function (arg0, arg1, arg2) {
     let deferred0_0;
     let deferred0_1;
@@ -5297,11 +5310,22 @@ exports.__wbg_setTimeout_ca12ead8b48245e2 = function (arg0, arg1) {
   return addHeapObject(ret);
 };
 
-exports.__wbg_set_3f1d0b984ed272ed = function (arg0, arg1, arg2) {
-  getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+exports.__wbg_set_115f150f30a697ce = function () {
+  return handleError(function (arg0, arg1, arg2, arg3) {
+    let deferred0_0;
+    let deferred0_1;
+    try {
+      deferred0_0 = arg1;
+      deferred0_1 = arg2;
+      const ret = getObject(arg0).set(getStringFromWasm0(arg1, arg2), takeObject(arg3));
+      return addHeapObject(ret);
+    } finally {
+      wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
+    }
+  }, arguments);
 };
 
-exports.__wbg_set_8f4bd39d6e8b06c1 = function () {
+exports.__wbg_set_117bcb0d1fb51da5 = function () {
   return handleError(function (arg0, arg1, arg2, arg3) {
     let deferred0_0;
     let deferred0_1;
@@ -5316,6 +5340,10 @@ exports.__wbg_set_8f4bd39d6e8b06c1 = function () {
   }, arguments);
 };
 
+exports.__wbg_set_3f1d0b984ed272ed = function (arg0, arg1, arg2) {
+  getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
+};
+
 exports.__wbg_set_907fb406c34a251d = function (arg0, arg1, arg2) {
   const ret = getObject(arg0).set(getObject(arg1), getObject(arg2));
   return addHeapObject(ret);
@@ -5336,21 +5364,6 @@ exports.__wbg_set_c2abbebe8b9ebee1 = function () {
   }, arguments);
 };
 
-exports.__wbg_set_c9a17952625c1485 = function () {
-  return handleError(function (arg0, arg1, arg2, arg3) {
-    let deferred0_0;
-    let deferred0_1;
-    try {
-      deferred0_0 = arg1;
-      deferred0_1 = arg2;
-      const ret = getObject(arg0).set(getStringFromWasm0(arg1, arg2), takeObject(arg3));
-      return addHeapObject(ret);
-    } finally {
-      wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
-    }
-  }, arguments);
-};
-
 exports.__wbg_set_credentials_f621cd2d85c0c228 = function (arg0, arg1) {
   getObject(arg0).credentials = __wbindgen_enum_RequestCredentials[arg1];
 };

package/node/bitwarden_wasm_internal_bg.wasm.d.ts

@@ -233,6 +233,7 @@ export const isMasterPasswordError: (a: number) => number;
 export const isDeriveKeyConnectorError: (a: number) => number;
 export const isEnrollAdminPasswordResetError: (a: number) => number;
 export const isCryptoClientError: (a: number) => number;
+export const isAccountCryptographyInitializationError: (a: number) => number;
 export const isStatefulCryptoError: (a: number) => number;
 export const isEncryptionSettingsError: (a: number) => number;
 export const isCryptoError: (a: number) => number;
@@ -460,13 +461,13 @@ export const wasm_bindgen__convert__closures_____invoke__h5c75b123e343f7aa: (
   c: number,
 ) => void;
 export const wasm_bindgen__closure__destroy__h09d4e676b918dc23: (a: number, b: number) => void;
-export const wasm_bindgen__closure__destroy__hfcb631b72e5e985c: (a: number, b: number) => void;
 export const wasm_bindgen__convert__closures_____invoke__hb20fdca52a2a2cdf: (
   a: number,
   b: number,
   c: number,
   d: number,
 ) => void;
+export const wasm_bindgen__closure__destroy__hfcb631b72e5e985c: (a: number, b: number) => void;
 export const wasm_bindgen__convert__closures_____invoke__h43dfd80678632d6f: (
   a: number,
   b: number,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/sdk-internal",
-  "version": "0.2.0-main.408",
+  "version": "0.2.0-main.409",
   "license": "GPL-3.0",
   "repository": {
     "type": "git",