@bitwarden/sdk-internal 0.2.0-main.500 → 0.2.0-main.502

package/bitwarden_wasm_internal.d.ts

@@ -180,32 +180,44 @@ export interface TokenProvider {
   get_access_token(): Promise<string | undefined>;
 }
 
-/**
- * Active feature flags for the SDK.
- */
-export interface FeatureFlags extends Map<string, boolean> {}
+export interface IndexedDbConfiguration {
+  db_name: string;
+}
 
 export interface Repositories {
   cipher: Repository<Cipher> | null;
   folder: Repository<Folder> | null;
 }
 
-export interface IndexedDbConfiguration {
-  db_name: string;
+/**
+ * Active feature flags for the SDK.
+ */
+export interface FeatureFlags extends Map<string, boolean> {}
+
+/**
+ * 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;
 }
 
 /**
- * Credentials for getting a send access token using an email and OTP.
+ * A request structure for requesting a send access token from the API.
  */
-export interface SendEmailOtpCredentials {
+export interface SendAccessTokenRequest {
   /**
-   * The email address to which the OTP will be sent.
+   * The id of the send for which the access token is requested.
    */
-  email: string;
+  sendId: string;
   /**
-   * The one-time password (OTP) that the user has received via email.
+   * The optional send access credentials.
    */
-  otp: string;
+  sendAccessCredentials?: SendAccessCredentials;
 }
 
 /**
@@ -228,29 +240,17 @@ export interface SendEmailCredentials {
 }
 
 /**
- * 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;
-}
-
-/**
- * A request structure for requesting a send access token from the API.
+ * Credentials for getting a send access token using an email and OTP.
  */
-export interface SendAccessTokenRequest {
+export interface SendEmailOtpCredentials {
   /**
-   * The id of the send for which the access token is requested.
+   * The email address to which the OTP will be sent.
    */
-  sendId: string;
+  email: string;
   /**
-   * The optional send access credentials.
+   * The one-time password (OTP) that the user has received via email.
    */
-  sendAccessCredentials?: SendAccessCredentials;
+  otp: string;
 }
 
 /**
@@ -285,27 +285,6 @@ export type SendAccessTokenError =
   | { kind: "unexpected"; data: UnexpectedIdentityError }
   | { kind: "expected"; data: SendAccessTokenApiErrorResponse };
 
-/**
- * Invalid request errors - typically due to missing parameters.
- */
-export type SendAccessTokenInvalidRequestError =
-  | "send_id_required"
-  | "password_hash_b64_required"
-  | "email_required"
-  | "email_and_otp_required_otp_sent"
-  | "unknown";
-
-/**
- * Invalid grant errors - typically due to invalid credentials.
- */
-export type SendAccessTokenInvalidGrantError =
-  | "send_id_invalid"
-  | "password_hash_b64_invalid"
-  | "email_invalid"
-  | "otp_invalid"
-  | "otp_generation_failed"
-  | "unknown";
-
 /**
  * Represents the possible, expected errors that can occur when requesting a send access token.
  */
@@ -327,45 +306,32 @@ export type SendAccessTokenApiErrorResponse =
   | { error: "invalid_target"; error_description?: string };
 
 /**
- * Result of JIT master password registration process.
+ * Invalid grant errors - typically due to invalid credentials.
  */
-export interface JitMasterPasswordRegistrationResponse {
-  /**
-   * The account cryptographic state of the user
-   */
-  account_cryptographic_state: WrappedAccountCryptographicState;
-  /**
-   * The master password unlock data
-   */
-  master_password_unlock: MasterPasswordUnlockData;
-  /**
-   * The decrypted user key.
-   */
-  user_key: B64;
-}
+export type SendAccessTokenInvalidGrantError =
+  | "send_id_invalid"
+  | "password_hash_b64_invalid"
+  | "otp_invalid"
+  | "otp_generation_failed"
+  | "unknown";
 
 /**
- * Result of Key Connector registration process.
+ * Invalid request errors - typically due to missing parameters.
  */
-export interface KeyConnectorRegistrationResult {
-  /**
-   * The account cryptographic state of the user.
-   */
-  account_cryptographic_state: WrappedAccountCryptographicState;
-  /**
-   * The key connector key used for unlocking.
-   */
-  key_connector_key: B64;
-  /**
-   * The encrypted user key, wrapped with the key connector key.
-   */
-  key_connector_key_wrapped_user_key: EncString;
-  /**
-   * The decrypted user key. This can be used to get the consuming client to an unlocked state.
-   */
-  user_key: B64;
+export type SendAccessTokenInvalidRequestError =
+  | "send_id_required"
+  | "password_hash_b64_required"
+  | "email_required"
+  | "email_and_otp_required"
+  | "unknown";
+
+export interface RegistrationError extends Error {
+  name: "RegistrationError";
+  variant: "KeyConnectorApi" | "Api" | "Crypto";
 }
 
+export function isRegistrationError(error: any): error is RegistrationError;
+
 /**
  * Request parameters for SSO JIT master password registration.
  */
@@ -405,13 +371,6 @@ export interface JitMasterPasswordRegistrationRequest {
   reset_password_enroll: boolean;
 }
 
-export interface RegistrationError extends Error {
-  name: "RegistrationError";
-  variant: "KeyConnectorApi" | "Api" | "Crypto";
-}
-
-export function isRegistrationError(error: any): error is RegistrationError;
-
 /**
  * Request parameters for TDE (Trusted Device Encryption) registration.
  */
@@ -457,6 +416,46 @@ export interface TdeRegistrationResponse {
   user_key: B64;
 }
 
+/**
+ * Result of Key Connector registration process.
+ */
+export interface KeyConnectorRegistrationResult {
+  /**
+   * The account cryptographic state of the user.
+   */
+  account_cryptographic_state: WrappedAccountCryptographicState;
+  /**
+   * The key connector key used for unlocking.
+   */
+  key_connector_key: B64;
+  /**
+   * The encrypted user key, wrapped with the key connector key.
+   */
+  key_connector_key_wrapped_user_key: EncString;
+  /**
+   * The decrypted user key. This can be used to get the consuming client to an unlocked state.
+   */
+  user_key: B64;
+}
+
+/**
+ * Result of JIT master password registration process.
+ */
+export interface JitMasterPasswordRegistrationResponse {
+  /**
+   * The account cryptographic state of the user
+   */
+  account_cryptographic_state: WrappedAccountCryptographicState;
+  /**
+   * The master password unlock data
+   */
+  master_password_unlock: MasterPasswordUnlockData;
+  /**
+   * The decrypted user key.
+   */
+  user_key: B64;
+}
+
 export interface CollectionView {
   id: CollectionId | undefined;
   organizationId: OrganizationId;
@@ -468,6 +467,11 @@ export interface CollectionView {
   type: CollectionType;
 }
 
+/**
+ * Type of collection
+ */
+export type CollectionType = "SharedCollection" | "DefaultUserCollection";
+
 export interface Collection {
   id: CollectionId | undefined;
   organizationId: OrganizationId;
@@ -485,11 +489,6 @@ export interface Collection {
  */
 export type CollectionId = Tagged<Uuid, "CollectionId">;
 
-/**
- * Type of collection
- */
-export type CollectionType = "SharedCollection" | "DefaultUserCollection";
-
 export interface CollectionDecryptError extends Error {
   name: "CollectionDecryptError";
   variant: "Crypto";
@@ -499,15 +498,19 @@ export function isCollectionDecryptError(error: any): error is CollectionDecrypt
 
 export type SignedSecurityState = string;
 
-/**
- * Represents the data required to authenticate with the master password.
- */
-export interface MasterPasswordAuthenticationData {
-  kdf: Kdf;
-  salt: string;
-  masterPasswordAuthenticationHash: B64;
+export interface MasterPasswordError extends Error {
+  name: "MasterPasswordError";
+  variant:
+    | "EncryptionKeyMalformed"
+    | "KdfMalformed"
+    | "InvalidKdfConfiguration"
+    | "MissingField"
+    | "Crypto"
+    | "WrongPassword";
 }
 
+export function isMasterPasswordError(error: any): error is MasterPasswordError;
+
 /**
  * Represents the data required to unlock with the master password.
  */
@@ -526,19 +529,15 @@ export interface MasterPasswordUnlockData {
   salt: string;
 }
 
-export interface MasterPasswordError extends Error {
-  name: "MasterPasswordError";
-  variant:
-    | "EncryptionKeyMalformed"
-    | "KdfMalformed"
-    | "InvalidKdfConfiguration"
-    | "MissingField"
-    | "Crypto"
-    | "WrongPassword";
+/**
+ * Represents the data required to authenticate with the master password.
+ */
+export interface MasterPasswordAuthenticationData {
+  kdf: Kdf;
+  salt: string;
+  masterPasswordAuthenticationHash: B64;
 }
 
-export function isMasterPasswordError(error: any): error is MasterPasswordError;
-
 export interface AccountCryptographyInitializationError extends Error {
   name: "AccountCryptographyInitializationError";
   variant:
@@ -554,13 +553,6 @@ export function isAccountCryptographyInitializationError(
   error: any,
 ): error is AccountCryptographyInitializationError;
 
-export interface RotateCryptographyStateError extends Error {
-  name: "RotateCryptographyStateError";
-  variant: "KeyMissing" | "InvalidData";
-}
-
-export function isRotateCryptographyStateError(error: any): error is RotateCryptographyStateError;
-
 /**
  * Any keys / cryptographic protection \"downstream\" from the account symmetric key (user key).
  * Private keys are protected by the user key.
@@ -571,69 +563,26 @@ export type WrappedAccountCryptographicState =
       V2: {
         private_key: EncString;
         signed_public_key: SignedPublicKey | undefined;
-        signing_key: EncString;
-        security_state: SignedSecurityState;
-      };
-    };
-
-/**
- * Auth requests supports multiple initialization methods.
- */
-export type AuthRequestMethod =
-  | { userKey: { protected_user_key: UnsignedSharedKey } }
-  | { masterKey: { protected_master_key: UnsignedSharedKey; auth_request_key: EncString } };
-
-/**
- * Request for `verify_asymmetric_keys`.
- */
-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;
-}
-
-/**
- * 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;
-}
+        signing_key: EncString;
+        security_state: SignedSecurityState;
+      };
+    };
 
-export interface DeriveKeyConnectorError extends Error {
-  name: "DeriveKeyConnectorError";
-  variant: "WrongPassword" | "Crypto";
+export interface RotateCryptographyStateError extends Error {
+  name: "RotateCryptographyStateError";
+  variant: "KeyMissing" | "InvalidData";
 }
 
-export function isDeriveKeyConnectorError(error: any): error is DeriveKeyConnectorError;
+export function isRotateCryptographyStateError(error: any): error is RotateCryptographyStateError;
 
 /**
- * Response from the `make_update_password` function
+ * Represents the request to initialize the user\'s organizational cryptographic state.
  */
-export interface UpdatePasswordResponse {
-  /**
-   * Hash of the new password
-   */
-  passwordHash: B64;
+export interface InitOrgCryptoRequest {
   /**
-   * User key, encrypted with the new password
+   * The encryption keys for all the organizations the user is a part of
    */
-  newKey: EncString;
+  organizationKeys: Map<OrganizationId, UnsignedSharedKey>;
 }
 
 export interface MakeKeysError extends Error {
@@ -647,13 +596,6 @@ export interface MakeKeysError extends Error {
 
 export function isMakeKeysError(error: any): error is MakeKeysError;
 
-export interface EnrollAdminPasswordResetError extends Error {
-  name: "EnrollAdminPasswordResetError";
-  variant: "Crypto";
-}
-
-export function isEnrollAdminPasswordResetError(error: any): error is EnrollAdminPasswordResetError;
-
 /**
  * The crypto method used to initialize the user cryptographic state.
  */
@@ -672,18 +614,20 @@ export type InitUserCryptoMethod =
     }
   | { keyConnector: { master_key: B64; user_key: EncString } };
 
-export interface CryptoClientError extends Error {
-  name: "CryptoClientError";
-  variant:
-    | "NotAuthenticated"
-    | "Crypto"
-    | "InvalidKdfSettings"
-    | "PasswordProtectedKeyEnvelope"
-    | "InvalidPrfInput";
+/**
+ * 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 isCryptoClientError(error: any): error is CryptoClientError;
-
 /**
  * Request for deriving a pin protected user key
  */
@@ -699,17 +643,35 @@ export interface DerivePinKeyResponse {
 }
 
 /**
- * Request for deriving a pin protected user key
+ * Request for `verify_asymmetric_keys`.
  */
-export interface EnrollPinResponse {
+export interface VerifyAsymmetricKeysRequest {
   /**
-   * [UserKey] protected by PIN
+   * The user\'s user key
    */
-  pinProtectedUserKeyEnvelope: PasswordProtectedKeyEnvelope;
+  userKey: B64;
   /**
-   * PIN protected by [UserKey]
+   * The user\'s public key
    */
-  userKeyEncryptedPin: EncString;
+  userPublicKey: B64;
+  /**
+   * User\'s private key, encrypted with the user key
+   */
+  userKeyEncryptedPrivateKey: EncString;
+}
+
+/**
+ * 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;
 }
 
 /**
@@ -750,24 +712,25 @@ export interface UserCryptoV2KeysResponse {
   securityVersion: number;
 }
 
-/**
- * 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 EnrollAdminPasswordResetError extends Error {
+  name: "EnrollAdminPasswordResetError";
+  variant: "Crypto";
+}
+
+export function isEnrollAdminPasswordResetError(error: any): error is EnrollAdminPasswordResetError;
+
+export interface CryptoClientError extends Error {
+  name: "CryptoClientError";
+  variant:
+    | "NotAuthenticated"
+    | "Crypto"
+    | "InvalidKdfSettings"
+    | "PasswordProtectedKeyEnvelope"
+    | "InvalidPrfInput";
 }
 
+export function isCryptoClientError(error: any): error is CryptoClientError;
+
 /**
  * Request for migrating an account from password to key connector.
  */
@@ -790,28 +753,39 @@ export interface DeriveKeyConnectorRequest {
   email: string;
 }
 
+export interface DeriveKeyConnectorError extends Error {
+  name: "DeriveKeyConnectorError";
+  variant: "WrongPassword" | "Crypto";
+}
+
+export function isDeriveKeyConnectorError(error: any): error is DeriveKeyConnectorError;
+
 /**
- * Response from the `make_key_pair` function
+ * Response from the `make_update_password` function
  */
-export interface MakeKeyPairResponse {
+export interface UpdatePasswordResponse {
   /**
-   * The user\'s public key
+   * Hash of the new password
    */
-  userPublicKey: B64;
+  passwordHash: B64;
   /**
-   * User\'s private key, encrypted with the user key
+   * User key, encrypted with the new password
    */
-  userKeyEncryptedPrivateKey: EncString;
+  newKey: EncString;
 }
 
 /**
- * Represents the request to initialize the user\'s organizational cryptographic state.
+ * Response from the `make_key_pair` function
  */
-export interface InitOrgCryptoRequest {
+export interface MakeKeyPairResponse {
   /**
-   * The encryption keys for all the organizations the user is a part of
+   * The user\'s public key
    */
-  organizationKeys: Map<OrganizationId, UnsignedSharedKey>;
+  userPublicKey: B64;
+  /**
+   * User\'s private key, encrypted with the user key
+   */
+  userKeyEncryptedPrivateKey: EncString;
 }
 
 /**
@@ -841,6 +815,31 @@ export interface InitUserCryptoRequest {
   method: InitUserCryptoMethod;
 }
 
+/**
+ * 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;
+}
+
+/**
+ * Auth requests supports multiple initialization methods.
+ */
+export type AuthRequestMethod =
+  | { userKey: { protected_user_key: UnsignedSharedKey } }
+  | { masterKey: { protected_master_key: UnsignedSharedKey; auth_request_key: EncString } };
+
 /**
  * NewType wrapper for `OrganizationId`
  */
@@ -1116,13 +1115,6 @@ export interface PassphraseGeneratorRequest {
   includeNumber: boolean;
 }
 
-export interface PasswordError extends Error {
-  name: "PasswordError";
-  variant: "NoCharacterSetEnabled" | "InvalidLength";
-}
-
-export function isPasswordError(error: any): error is PasswordError;
-
 /**
  * Password generator request options.
  */
@@ -1175,12 +1167,12 @@ export interface PasswordGeneratorRequest {
   minSpecial: number | undefined;
 }
 
-export interface UsernameError extends Error {
-  name: "UsernameError";
-  variant: "InvalidApiKey" | "Unknown" | "ResponseContent" | "Reqwest";
+export interface PasswordError extends Error {
+  name: "PasswordError";
+  variant: "NoCharacterSetEnabled" | "InvalidLength";
 }
 
-export function isUsernameError(error: any): error is UsernameError;
+export function isPasswordError(error: any): error is PasswordError;
 
 export type UsernameGeneratorRequest =
   | { word: { capitalize: boolean; include_number: boolean } }
@@ -1188,6 +1180,15 @@ export type UsernameGeneratorRequest =
   | { catchall: { type: AppendType; domain: string } }
   | { forwarded: { service: ForwarderServiceType; website: string | 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;
+
 /**
  * Configures the email forwarding service to use.
  * For instructions on how to configure each service, see the documentation:
@@ -1201,8 +1202,6 @@ export type ForwarderServiceType =
   | { forwardEmail: { api_token: string; domain: string } }
   | { simpleLogin: { api_key: string; base_url: string } };
 
-export type AppendType = "random" | { websiteName: { website: string } };
-
 export interface ReceiveError extends Error {
   name: "ReceiveError";
   variant: "Channel" | "Timeout" | "Cancelled";
@@ -1264,13 +1263,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 SshKeyImportError extends Error {
   name: "SshKeyImportError";
   variant: "Parsing" | "PasswordRequired" | "WrongPassword" | "UnsupportedKeyType";
@@ -1278,6 +1270,13 @@ export interface SshKeyImportError extends Error {
 
 export function isSshKeyImportError(error: any): error is SshKeyImportError;
 
+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";
@@ -1314,6 +1313,14 @@ export interface CipherRiskError extends Error {
 
 export function isCipherRiskError(error: any): error is CipherRiskError;
 
+/**
+ * Result of checking password exposure via HIBP API.
+ */
+export type ExposedPasswordResult =
+  | { type: "NotChecked" }
+  | { type: "Found"; value: number }
+  | { type: "Error"; value: string };
+
 /**
  * Password reuse map wrapper for WASM compatibility.
  */
@@ -1385,21 +1392,13 @@ 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 };
-
-export interface PasswordHistoryView {
-  password: string;
+export interface PasswordHistory {
+  password: EncString;
   lastUsedDate: DateTime<Utc>;
 }
 
-export interface PasswordHistory {
-  password: EncString;
+export interface PasswordHistoryView {
+  password: string;
   lastUsedDate: DateTime<Utc>;
 }
 
@@ -1425,6 +1424,13 @@ export interface TotpResponse {
   period: number;
 }
 
+export interface DecryptError extends Error {
+  name: "DecryptError";
+  variant: "Crypto";
+}
+
+export function isDecryptError(error: any): error is DecryptError;
+
 export interface EncryptError extends Error {
   name: "EncryptError";
   variant: "Crypto" | "MissingUserId";
@@ -1432,13 +1438,18 @@ export interface EncryptError extends Error {
 
 export function isEncryptError(error: any): error is EncryptError;
 
-export interface DecryptError extends Error {
-  name: "DecryptError";
-  variant: "Crypto";
+export interface Attachment {
+  id: string | undefined;
+  url: string | undefined;
+  size: string | undefined;
+  /**
+   * Readable size, ex: \"4.2 KB\" or \"1.43 GB\
+   */
+  sizeName: string | undefined;
+  fileName: EncString | undefined;
+  key: EncString | undefined;
 }
 
-export function isDecryptError(error: any): error is DecryptError;
-
 export interface AttachmentView {
   id: string | undefined;
   url: string | undefined;
@@ -1461,33 +1472,21 @@ export interface AttachmentView {
   decryptedKey: string | undefined;
 }
 
-export interface Attachment {
-  id: string | undefined;
-  url: string | undefined;
-  size: string | undefined;
-  /**
-   * Readable size, ex: \"4.2 KB\" or \"1.43 GB\
-   */
-  sizeName: string | undefined;
-  fileName: EncString | undefined;
-  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;
 }
 
-export interface SecureNote {
+export interface SecureNoteView {
   type: SecureNoteType;
 }
 
-export interface SecureNoteView {
+export interface SecureNote {
   type: SecureNoteType;
 }
 
@@ -1643,6 +1642,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;
+}
+
 export interface Card {
   cardholderName: EncString | undefined;
   expMonth: EncString | undefined;
@@ -1662,15 +1670,6 @@ export interface CardListView {
   brand: string | undefined;
 }
 
-export interface CardView {
-  cardholderName: string | undefined;
-  expMonth: string | undefined;
-  expYear: string | undefined;
-  code: string | undefined;
-  brand: string | undefined;
-  number: string | undefined;
-}
-
 export interface FieldView {
   name: string | undefined;
   value: string | undefined;
@@ -1685,23 +1684,10 @@ export interface Field {
   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 Fido2CredentialListView {
-  credentialId: string;
-  rpId: string;
-  userHandle: string | undefined;
-  userName: string | undefined;
-  userDisplayName: string | undefined;
-  counter: string;
+export interface LoginUriView {
+  uri: string | undefined;
+  match: UriMatchType | undefined;
+  uriChecksum: string | undefined;
 }
 
 export interface LoginUri {
@@ -1726,16 +1712,6 @@ export interface Fido2CredentialView {
   creationDate: DateTime<Utc>;
 }
 
-export interface LoginView {
-  username: string | undefined;
-  password: string | undefined;
-  passwordRevisionDate: DateTime<Utc> | undefined;
-  uris: LoginUriView[] | undefined;
-  totp: string | undefined;
-  autofillOnPageLoad: boolean | undefined;
-  fido2Credentials: Fido2Credential[] | undefined;
-}
-
 export interface Fido2CredentialNewView {
   credentialId: string;
   keyType: string;
@@ -1750,12 +1726,6 @@ export interface Fido2CredentialNewView {
   creationDate: DateTime<Utc>;
 }
 
-export interface LoginUriView {
-  uri: string | undefined;
-  match: UriMatchType | undefined;
-  uriChecksum: string | undefined;
-}
-
 export interface Fido2CredentialFullView {
   credentialId: string;
   keyType: string;
@@ -1772,6 +1742,16 @@ export interface Fido2CredentialFullView {
   creationDate: DateTime<Utc>;
 }
 
+export interface LoginView {
+  username: string | undefined;
+  password: string | undefined;
+  passwordRevisionDate: DateTime<Utc> | undefined;
+  uris: LoginUriView[] | undefined;
+  totp: string | undefined;
+  autofillOnPageLoad: boolean | undefined;
+  fido2Credentials: Fido2Credential[] | undefined;
+}
+
 export interface Fido2Credential {
   credentialId: EncString;
   keyType: EncString;
@@ -1799,27 +1779,24 @@ export interface LoginListView {
   uris: LoginUriView[] | undefined;
 }
 
-export interface CipherError extends Error {
-  name: "CipherError";
-  variant:
-    | "MissingField"
-    | "Crypto"
-    | "Decrypt"
-    | "Encrypt"
-    | "AttachmentsWithoutKeys"
-    | "OrganizationAlreadySet"
-    | "Repository"
-    | "Chrono"
-    | "SerdeJson"
-    | "Api";
+export interface Fido2CredentialListView {
+  credentialId: string;
+  rpId: string;
+  userHandle: string | undefined;
+  userName: string | undefined;
+  userDisplayName: string | undefined;
+  counter: string;
 }
 
-export function isCipherError(error: any): error is CipherError;
-
-/**
- * NewType wrapper for `CipherId`
- */
-export type CipherId = Tagged<Uuid, "CipherId">;
+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 Cipher {
   id: CipherId | undefined;
@@ -1856,43 +1833,68 @@ export interface Cipher {
   data: string | undefined;
 }
 
-export interface CipherView {
+export interface CipherListView {
   id: CipherId | undefined;
   organizationId: OrganizationId | undefined;
   folderId: FolderId | undefined;
   collectionIds: CollectionId[];
   /**
-   * Temporary, required to support re-encrypting existing items.
+   * Temporary, required to support calculating TOTP from CipherListView.
    */
   key: EncString | undefined;
   name: string;
-  notes: string | undefined;
-  type: CipherType;
-  login: LoginView | undefined;
-  identity: IdentityView | undefined;
-  card: CardView | undefined;
-  secureNote: SecureNoteView | undefined;
-  sshKey: SshKeyView | undefined;
+  subtitle: string;
+  type: CipherListViewType;
   favorite: boolean;
   reprompt: CipherRepromptType;
   organizationUseTotp: boolean;
   edit: boolean;
   permissions: CipherPermissions | undefined;
   viewPassword: boolean;
-  localData: LocalDataView | undefined;
-  attachments: AttachmentView[] | undefined;
   /**
-   * Attachments that failed to decrypt. Only present when there are decryption failures.
+   * The number of attachments
    */
-  attachmentDecryptionFailures?: AttachmentView[];
-  fields: FieldView[] | undefined;
-  passwordHistory: PasswordHistoryView[] | undefined;
+  attachments: number;
+  /**
+   * Indicates if the cipher has old attachments that need to be re-uploaded
+   */
+  hasOldAttachments: boolean;
   creationDate: DateTime<Utc>;
   deletedDate: DateTime<Utc> | undefined;
   revisionDate: DateTime<Utc>;
   archivedDate: DateTime<Utc> | undefined;
+  /**
+   * Hints for the presentation layer for which fields can be copied.
+   */
+  copyableFields: CopyableCipherFields[];
+  localData: LocalDataView | undefined;
+}
+
+/**
+ * Represents the result of decrypting a list of ciphers.
+ *
+ * This struct contains two vectors: `successes` and `failures`.
+ * `successes` contains the decrypted `CipherListView` objects,
+ * while `failures` contains the original `Cipher` objects that failed to decrypt.
+ */
+export interface DecryptCipherListResult {
+  /**
+   * The decrypted `CipherListView` objects.
+   */
+  successes: CipherListView[];
+  /**
+   * The original `Cipher` objects that failed to decrypt.
+   */
+  failures: Cipher[];
 }
 
+export type CipherListViewType =
+  | { login: LoginListView }
+  | "secureNote"
+  | { card: CardListView }
+  | "identity"
+  | "sshKey";
+
 /**
  * Available fields on a cipher and can be copied from a the list view in the UI.
  */
@@ -1909,6 +1911,23 @@ export type CopyableCipherFields =
   | "SshKey"
   | "SecureNotes";
 
+export interface CipherError extends Error {
+  name: "CipherError";
+  variant:
+    | "MissingField"
+    | "Crypto"
+    | "Decrypt"
+    | "Encrypt"
+    | "AttachmentsWithoutKeys"
+    | "OrganizationAlreadySet"
+    | "Repository"
+    | "Chrono"
+    | "SerdeJson"
+    | "Api";
+}
+
+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
@@ -1918,67 +1937,47 @@ export interface EncryptionContext {
   cipher: Cipher;
 }
 
-export interface CipherListView {
+export interface CipherView {
   id: CipherId | undefined;
   organizationId: OrganizationId | undefined;
   folderId: FolderId | undefined;
   collectionIds: CollectionId[];
   /**
-   * Temporary, required to support calculating TOTP from CipherListView.
+   * Temporary, required to support re-encrypting existing items.
    */
   key: EncString | undefined;
   name: string;
-  subtitle: string;
-  type: CipherListViewType;
+  notes: string | undefined;
+  type: CipherType;
+  login: LoginView | undefined;
+  identity: IdentityView | undefined;
+  card: CardView | undefined;
+  secureNote: SecureNoteView | undefined;
+  sshKey: SshKeyView | undefined;
   favorite: boolean;
   reprompt: CipherRepromptType;
   organizationUseTotp: boolean;
   edit: boolean;
   permissions: CipherPermissions | undefined;
   viewPassword: boolean;
+  localData: LocalDataView | undefined;
+  attachments: AttachmentView[] | undefined;
   /**
-   * The number of attachments
-   */
-  attachments: number;
-  /**
-   * Indicates if the cipher has old attachments that need to be re-uploaded
+   * Attachments that failed to decrypt. Only present when there are decryption failures.
    */
-  hasOldAttachments: boolean;
+  attachmentDecryptionFailures?: AttachmentView[];
+  fields: FieldView[] | undefined;
+  passwordHistory: PasswordHistoryView[] | undefined;
   creationDate: DateTime<Utc>;
   deletedDate: DateTime<Utc> | undefined;
   revisionDate: DateTime<Utc>;
   archivedDate: DateTime<Utc> | undefined;
-  /**
-   * Hints for the presentation layer for which fields can be copied.
-   */
-  copyableFields: CopyableCipherFields[];
-  localData: LocalDataView | undefined;
 }
 
 /**
- * Represents the result of decrypting a list of ciphers.
- *
- * This struct contains two vectors: `successes` and `failures`.
- * `successes` contains the decrypted `CipherListView` objects,
- * while `failures` contains the original `Cipher` objects that failed to decrypt.
+ * NewType wrapper for `CipherId`
  */
-export interface DecryptCipherListResult {
-  /**
-   * The decrypted `CipherListView` objects.
-   */
-  successes: CipherListView[];
-  /**
-   * The original `Cipher` objects that failed to decrypt.
-   */
-  failures: Cipher[];
-}
-
-export type CipherListViewType =
-  | { login: LoginListView }
-  | "secureNote"
-  | { card: CardListView }
-  | "identity"
-  | "sshKey";
+export type CipherId = Tagged<Uuid, "CipherId">;
 
 export interface SshKey {
   /**
@@ -2054,15 +2053,15 @@ export interface IdentityView {
 
 export type LinkedIdType = LoginLinkedIdType | CardLinkedIdType | IdentityLinkedIdType;
 
-export interface Folder {
+export interface FolderView {
   id: FolderId | undefined;
-  name: EncString;
+  name: string;
   revisionDate: DateTime<Utc>;
 }
 
-export interface FolderView {
+export interface Folder {
   id: FolderId | undefined;
-  name: string;
+  name: EncString;
   revisionDate: DateTime<Utc>;
 }