@bitwarden/sdk-internal 0.2.0-main.424 → 0.2.0-main.426

package/node/bitwarden_wasm_internal.d.ts

@@ -1,16 +1,5 @@
 /* tslint:disable */
 /* eslint-disable */
-/**
- * Generate a new SSH key pair
- *
- * # Arguments
- * - `key_algorithm` - The algorithm to use for the key pair
- *
- * # Returns
- * - `Ok(SshKey)` if the key was successfully generated
- * - `Err(KeyGenerationError)` if the key could not be generated
- */
-export function generate_ssh_key(key_algorithm: KeyAlgorithm): SshKeyView;
 /**
  * Convert a PCKS8 or OpenSSH encrypted or unencrypted private key
  * to an OpenSSH private key with public key and fingerprint
@@ -27,6 +16,17 @@ export function generate_ssh_key(key_algorithm: KeyAlgorithm): SshKeyView;
  * - `Err(UnsupportedKeyType)` if the key type is not supported
  */
 export function import_ssh_key(imported_key: string, password?: string | null): SshKeyView;
+/**
+ * Generate a new SSH key pair
+ *
+ * # Arguments
+ * - `key_algorithm` - The algorithm to use for the key pair
+ *
+ * # Returns
+ * - `Ok(SshKey)` if the key was successfully generated
+ * - `Err(KeyGenerationError)` if the key could not be generated
+ */
+export function generate_ssh_key(key_algorithm: KeyAlgorithm): SshKeyView;
 export function init_sdk(log_level?: LogLevel | null): void;
 /**
  * Sends a DiscoverRequest to the specified destination and returns the response.
@@ -180,43 +180,55 @@ export interface TokenProvider {
   get_access_token(): Promise<string | undefined>;
 }
 
-/**
- * Active feature flags for the SDK.
- */
-export interface FeatureFlags extends Map<string, boolean> {}
-
 export interface Repositories {
   cipher: Repository<Cipher> | null;
   folder: Repository<Folder> | null;
 }
 
+/**
+ * Active feature flags for the SDK.
+ */
+export interface FeatureFlags extends Map<string, boolean> {}
+
 export interface IndexedDbConfiguration {
   db_name: string;
 }
 
 /**
- * Credentials for getting a send access token using an email and OTP.
+ * Credentials for sending an OTP to the user\'s email address.
+ * This is used when the send requires email verification with an OTP.
  */
-export interface SendEmailOtpCredentials {
+export interface SendEmailCredentials {
   /**
    * The email address to which the OTP will be sent.
    */
   email: string;
+}
+
+/**
+ * Credentials for sending password secured access requests.
+ * Clone auto implements the standard lib\'s Clone trait, allowing us to create copies of this
+ * struct.
+ */
+export interface SendPasswordCredentials {
   /**
-   * The one-time password (OTP) that the user has received via email.
+   * A Base64-encoded hash of the password protecting the send.
    */
-  otp: string;
+  passwordHashB64: string;
 }
 
 /**
- * Credentials for sending an OTP to the user\'s email address.
- * This is used when the send requires email verification with an OTP.
+ * Credentials for getting a send access token using an email and OTP.
  */
-export interface SendEmailCredentials {
+export interface SendEmailOtpCredentials {
   /**
    * The email address to which the OTP will be sent.
    */
   email: string;
+  /**
+   * The one-time password (OTP) that the user has received via email.
+   */
+  otp: string;
 }
 
 /**
@@ -233,18 +245,6 @@ export interface SendAccessTokenRequest {
   sendAccessCredentials?: SendAccessCredentials;
 }
 
-/**
- * Credentials for sending password secured access requests.
- * Clone auto implements the standard lib\'s Clone trait, allowing us to create copies of this
- * struct.
- */
-export interface SendPasswordCredentials {
-  /**
-   * A Base64-encoded hash of the password protecting the send.
-   */
-  passwordHashB64: string;
-}
-
 /**
  * The credentials used for send access requests.
  */
@@ -253,16 +253,6 @@ export type SendAccessCredentials =
   | SendEmailOtpCredentials
   | SendEmailCredentials;
 
-/**
- * Any unexpected error that occurs when making requests to identity. This could be
- * local/transport/decoding failure from the HTTP client (DNS/TLS/connect/read timeout,
- * connection reset, or JSON decode failure on a success response) or non-2xx response with an
- * unexpected body or status. Used when decoding the server\'s error payload into
- * `SendAccessTokenApiErrorResponse` fails, or for 5xx responses where no structured error is
- * available.
- */
-export type UnexpectedIdentityError = string;
-
 /**
  * A send access token which can be used to access a send.
  */
@@ -286,15 +276,14 @@ export type SendAccessTokenError =
   | { kind: "expected"; data: SendAccessTokenApiErrorResponse };
 
 /**
- * Invalid grant errors - typically due to invalid credentials.
+ * Any unexpected error that occurs when making requests to identity. This could be
+ * local/transport/decoding failure from the HTTP client (DNS/TLS/connect/read timeout,
+ * connection reset, or JSON decode failure on a success response) or non-2xx response with an
+ * unexpected body or status. Used when decoding the server\'s error payload into
+ * `SendAccessTokenApiErrorResponse` fails, or for 5xx responses where no structured error is
+ * available.
  */
-export type SendAccessTokenInvalidGrantError =
-  | "send_id_invalid"
-  | "password_hash_b64_invalid"
-  | "email_invalid"
-  | "otp_invalid"
-  | "otp_generation_failed"
-  | "unknown";
+export type UnexpectedIdentityError = string;
 
 /**
  * Invalid request errors - typically due to missing parameters.
@@ -327,9 +316,15 @@ export type SendAccessTokenApiErrorResponse =
   | { error: "invalid_target"; error_description?: string };
 
 /**
- * Type of collection
+ * Invalid grant errors - typically due to invalid credentials.
  */
-export type CollectionType = "SharedCollection" | "DefaultUserCollection";
+export type SendAccessTokenInvalidGrantError =
+  | "send_id_invalid"
+  | "password_hash_b64_invalid"
+  | "email_invalid"
+  | "otp_invalid"
+  | "otp_generation_failed"
+  | "unknown";
 
 export interface CollectionView {
   id: CollectionId | undefined;
@@ -354,6 +349,11 @@ export interface Collection {
   type: CollectionType;
 }
 
+/**
+ * Type of collection
+ */
+export type CollectionType = "SharedCollection" | "DefaultUserCollection";
+
 /**
  * NewType wrapper for `CollectionId`
  */
@@ -368,18 +368,6 @@ export function isCollectionDecryptError(error: any): error is CollectionDecrypt
 
 export type SignedSecurityState = string;
 
-export interface MasterPasswordError extends Error {
-  name: "MasterPasswordError";
-  variant:
-    | "EncryptionKeyMalformed"
-    | "KdfMalformed"
-    | "InvalidKdfConfiguration"
-    | "MissingField"
-    | "Crypto";
-}
-
-export function isMasterPasswordError(error: any): error is MasterPasswordError;
-
 /**
  * Represents the data required to unlock with the master password.
  */
@@ -398,6 +386,18 @@ export interface MasterPasswordUnlockData {
   salt: string;
 }
 
+export interface MasterPasswordError extends Error {
+  name: "MasterPasswordError";
+  variant:
+    | "EncryptionKeyMalformed"
+    | "KdfMalformed"
+    | "InvalidKdfConfiguration"
+    | "MissingField"
+    | "Crypto";
+}
+
+export function isMasterPasswordError(error: any): error is MasterPasswordError;
+
 /**
  * Represents the data required to authenticate with the master password.
  */
@@ -444,51 +444,19 @@ export interface CryptoClientError extends Error {
 
 export function isCryptoClientError(error: any): error is CryptoClientError;
 
-/**
- * Response for `verify_asymmetric_keys`.
- */
-export interface VerifyAsymmetricKeysResponse {
-  /**
-   * Whether the user\'s private key was decryptable by the user key.
-   */
-  privateKeyDecryptable: boolean;
-  /**
-   * Whether the user\'s private key was a valid RSA key and matched the public key provided.
-   */
-  validPrivateKey: boolean;
+export interface EnrollAdminPasswordResetError extends Error {
+  name: "EnrollAdminPasswordResetError";
+  variant: "Crypto";
 }
 
-/**
- * Request for deriving a pin protected user key
- */
-export interface EnrollPinResponse {
-  /**
-   * [UserKey] protected by PIN
-   */
-  pinProtectedUserKeyEnvelope: PasswordProtectedKeyEnvelope;
-  /**
-   * PIN protected by [UserKey]
-   */
-  userKeyEncryptedPin: EncString;
-}
+export function isEnrollAdminPasswordResetError(error: any): error is EnrollAdminPasswordResetError;
 
 /**
- * Request for `verify_asymmetric_keys`.
+ * Auth requests supports multiple initialization methods.
  */
-export interface VerifyAsymmetricKeysRequest {
-  /**
-   * The user\'s user key
-   */
-  userKey: B64;
-  /**
-   * The user\'s public key
-   */
-  userPublicKey: B64;
-  /**
-   * User\'s private key, encrypted with the user key
-   */
-  userKeyEncryptedPrivateKey: EncString;
-}
+export type AuthRequestMethod =
+  | { userKey: { protected_user_key: UnsignedSharedKey } }
+  | { masterKey: { protected_master_key: UnsignedSharedKey; auth_request_key: EncString } };
 
 /**
  * Represents the request to initialize the user\'s organizational cryptographic state.
@@ -500,20 +468,6 @@ export interface InitOrgCryptoRequest {
   organizationKeys: Map<OrganizationId, UnsignedSharedKey>;
 }
 
-/**
- * Response from the `make_update_password` function
- */
-export interface UpdatePasswordResponse {
-  /**
-   * Hash of the new password
-   */
-  passwordHash: B64;
-  /**
-   * User key, encrypted with the new password
-   */
-  newKey: EncString;
-}
-
 /**
  * The crypto method used to initialize the user cryptographic state.
  */
@@ -533,6 +487,59 @@ export type InitUserCryptoMethod =
     }
   | { keyConnector: { master_key: B64; user_key: EncString } };
 
+/**
+ * Response from the `make_update_password` function
+ */
+export interface UpdatePasswordResponse {
+  /**
+   * Hash of the new password
+   */
+  passwordHash: B64;
+  /**
+   * User key, encrypted with the new password
+   */
+  newKey: EncString;
+}
+
+/**
+ * Response from the `update_kdf` function
+ */
+export interface UpdateKdfResponse {
+  /**
+   * The authentication data for the new KDF setting
+   */
+  masterPasswordAuthenticationData: MasterPasswordAuthenticationData;
+  /**
+   * The unlock data for the new KDF setting
+   */
+  masterPasswordUnlockData: MasterPasswordUnlockData;
+  /**
+   * The authentication data for the KDF setting prior to the change
+   */
+  oldMasterPasswordAuthenticationData: MasterPasswordAuthenticationData;
+}
+
+export interface DeriveKeyConnectorError extends Error {
+  name: "DeriveKeyConnectorError";
+  variant: "WrongPassword" | "Crypto";
+}
+
+export function isDeriveKeyConnectorError(error: any): error is DeriveKeyConnectorError;
+
+/**
+ * Request for deriving a pin protected user key
+ */
+export interface EnrollPinResponse {
+  /**
+   * [UserKey] protected by PIN
+   */
+  pinProtectedUserKeyEnvelope: PasswordProtectedKeyEnvelope;
+  /**
+   * PIN protected by [UserKey]
+   */
+  userKeyEncryptedPin: EncString;
+}
+
 /**
  * Request for migrating an account from password to key connector.
  */
@@ -556,36 +563,13 @@ export interface DeriveKeyConnectorRequest {
 }
 
 /**
- * State used for initializing the user cryptographic state.
+ * Request for `verify_asymmetric_keys`.
  */
-export interface InitUserCryptoRequest {
+export interface VerifyAsymmetricKeysRequest {
   /**
-   * The user\'s ID.
+   * The user\'s user key
    */
-  userId: UserId | undefined;
-  /**
-   * The user\'s KDF parameters, as received from the prelogin request
-   */
-  kdfParams: Kdf;
-  /**
-   * The user\'s email address
-   */
-  email: string;
-  /**
-   * 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
-   */
-  accountCryptographicState: WrappedAccountCryptographicState;
-  /**
-   * The method to decrypt the user\'s account symmetric key (user key)
-   */
-  method: InitUserCryptoMethod;
-}
-
-/**
- * Response from the `make_key_pair` function
- */
-export interface MakeKeyPairResponse {
+  userKey: B64;
   /**
    * The user\'s public key
    */
@@ -597,42 +581,31 @@ export interface MakeKeyPairResponse {
 }
 
 /**
- * Auth requests supports multiple initialization methods.
+ * Response for `verify_asymmetric_keys`.
  */
-export type AuthRequestMethod =
-  | { userKey: { protected_user_key: UnsignedSharedKey } }
-  | { masterKey: { protected_master_key: UnsignedSharedKey; auth_request_key: EncString } };
-
-export interface DeriveKeyConnectorError extends Error {
-  name: "DeriveKeyConnectorError";
-  variant: "WrongPassword" | "Crypto";
-}
-
-export function isDeriveKeyConnectorError(error: any): error is DeriveKeyConnectorError;
-
-export interface EnrollAdminPasswordResetError extends Error {
-  name: "EnrollAdminPasswordResetError";
-  variant: "Crypto";
+export interface VerifyAsymmetricKeysResponse {
+  /**
+   * Whether the user\'s private key was decryptable by the user key.
+   */
+  privateKeyDecryptable: boolean;
+  /**
+   * Whether the user\'s private key was a valid RSA key and matched the public key provided.
+   */
+  validPrivateKey: boolean;
 }
 
-export function isEnrollAdminPasswordResetError(error: any): error is EnrollAdminPasswordResetError;
-
 /**
- * Response from the `update_kdf` function
+ * Request for deriving a pin protected user key
  */
-export interface UpdateKdfResponse {
-  /**
-   * The authentication data for the new KDF setting
-   */
-  masterPasswordAuthenticationData: MasterPasswordAuthenticationData;
+export interface DerivePinKeyResponse {
   /**
-   * The unlock data for the new KDF setting
+   * [UserKey] protected by PIN
    */
-  masterPasswordUnlockData: MasterPasswordUnlockData;
+  pinProtectedUserKey: EncString;
   /**
-   * The authentication data for the KDF setting prior to the change
+   * PIN protected by [UserKey]
    */
-  oldMasterPasswordAuthenticationData: MasterPasswordAuthenticationData;
+  encryptedPin: EncString;
 }
 
 /**
@@ -674,29 +647,56 @@ export interface UserCryptoV2KeysResponse {
 }
 
 /**
- * Request for deriving a pin protected user key
+ * State used for initializing the user cryptographic state.
  */
-export interface DerivePinKeyResponse {
+export interface InitUserCryptoRequest {
   /**
-   * [UserKey] protected by PIN
+   * The user\'s ID.
    */
-  pinProtectedUserKey: EncString;
+  userId: UserId | undefined;
   /**
-   * PIN protected by [UserKey]
+   * The user\'s KDF parameters, as received from the prelogin request
    */
-  encryptedPin: EncString;
+  kdfParams: Kdf;
+  /**
+   * The user\'s email address
+   */
+  email: string;
+  /**
+   * 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
+   */
+  accountCryptographicState: WrappedAccountCryptographicState;
+  /**
+   * The method to decrypt the user\'s account symmetric key (user key)
+   */
+  method: InitUserCryptoMethod;
 }
 
 /**
- * NewType wrapper for `OrganizationId`
+ * Response from the `make_key_pair` function
  */
-export type OrganizationId = Tagged<Uuid, "OrganizationId">;
+export interface MakeKeyPairResponse {
+  /**
+   * The user\'s public key
+   */
+  userPublicKey: B64;
+  /**
+   * User\'s private key, encrypted with the user key
+   */
+  userKeyEncryptedPrivateKey: EncString;
+}
 
 /**
  * NewType wrapper for `UserId`
  */
 export type UserId = Tagged<Uuid, "UserId">;
 
+/**
+ * NewType wrapper for `OrganizationId`
+ */
+export type OrganizationId = Tagged<Uuid, "OrganizationId">;
+
 export interface StatefulCryptoError extends Error {
   name: "StatefulCryptoError";
   variant: "MissingSecurityState" | "WrongAccountCryptoVersion" | "Crypto";
@@ -905,8 +905,6 @@ export interface ExportError extends Error {
 
 export function isExportError(error: any): error is ExportError;
 
-export type PassphraseError = { InvalidNumWords: { minimum: number; maximum: number } };
-
 /**
  * Passphrase generator request options.
  */
@@ -931,6 +929,8 @@ export interface PassphraseGeneratorRequest {
   includeNumber: boolean;
 }
 
+export type PassphraseError = { InvalidNumWords: { minimum: number; maximum: number } };
+
 export interface PasswordError extends Error {
   name: "PasswordError";
   variant: "NoCharacterSetEnabled" | "InvalidLength";
@@ -990,14 +990,21 @@ export interface PasswordGeneratorRequest {
   minSpecial: number | undefined;
 }
 
+export type AppendType = "random" | { websiteName: { website: string } };
+
+export interface UsernameError extends Error {
+  name: "UsernameError";
+  variant: "InvalidApiKey" | "Unknown" | "ResponseContent" | "Reqwest";
+}
+
+export function isUsernameError(error: any): error is UsernameError;
+
 export type UsernameGeneratorRequest =
   | { word: { capitalize: boolean; include_number: boolean } }
   | { subaddress: { type: AppendType; email: string } }
   | { catchall: { type: AppendType; domain: string } }
   | { forwarded: { service: ForwarderServiceType; website: string | undefined } };
 
-export type AppendType = "random" | { websiteName: { website: string } };
-
 /**
  * Configures the email forwarding service to use.
  * For instructions on how to configure each service, see the documentation:
@@ -1011,13 +1018,6 @@ export type ForwarderServiceType =
   | { forwardEmail: { api_token: string; domain: string } }
   | { simpleLogin: { api_key: string; base_url: string } };
 
-export interface UsernameError extends Error {
-  name: "UsernameError";
-  variant: "InvalidApiKey" | "Unknown" | "ResponseContent" | "Reqwest";
-}
-
-export function isUsernameError(error: any): error is UsernameError;
-
 export interface RequestError extends Error {
   name: "RequestError";
   variant: "Subscribe" | "Receive" | "Timeout" | "Send" | "Rpc";
@@ -1079,13 +1079,6 @@ export type Endpoint =
   | "DesktopRenderer"
   | "DesktopMain";
 
-export interface SshKeyExportError extends Error {
-  name: "SshKeyExportError";
-  variant: "KeyConversion";
-}
-
-export function isSshKeyExportError(error: any): error is SshKeyExportError;
-
 export interface KeyGenerationError extends Error {
   name: "KeyGenerationError";
   variant: "KeyGeneration" | "KeyConversion";
@@ -1093,6 +1086,13 @@ export interface KeyGenerationError extends Error {
 
 export function isKeyGenerationError(error: any): error is KeyGenerationError;
 
+export interface SshKeyExportError extends Error {
+  name: "SshKeyExportError";
+  variant: "KeyConversion";
+}
+
+export function isSshKeyExportError(error: any): error is SshKeyExportError;
+
 export interface SshKeyImportError extends Error {
   name: "SshKeyImportError";
   variant: "Parsing" | "PasswordRequired" | "WrongPassword" | "UnsupportedKeyType";
@@ -1129,6 +1129,33 @@ export interface CipherRiskError extends Error {
 
 export function isCipherRiskError(error: any): error is CipherRiskError;
 
+/**
+ * Risk evaluation result for a single cipher.
+ */
+export interface CipherRiskResult {
+  /**
+   * Cipher ID matching the input CipherLoginDetails.
+   */
+  id: CipherId;
+  /**
+   * Password strength score from 0 (weakest) to 4 (strongest).
+   * Calculated using zxcvbn with cipher-specific context.
+   */
+  password_strength: number;
+  /**
+   * Result of checking password exposure via HIBP API.
+   * - `NotChecked`: check_exposed was false, or password was empty
+   * - `Found(n)`: Successfully checked, found in n breaches
+   * - `Error(msg)`: HIBP API request failed for this cipher with the given error message
+   */
+  exposed_result: ExposedPasswordResult;
+  /**
+   * Number of times this password appears in the provided password_map.
+   * None if not found or if no password_map was provided.
+   */
+  reuse_count: number | undefined;
+}
+
 /**
  * Login cipher data needed for risk evaluation.
  */
@@ -1152,6 +1179,14 @@ export interface CipherLoginDetails {
  */
 export type PasswordReuseMap = Record<string, number>;
 
+/**
+ * Result of checking password exposure via HIBP API.
+ */
+export type ExposedPasswordResult =
+  | { type: "NotChecked" }
+  | { type: "Found"; value: number }
+  | { type: "Error"; value: string };
+
 /**
  * Options for configuring risk computation.
  */
@@ -1173,39 +1208,9 @@ export interface CipherRiskOptions {
   hibpBaseUrl?: string | undefined;
 }
 
-/**
- * Result of checking password exposure via HIBP API.
- */
-export type ExposedPasswordResult =
-  | { type: "NotChecked" }
-  | { type: "Found"; value: number }
-  | { type: "Error"; value: string };
-
-/**
- * Risk evaluation result for a single cipher.
- */
-export interface CipherRiskResult {
-  /**
-   * Cipher ID matching the input CipherLoginDetails.
-   */
-  id: CipherId;
-  /**
-   * Password strength score from 0 (weakest) to 4 (strongest).
-   * Calculated using zxcvbn with cipher-specific context.
-   */
-  password_strength: number;
-  /**
-   * Result of checking password exposure via HIBP API.
-   * - `NotChecked`: check_exposed was false, or password was empty
-   * - `Found(n)`: Successfully checked, found in n breaches
-   * - `Error(msg)`: HIBP API request failed for this cipher with the given error message
-   */
-  exposed_result: ExposedPasswordResult;
-  /**
-   * Number of times this password appears in the provided password_map.
-   * None if not found or if no password_map was provided.
-   */
-  reuse_count: number | undefined;
+export interface PasswordHistory {
+  password: EncString;
+  lastUsedDate: DateTime<Utc>;
 }
 
 export interface PasswordHistoryView {
@@ -1213,15 +1218,17 @@ export interface PasswordHistoryView {
   lastUsedDate: DateTime<Utc>;
 }
 
-export interface PasswordHistory {
-  password: EncString;
-  lastUsedDate: DateTime<Utc>;
-}
-
 export interface AncestorMap {
   ancestors: Map<CollectionId, string>;
 }
 
+export interface TotpError extends Error {
+  name: "TotpError";
+  variant: "InvalidOtpauth" | "MissingSecret" | "Crypto";
+}
+
+export function isTotpError(error: any): error is TotpError;
+
 export interface TotpResponse {
   /**
    * Generated TOTP code
@@ -1233,12 +1240,12 @@ export interface TotpResponse {
   period: number;
 }
 
-export interface TotpError extends Error {
-  name: "TotpError";
-  variant: "InvalidOtpauth" | "MissingSecret" | "Crypto";
+export interface DecryptError extends Error {
+  name: "DecryptError";
+  variant: "Crypto";
 }
 
-export function isTotpError(error: any): error is TotpError;
+export function isDecryptError(error: any): error is DecryptError;
 
 export interface EncryptError extends Error {
   name: "EncryptError";
@@ -1247,13 +1254,6 @@ export interface EncryptError extends Error {
 
 export function isEncryptError(error: any): error is EncryptError;
 
-export interface DecryptError extends Error {
-  name: "DecryptError";
-  variant: "Crypto";
-}
-
-export function isDecryptError(error: any): error is DecryptError;
-
 export interface AttachmentView {
   id: string | undefined;
   url: string | undefined;
@@ -1288,12 +1288,12 @@ export interface Attachment {
   key: EncString | undefined;
 }
 
-export interface LocalDataView {
+export interface LocalData {
   lastUsedDate: DateTime<Utc> | undefined;
   lastLaunched: DateTime<Utc> | undefined;
 }
 
-export interface LocalData {
+export interface LocalDataView {
   lastUsedDate: DateTime<Utc> | undefined;
   lastLaunched: DateTime<Utc> | undefined;
 }
@@ -1347,13 +1347,6 @@ export interface CipherEditRequest {
   key: EncString | undefined;
 }
 
-export interface CreateCipherError extends Error {
-  name: "CreateCipherError";
-  variant: "Crypto" | "Api" | "VaultParse" | "MissingField" | "NotAuthenticated" | "Repository";
-}
-
-export function isCreateCipherError(error: any): error is CreateCipherError;
-
 /**
  * Request to add a cipher.
  */
@@ -1368,7 +1361,14 @@ export interface CipherCreateRequest {
   fields: FieldView[];
 }
 
-/**
+export interface CreateCipherError extends Error {
+  name: "CreateCipherError";
+  variant: "Crypto" | "Api" | "VaultParse" | "MissingField" | "NotAuthenticated" | "Repository";
+}
+
+export function isCreateCipherError(error: any): error is CreateCipherError;
+
+/**
  * Represents the inner data of a cipher view.
  */
 export type CipherViewType =
@@ -1397,6 +1397,15 @@ export interface CipherPermissions {
   restore: boolean;
 }
 
+export interface CardView {
+  cardholderName: string | undefined;
+  expMonth: string | undefined;
+  expYear: string | undefined;
+  code: string | undefined;
+  brand: string | undefined;
+  number: string | undefined;
+}
+
 /**
  * Minimal CardView only including the needed details for list views
  */
@@ -1416,15 +1425,6 @@ export interface Card {
   number: EncString | undefined;
 }
 
-export interface CardView {
-  cardholderName: string | undefined;
-  expMonth: string | undefined;
-  expYear: string | undefined;
-  code: string | undefined;
-  brand: string | undefined;
-  number: string | undefined;
-}
-
 export interface Field {
   name: EncString | undefined;
   value: EncString | undefined;
@@ -1439,22 +1439,21 @@ export interface FieldView {
   linkedId: LinkedIdType | undefined;
 }
 
-export interface Login {
-  username: EncString | undefined;
-  password: EncString | undefined;
-  passwordRevisionDate: DateTime<Utc> | undefined;
-  uris: LoginUri[] | undefined;
-  totp: EncString | undefined;
-  autofillOnPageLoad: boolean | undefined;
-  fido2Credentials: Fido2Credential[] | undefined;
-}
-
 export interface LoginUri {
   uri: EncString | undefined;
   match: UriMatchType | undefined;
   uriChecksum: EncString | undefined;
 }
 
+export interface Fido2CredentialListView {
+  credentialId: string;
+  rpId: string;
+  userHandle: string | undefined;
+  userName: string | undefined;
+  userDisplayName: string | undefined;
+  counter: string;
+}
+
 export interface Fido2CredentialFullView {
   credentialId: string;
   keyType: string;
@@ -1471,6 +1470,12 @@ export interface Fido2CredentialFullView {
   creationDate: DateTime<Utc>;
 }
 
+export interface LoginUriView {
+  uri: string | undefined;
+  match: UriMatchType | undefined;
+  uriChecksum: string | undefined;
+}
+
 export interface LoginListView {
   fido2Credentials: Fido2CredentialListView[] | undefined;
   hasFido2: boolean;
@@ -1482,17 +1487,19 @@ export interface LoginListView {
   uris: LoginUriView[] | undefined;
 }
 
-export interface Fido2CredentialNewView {
+export interface Fido2CredentialView {
   credentialId: string;
   keyType: string;
   keyAlgorithm: string;
   keyCurve: string;
+  keyValue: EncString;
   rpId: string;
   userHandle: string | undefined;
   userName: string | undefined;
   counter: string;
   rpName: string | undefined;
   userDisplayName: string | undefined;
+  discoverable: string;
   creationDate: DateTime<Utc>;
 }
 
@@ -1506,19 +1513,28 @@ export interface LoginView {
   fido2Credentials: Fido2Credential[] | undefined;
 }
 
-export interface Fido2CredentialListView {
+export interface Fido2CredentialNewView {
   credentialId: string;
+  keyType: string;
+  keyAlgorithm: string;
+  keyCurve: string;
   rpId: string;
   userHandle: string | undefined;
   userName: string | undefined;
-  userDisplayName: string | undefined;
   counter: string;
+  rpName: string | undefined;
+  userDisplayName: string | undefined;
+  creationDate: DateTime<Utc>;
 }
 
-export interface LoginUriView {
-  uri: string | undefined;
-  match: UriMatchType | undefined;
-  uriChecksum: string | undefined;
+export interface Login {
+  username: EncString | undefined;
+  password: EncString | undefined;
+  passwordRevisionDate: DateTime<Utc> | undefined;
+  uris: LoginUri[] | undefined;
+  totp: EncString | undefined;
+  autofillOnPageLoad: boolean | undefined;
+  fido2Credentials: Fido2Credential[] | undefined;
 }
 
 export interface Fido2Credential {
@@ -1537,27 +1553,46 @@ export interface Fido2Credential {
   creationDate: DateTime<Utc>;
 }
 
-export interface Fido2CredentialView {
-  credentialId: string;
-  keyType: string;
-  keyAlgorithm: string;
-  keyCurve: string;
-  keyValue: EncString;
-  rpId: string;
-  userHandle: string | undefined;
-  userName: string | undefined;
-  counter: string;
-  rpName: string | undefined;
-  userDisplayName: string | undefined;
-  discoverable: string;
-  creationDate: DateTime<Utc>;
-}
-
 /**
  * NewType wrapper for `CipherId`
  */
 export type CipherId = Tagged<Uuid, "CipherId">;
 
+export interface Cipher {
+  id: CipherId | undefined;
+  organizationId: OrganizationId | undefined;
+  folderId: FolderId | undefined;
+  collectionIds: CollectionId[];
+  /**
+   * More recent ciphers uses individual encryption keys to encrypt the other fields of the
+   * Cipher.
+   */
+  key: EncString | undefined;
+  name: EncString;
+  notes: EncString | undefined;
+  type: CipherType;
+  login: Login | undefined;
+  identity: Identity | undefined;
+  card: Card | undefined;
+  secureNote: SecureNote | undefined;
+  sshKey: SshKey | undefined;
+  favorite: boolean;
+  reprompt: CipherRepromptType;
+  organizationUseTotp: boolean;
+  edit: boolean;
+  permissions: CipherPermissions | undefined;
+  viewPassword: boolean;
+  localData: LocalData | undefined;
+  attachments: Attachment[] | undefined;
+  fields: Field[] | undefined;
+  passwordHistory: PasswordHistory[] | undefined;
+  creationDate: DateTime<Utc>;
+  deletedDate: DateTime<Utc> | undefined;
+  revisionDate: DateTime<Utc>;
+  archivedDate: DateTime<Utc> | undefined;
+  data: string | undefined;
+}
+
 /**
  * Represents the result of decrypting a list of ciphers.
  *
@@ -1576,6 +1611,33 @@ export interface DecryptCipherListResult {
   failures: Cipher[];
 }
 
+export interface CipherError extends Error {
+  name: "CipherError";
+  variant:
+    | "MissingField"
+    | "Crypto"
+    | "Decrypt"
+    | "Encrypt"
+    | "AttachmentsWithoutKeys"
+    | "OrganizationAlreadySet"
+    | "PutShare"
+    | "PutShareMany"
+    | "Repository"
+    | "Chrono"
+    | "SerdeJson";
+}
+
+export function isCipherError(error: any): error is CipherError;
+
+export interface EncryptionContext {
+  /**
+   * The Id of the user that encrypted the cipher. It should always represent a UserId, even for
+   * Organization-owned ciphers
+   */
+  encryptedFor: UserId;
+  cipher: Cipher;
+}
+
 export type CipherListViewType =
   | { login: LoginListView }
   | "secureNote"
@@ -1620,22 +1682,6 @@ export interface CipherListView {
   localData: LocalDataView | undefined;
 }
 
-/**
- * Available fields on a cipher and can be copied from a the list view in the UI.
- */
-export type CopyableCipherFields =
-  | "LoginUsername"
-  | "LoginPassword"
-  | "LoginTotp"
-  | "CardNumber"
-  | "CardSecurityCode"
-  | "IdentityUsername"
-  | "IdentityEmail"
-  | "IdentityPhone"
-  | "IdentityAddress"
-  | "SshKey"
-  | "SecureNotes";
-
 export interface CipherView {
   id: CipherId | undefined;
   organizationId: OrganizationId | undefined;
@@ -1669,67 +1715,21 @@ export interface CipherView {
   archivedDate: DateTime<Utc> | undefined;
 }
 
-export interface EncryptionContext {
-  /**
-   * The Id of the user that encrypted the cipher. It should always represent a UserId, even for
-   * Organization-owned ciphers
-   */
-  encryptedFor: UserId;
-  cipher: Cipher;
-}
-
-export interface CipherError extends Error {
-  name: "CipherError";
-  variant:
-    | "MissingField"
-    | "Crypto"
-    | "Decrypt"
-    | "Encrypt"
-    | "AttachmentsWithoutKeys"
-    | "OrganizationAlreadySet"
-    | "PutShare"
-    | "PutShareMany"
-    | "Repository"
-    | "Chrono"
-    | "SerdeJson";
-}
-
-export function isCipherError(error: any): error is CipherError;
-
-export interface Cipher {
-  id: CipherId | undefined;
-  organizationId: OrganizationId | undefined;
-  folderId: FolderId | undefined;
-  collectionIds: CollectionId[];
-  /**
-   * More recent ciphers uses individual encryption keys to encrypt the other fields of the
-   * Cipher.
-   */
-  key: EncString | undefined;
-  name: EncString;
-  notes: EncString | undefined;
-  type: CipherType;
-  login: Login | undefined;
-  identity: Identity | undefined;
-  card: Card | undefined;
-  secureNote: SecureNote | undefined;
-  sshKey: SshKey | undefined;
-  favorite: boolean;
-  reprompt: CipherRepromptType;
-  organizationUseTotp: boolean;
-  edit: boolean;
-  permissions: CipherPermissions | undefined;
-  viewPassword: boolean;
-  localData: LocalData | undefined;
-  attachments: Attachment[] | undefined;
-  fields: Field[] | undefined;
-  passwordHistory: PasswordHistory[] | undefined;
-  creationDate: DateTime<Utc>;
-  deletedDate: DateTime<Utc> | undefined;
-  revisionDate: DateTime<Utc>;
-  archivedDate: DateTime<Utc> | undefined;
-  data: string | undefined;
-}
+/**
+ * Available fields on a cipher and can be copied from a the list view in the UI.
+ */
+export type CopyableCipherFields =
+  | "LoginUsername"
+  | "LoginPassword"
+  | "LoginTotp"
+  | "CardNumber"
+  | "CardSecurityCode"
+  | "IdentityUsername"
+  | "IdentityEmail"
+  | "IdentityPhone"
+  | "IdentityAddress"
+  | "SshKey"
+  | "SecureNotes";
 
 export interface SshKeyView {
   /**
@@ -1761,27 +1761,6 @@ export interface SshKey {
   fingerprint: EncString;
 }
 
-export interface Identity {
-  title: EncString | undefined;
-  firstName: EncString | undefined;
-  middleName: EncString | undefined;
-  lastName: EncString | undefined;
-  address1: EncString | undefined;
-  address2: EncString | undefined;
-  address3: EncString | undefined;
-  city: EncString | undefined;
-  state: EncString | undefined;
-  postalCode: EncString | undefined;
-  country: EncString | undefined;
-  company: EncString | undefined;
-  email: EncString | undefined;
-  phone: EncString | undefined;
-  ssn: EncString | undefined;
-  username: EncString | undefined;
-  passportNumber: EncString | undefined;
-  licenseNumber: EncString | undefined;
-}
-
 export interface IdentityView {
   title: string | undefined;
   firstName: string | undefined;
@@ -1803,8 +1782,35 @@ export interface IdentityView {
   licenseNumber: string | undefined;
 }
 
+export interface Identity {
+  title: EncString | undefined;
+  firstName: EncString | undefined;
+  middleName: EncString | undefined;
+  lastName: EncString | undefined;
+  address1: EncString | undefined;
+  address2: EncString | undefined;
+  address3: EncString | undefined;
+  city: EncString | undefined;
+  state: EncString | undefined;
+  postalCode: EncString | undefined;
+  country: EncString | undefined;
+  company: EncString | undefined;
+  email: EncString | undefined;
+  phone: EncString | undefined;
+  ssn: EncString | undefined;
+  username: EncString | undefined;
+  passportNumber: EncString | undefined;
+  licenseNumber: EncString | undefined;
+}
+
 export type LinkedIdType = LoginLinkedIdType | CardLinkedIdType | IdentityLinkedIdType;
 
+export interface FolderView {
+  id: FolderId | undefined;
+  name: string;
+  revisionDate: DateTime<Utc>;
+}
+
 export interface Folder {
   id: FolderId | undefined;
   name: EncString;
@@ -1816,12 +1822,6 @@ export interface Folder {
  */
 export type FolderId = Tagged<Uuid, "FolderId">;
 
-export interface FolderView {
-  id: FolderId | undefined;
-  name: string;
-  revisionDate: DateTime<Utc>;
-}
-
 export interface EditFolderError extends Error {
   name: "EditFolderError";
   variant: