diff --git a/Cargo.lock b/Cargo.lock
index 960a7707f..218a21ed5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -352,7 +352,6 @@ dependencies = [
  "bitwarden-crypto",
  "bitwarden-generators",
  "chrono",
- "data-encoding",
  "getrandom 0.2.11",
  "hmac",
  "log",
@@ -506,6 +505,7 @@ dependencies = [
  "async-lock",
  "bitwarden",
  "bitwarden-crypto",
+ "bitwarden-generators",
  "chrono",
  "env_logger",
  "schemars",
@@ -724,9 +724,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.16"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58e54881c004cec7895b0068a0a954cd5d62da01aef83fa35b1e594497bf5445"
+checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -734,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.4.16"
+version = "4.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59cb82d7f531603d2fd1f507441cdd35184fa81beff7bd489570de7f773460bb"
+checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7"
 dependencies = [
  "anstream",
  "anstyle",
@@ -746,9 +746,9 @@ dependencies = [
 
 [[package]]
 name = "clap_complete"
-version = "4.4.6"
+version = "4.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97aeaa95557bd02f23fbb662f981670c3d20c5a26e69f7354b28f57092437fcd"
+checksum = "eaf7dcb7c21d8ca1a2482ee0f1d341f437c9a7af6ca6da359dc5e1b164e98215"
 dependencies = [
  "clap",
 ]
@@ -1041,12 +1041,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "data-encoding"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
-
 [[package]]
 name = "deadpool"
 version = "0.9.5"
diff --git a/crates/bitwarden-cli/Cargo.toml b/crates/bitwarden-cli/Cargo.toml
index 702232730..bded30904 100644
--- a/crates/bitwarden-cli/Cargo.toml
+++ b/crates/bitwarden-cli/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 rust-version = "1.57"
 
 [dependencies]
-clap = { version = "4.4.16", features = ["derive"] }
+clap = { version = "4.4.18", features = ["derive"] }
 color-eyre = "0.6"
 inquire = "0.6.2"
 supports-color = "2.1.0"
diff --git a/crates/bitwarden-generators/uniffi.toml b/crates/bitwarden-generators/uniffi.toml
new file mode 100644
index 000000000..923dd5e17
--- /dev/null
+++ b/crates/bitwarden-generators/uniffi.toml
@@ -0,0 +1,8 @@
+[bindings.kotlin]
+package_name = "com.bitwarden.generators"
+generate_immutable_records = true
+
+[bindings.swift]
+ffi_module_name = "BitwardenGeneratorsFFI"
+module_name = "BitwardenGenerators"
+generate_immutable_records = true
diff --git a/crates/bitwarden-napi/package-lock.json b/crates/bitwarden-napi/package-lock.json
index e10a23742..27e945f60 100644
--- a/crates/bitwarden-napi/package-lock.json
+++ b/crates/bitwarden-napi/package-lock.json
@@ -55,9 +55,9 @@
       }
     },
     "node_modules/@napi-rs/cli": {
-      "version": "2.17.0",
-      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.17.0.tgz",
-      "integrity": "sha512-/M7MZ3dIqyFs6c0Bxtk+SOobPq6vYWYqBLYCOKx3dYWqoyJNBEgmDKUTrxIZu9eHw9Ill3WyEoHPqS9P99cd8A==",
+      "version": "2.18.0",
+      "resolved": "https://registry.npmjs.org/@napi-rs/cli/-/cli-2.18.0.tgz",
+      "integrity": "sha512-lfSRT7cs3iC4L+kv9suGYQEezn5Nii7Kpu+THsYVI0tA1Vh59LH45p4QADaD7hvIkmOz79eEGtoKQ9nAkAPkzA==",
       "dev": true,
       "bin": {
         "napi": "scripts/index.js"
diff --git a/crates/bitwarden-napi/tsconfig.json b/crates/bitwarden-napi/tsconfig.json
index f977e0759..8ec7e00d4 100644
--- a/crates/bitwarden-napi/tsconfig.json
+++ b/crates/bitwarden-napi/tsconfig.json
@@ -7,7 +7,7 @@
     "strict": true,
     "noImplicitAny": true,
     "esModuleInterop": true,
-    "declaration": true
+    "declaration": true,
   },
-  "include": ["src-ts", "src-ts/bitwarden_client", "src-ts/index.ts"]
+  "include": ["src-ts", "src-ts/bitwarden_client", "src-ts/index.ts"],
 }
diff --git a/crates/bitwarden-uniffi/Cargo.toml b/crates/bitwarden-uniffi/Cargo.toml
index eadaaf8d2..6dc940062 100644
--- a/crates/bitwarden-uniffi/Cargo.toml
+++ b/crates/bitwarden-uniffi/Cargo.toml
@@ -25,6 +25,9 @@ bitwarden = { path = "../bitwarden", features = ["mobile", "internal"] }
 bitwarden-crypto = { path = "../bitwarden-crypto", version = "=0.1.0", features = [
     "mobile",
 ] }
+bitwarden-generators = { path = "../bitwarden-generators", version = "=0.1.0", features = [
+    "mobile",
+] }
 
 [build-dependencies]
 uniffi = { version = "=0.25.2", features = ["build"] }
diff --git a/crates/bitwarden/Cargo.toml b/crates/bitwarden/Cargo.toml
index 22ee6eaef..51c892ae1 100644
--- a/crates/bitwarden/Cargo.toml
+++ b/crates/bitwarden/Cargo.toml
@@ -37,7 +37,6 @@ chrono = { version = ">=0.4.26, <0.5", features = [
     "serde",
     "std",
 ], default-features = false }
-data-encoding = ">=2.5.0, <3.0"
 # We don't use this directly (it's used by rand), but we need it here to enable WASM support
 getrandom = { version = ">=0.2.9, <0.3", features = ["js"] }
 hmac = ">=0.12.1, <0.13"
diff --git a/crates/bitwarden/src/tool/client_generator.rs b/crates/bitwarden/src/tool/client_generator.rs
index a2be45698..50393bea8 100644
--- a/crates/bitwarden/src/tool/client_generator.rs
+++ b/crates/bitwarden/src/tool/client_generator.rs
@@ -1,6 +1,7 @@
-use bitwarden_generators::{
-    passphrase, password, username, PassphraseGeneratorRequest, PasswordGeneratorRequest,
-    UsernameGeneratorRequest,
+use bitwarden_generators::{passphrase, password, username};
+
+use crate::generators::{
+    PassphraseGeneratorRequest, PasswordGeneratorRequest, UsernameGeneratorRequest,
 };
 
 use crate::{error::Result, Client};
diff --git a/crates/bitwarden/src/vault/cipher/card.rs b/crates/bitwarden/src/vault/cipher/card.rs
index 05c3aa631..cd61a17d8 100644
--- a/crates/bitwarden/src/vault/cipher/card.rs
+++ b/crates/bitwarden/src/vault/cipher/card.rs
@@ -47,12 +47,12 @@ impl KeyEncryptable<SymmetricCryptoKey, Card> for CardView {
 impl KeyDecryptable<SymmetricCryptoKey, CardView> for Card {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<CardView, CryptoError> {
         Ok(CardView {
-            cardholder_name: self.cardholder_name.decrypt_with_key(key)?,
-            exp_month: self.exp_month.decrypt_with_key(key)?,
-            exp_year: self.exp_year.decrypt_with_key(key)?,
-            code: self.code.decrypt_with_key(key)?,
-            brand: self.brand.decrypt_with_key(key)?,
-            number: self.number.decrypt_with_key(key)?,
+            cardholder_name: self.cardholder_name.decrypt_with_key(key).ok().flatten(),
+            exp_month: self.exp_month.decrypt_with_key(key).ok().flatten(),
+            exp_year: self.exp_year.decrypt_with_key(key).ok().flatten(),
+            code: self.code.decrypt_with_key(key).ok().flatten(),
+            brand: self.brand.decrypt_with_key(key).ok().flatten(),
+            number: self.number.decrypt_with_key(key).ok().flatten(),
         })
     }
 }
diff --git a/crates/bitwarden/src/vault/cipher/cipher.rs b/crates/bitwarden/src/vault/cipher/cipher.rs
index 4d6c2e2fd..34f01ca60 100644
--- a/crates/bitwarden/src/vault/cipher/cipher.rs
+++ b/crates/bitwarden/src/vault/cipher/cipher.rs
@@ -183,22 +183,22 @@ impl KeyDecryptable<SymmetricCryptoKey, CipherView> for Cipher {
             folder_id: self.folder_id,
             collection_ids: self.collection_ids.clone(),
             key: self.key.clone(),
-            name: self.name.decrypt_with_key(key)?,
-            notes: self.notes.decrypt_with_key(key)?,
+            name: self.name.decrypt_with_key(key).ok().unwrap_or_default(),
+            notes: self.notes.decrypt_with_key(key).ok().flatten(),
             r#type: self.r#type,
-            login: self.login.decrypt_with_key(key)?,
-            identity: self.identity.decrypt_with_key(key)?,
-            card: self.card.decrypt_with_key(key)?,
-            secure_note: self.secure_note.decrypt_with_key(key)?,
+            login: self.login.decrypt_with_key(key).ok().flatten(),
+            identity: self.identity.decrypt_with_key(key).ok().flatten(),
+            card: self.card.decrypt_with_key(key).ok().flatten(),
+            secure_note: self.secure_note.decrypt_with_key(key).ok().flatten(),
             favorite: self.favorite,
             reprompt: self.reprompt,
             organization_use_totp: self.organization_use_totp,
             edit: self.edit,
             view_password: self.view_password,
-            local_data: self.local_data.decrypt_with_key(key)?,
-            attachments: self.attachments.decrypt_with_key(key)?,
-            fields: self.fields.decrypt_with_key(key)?,
-            password_history: self.password_history.decrypt_with_key(key)?,
+            local_data: self.local_data.decrypt_with_key(key).ok().flatten(),
+            attachments: self.attachments.decrypt_with_key(key).ok().flatten(),
+            fields: self.fields.decrypt_with_key(key).ok().flatten(),
+            password_history: self.password_history.decrypt_with_key(key).ok().flatten(),
             creation_date: self.creation_date,
             deleted_date: self.deleted_date,
             revision_date: self.revision_date,
@@ -299,8 +299,8 @@ impl KeyDecryptable<SymmetricCryptoKey, CipherListView> for Cipher {
             organization_id: self.organization_id,
             folder_id: self.folder_id,
             collection_ids: self.collection_ids.clone(),
-            name: self.name.decrypt_with_key(key)?,
-            sub_title: self.get_decrypted_subtitle(key)?,
+            name: self.name.decrypt_with_key(key).ok().unwrap_or_default(),
+            sub_title: self.get_decrypted_subtitle(key).ok().unwrap_or_default(),
             r#type: self.r#type,
             favorite: self.favorite,
             reprompt: self.reprompt,
diff --git a/crates/bitwarden/src/vault/cipher/field.rs b/crates/bitwarden/src/vault/cipher/field.rs
index 6bb106c32..db896474f 100644
--- a/crates/bitwarden/src/vault/cipher/field.rs
+++ b/crates/bitwarden/src/vault/cipher/field.rs
@@ -55,8 +55,8 @@ impl KeyEncryptable<SymmetricCryptoKey, Field> for FieldView {
 impl KeyDecryptable<SymmetricCryptoKey, FieldView> for Field {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<FieldView, CryptoError> {
         Ok(FieldView {
-            name: self.name.decrypt_with_key(key)?,
-            value: self.value.decrypt_with_key(key)?,
+            name: self.name.decrypt_with_key(key).ok().flatten(),
+            value: self.value.decrypt_with_key(key).ok().flatten(),
             r#type: self.r#type,
             linked_id: self.linked_id,
         })
diff --git a/crates/bitwarden/src/vault/cipher/identity.rs b/crates/bitwarden/src/vault/cipher/identity.rs
index c4154aeba..f59166eec 100644
--- a/crates/bitwarden/src/vault/cipher/identity.rs
+++ b/crates/bitwarden/src/vault/cipher/identity.rs
@@ -83,24 +83,24 @@ impl KeyEncryptable<SymmetricCryptoKey, Identity> for IdentityView {
 impl KeyDecryptable<SymmetricCryptoKey, IdentityView> for Identity {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<IdentityView, CryptoError> {
         Ok(IdentityView {
-            title: self.title.decrypt_with_key(key)?,
-            first_name: self.first_name.decrypt_with_key(key)?,
-            middle_name: self.middle_name.decrypt_with_key(key)?,
-            last_name: self.last_name.decrypt_with_key(key)?,
-            address1: self.address1.decrypt_with_key(key)?,
-            address2: self.address2.decrypt_with_key(key)?,
-            address3: self.address3.decrypt_with_key(key)?,
-            city: self.city.decrypt_with_key(key)?,
-            state: self.state.decrypt_with_key(key)?,
-            postal_code: self.postal_code.decrypt_with_key(key)?,
-            country: self.country.decrypt_with_key(key)?,
-            company: self.company.decrypt_with_key(key)?,
-            email: self.email.decrypt_with_key(key)?,
-            phone: self.phone.decrypt_with_key(key)?,
-            ssn: self.ssn.decrypt_with_key(key)?,
-            username: self.username.decrypt_with_key(key)?,
-            passport_number: self.passport_number.decrypt_with_key(key)?,
-            license_number: self.license_number.decrypt_with_key(key)?,
+            title: self.title.decrypt_with_key(key).ok().flatten(),
+            first_name: self.first_name.decrypt_with_key(key).ok().flatten(),
+            middle_name: self.middle_name.decrypt_with_key(key).ok().flatten(),
+            last_name: self.last_name.decrypt_with_key(key).ok().flatten(),
+            address1: self.address1.decrypt_with_key(key).ok().flatten(),
+            address2: self.address2.decrypt_with_key(key).ok().flatten(),
+            address3: self.address3.decrypt_with_key(key).ok().flatten(),
+            city: self.city.decrypt_with_key(key).ok().flatten(),
+            state: self.state.decrypt_with_key(key).ok().flatten(),
+            postal_code: self.postal_code.decrypt_with_key(key).ok().flatten(),
+            country: self.country.decrypt_with_key(key).ok().flatten(),
+            company: self.company.decrypt_with_key(key).ok().flatten(),
+            email: self.email.decrypt_with_key(key).ok().flatten(),
+            phone: self.phone.decrypt_with_key(key).ok().flatten(),
+            ssn: self.ssn.decrypt_with_key(key).ok().flatten(),
+            username: self.username.decrypt_with_key(key).ok().flatten(),
+            passport_number: self.passport_number.decrypt_with_key(key).ok().flatten(),
+            license_number: self.license_number.decrypt_with_key(key).ok().flatten(),
         })
     }
 }
diff --git a/crates/bitwarden/src/vault/cipher/login.rs b/crates/bitwarden/src/vault/cipher/login.rs
index 139750d51..ea5b1f357 100644
--- a/crates/bitwarden/src/vault/cipher/login.rs
+++ b/crates/bitwarden/src/vault/cipher/login.rs
@@ -98,11 +98,11 @@ impl KeyDecryptable<SymmetricCryptoKey, LoginUriView> for LoginUri {
 impl KeyDecryptable<SymmetricCryptoKey, LoginView> for Login {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<LoginView, CryptoError> {
         Ok(LoginView {
-            username: self.username.decrypt_with_key(key)?,
-            password: self.password.decrypt_with_key(key)?,
+            username: self.username.decrypt_with_key(key).ok().flatten(),
+            password: self.password.decrypt_with_key(key).ok().flatten(),
             password_revision_date: self.password_revision_date,
-            uris: self.uris.decrypt_with_key(key)?,
-            totp: self.totp.decrypt_with_key(key)?,
+            uris: self.uris.decrypt_with_key(key).ok().flatten(),
+            totp: self.totp.decrypt_with_key(key).ok().flatten(),
             autofill_on_page_load: self.autofill_on_page_load,
         })
     }
diff --git a/crates/bitwarden/src/vault/collection.rs b/crates/bitwarden/src/vault/collection.rs
index a78209fc9..d20e5d729 100644
--- a/crates/bitwarden/src/vault/collection.rs
+++ b/crates/bitwarden/src/vault/collection.rs
@@ -51,7 +51,7 @@ impl KeyDecryptable<SymmetricCryptoKey, CollectionView> for Collection {
             id: self.id,
             organization_id: self.organization_id,
 
-            name: self.name.decrypt_with_key(key)?,
+            name: self.name.decrypt_with_key(key).ok().unwrap_or_default(),
 
             external_id: self.external_id.clone(),
             hide_passwords: self.hide_passwords,
diff --git a/crates/bitwarden/src/vault/folder.rs b/crates/bitwarden/src/vault/folder.rs
index a6b9790bc..17d1d40aa 100644
--- a/crates/bitwarden/src/vault/folder.rs
+++ b/crates/bitwarden/src/vault/folder.rs
@@ -43,7 +43,7 @@ impl KeyDecryptable<SymmetricCryptoKey, FolderView> for Folder {
     fn decrypt_with_key(&self, key: &SymmetricCryptoKey) -> Result<FolderView, CryptoError> {
         Ok(FolderView {
             id: self.id,
-            name: self.name.decrypt_with_key(key)?,
+            name: self.name.decrypt_with_key(key).ok().unwrap_or_default(),
             revision_date: self.revision_date,
         })
     }
diff --git a/crates/bitwarden/src/vault/password_history.rs b/crates/bitwarden/src/vault/password_history.rs
index 333420b6a..2ec20116b 100644
--- a/crates/bitwarden/src/vault/password_history.rs
+++ b/crates/bitwarden/src/vault/password_history.rs
@@ -41,7 +41,7 @@ impl KeyDecryptable<SymmetricCryptoKey, PasswordHistoryView> for PasswordHistory
         key: &SymmetricCryptoKey,
     ) -> Result<PasswordHistoryView, CryptoError> {
         Ok(PasswordHistoryView {
-            password: self.password.decrypt_with_key(key)?,
+            password: self.password.decrypt_with_key(key).ok().unwrap_or_default(),
             last_used_date: self.last_used_date,
         })
     }
diff --git a/crates/bitwarden/src/vault/send.rs b/crates/bitwarden/src/vault/send.rs
index 4464fe4e3..aba67e00c 100644
--- a/crates/bitwarden/src/vault/send.rs
+++ b/crates/bitwarden/src/vault/send.rs
@@ -207,15 +207,15 @@ impl KeyDecryptable<SymmetricCryptoKey, SendView> for Send {
             id: self.id,
             access_id: self.access_id.clone(),
 
-            name: self.name.decrypt_with_key(&key)?,
-            notes: self.notes.decrypt_with_key(&key)?,
+            name: self.name.decrypt_with_key(&key).ok().unwrap_or_default(),
+            notes: self.notes.decrypt_with_key(&key).ok().flatten(),
             key: Some(URL_SAFE_NO_PAD.encode(k)),
             new_password: None,
             has_password: self.password.is_some(),
 
             r#type: self.r#type,
-            file: self.file.decrypt_with_key(&key)?,
-            text: self.text.decrypt_with_key(&key)?,
+            file: self.file.decrypt_with_key(&key).ok().flatten(),
+            text: self.text.decrypt_with_key(&key).ok().flatten(),
 
             max_access_count: self.max_access_count,
             access_count: self.access_count,
diff --git a/crates/bitwarden/src/vault/totp.rs b/crates/bitwarden/src/vault/totp.rs
index 223c8c504..e99cbfabd 100644
--- a/crates/bitwarden/src/vault/totp.rs
+++ b/crates/bitwarden/src/vault/totp.rs
@@ -1,7 +1,6 @@
 use std::{collections::HashMap, str::FromStr};
 
 use chrono::{DateTime, Utc};
-use data_encoding::BASE32_NOPAD;
 use hmac::{Hmac, Mac};
 use reqwest::Url;
 use schemars::JsonSchema;
@@ -129,19 +128,6 @@ impl FromStr for Totp {
     /// - OTP Auth URI
     /// - Steam URI
     fn from_str(key: &str) -> Result<Self> {
-        fn decode_secret(secret: &str) -> Result<Vec<u8>> {
-            // Sanitize the secret to only contain allowed characters
-            let secret = secret
-                .to_uppercase()
-                .chars()
-                .filter(|c| BASE32_CHARS.contains(*c))
-                .collect::<String>();
-
-            BASE32_NOPAD
-                .decode(secret.as_bytes())
-                .map_err(|e| e.to_string().into())
-        }
-
         let params = if key.starts_with("otpauth://") {
             let url = Url::parse(key).map_err(|_| "Unable to parse URL")?;
             let parts: HashMap<_, _> = url.query_pairs().collect();
@@ -166,26 +152,26 @@ impl FromStr for Totp {
                     .and_then(|v| v.parse().ok())
                     .map(|v: u32| v.max(1))
                     .unwrap_or(DEFAULT_PERIOD),
-                secret: decode_secret(
+                secret: decode_b32(
                     &parts
                         .get("secret")
                         .map(|v| v.to_string())
                         .ok_or("Missing secret in otpauth URI")?,
-                )?,
+                ),
             }
         } else if let Some(secret) = key.strip_prefix("steam://") {
             Totp {
                 algorithm: Algorithm::Steam,
                 digits: 5,
                 period: DEFAULT_PERIOD,
-                secret: decode_secret(secret)?,
+                secret: decode_b32(secret),
             }
         } else {
             Totp {
                 algorithm: DEFAULT_ALGORITHM,
                 digits: DEFAULT_DIGITS,
                 period: DEFAULT_PERIOD,
-                secret: decode_secret(key)?,
+                secret: decode_b32(key),
             }
         };
 
@@ -220,12 +206,42 @@ fn derive_binary(hash: Vec<u8>) -> u32 {
         | hash[offset + 3] as u32
 }
 
+/// This code is migrated from our javascript implementation and is not technically a correct base32 decoder since we filter out various characters, and use exact chunking.
+fn decode_b32(s: &str) -> Vec<u8> {
+    let s = s.to_uppercase();
+
+    let mut bits = String::new();
+    for c in s.chars() {
+        if let Some(i) = BASE32_CHARS.find(c) {
+            bits.push_str(&format!("{:05b}", i));
+        }
+    }
+    let mut bytes = Vec::new();
+
+    for chunk in bits.as_bytes().chunks_exact(8) {
+        let byte_str = std::str::from_utf8(chunk).unwrap();
+        let byte = u8::from_str_radix(byte_str, 2).unwrap();
+        bytes.push(byte);
+    }
+
+    bytes
+}
+
 #[cfg(test)]
 mod tests {
     use chrono::Utc;
 
     use super::*;
 
+    #[test]
+    fn test_decode_b32() {
+        let res = decode_b32("WQIQ25BRKZYCJVYP");
+        assert_eq!(res, vec![180, 17, 13, 116, 49, 86, 112, 36, 215, 15]);
+
+        let res = decode_b32("ABCD123");
+        assert_eq!(res, vec![0, 68, 61]);
+    }
+
     #[test]
     fn test_generate_totp() {
         let cases = vec![
@@ -234,6 +250,14 @@ mod tests {
             ("PIUDISEQYA", "829846"),       // non padded
             ("PIUDISEQYA======", "829846"), // padded
             ("PIUD1IS!EQYA=", "829846"),    // sanitized
+            // Steam
+            ("steam://HXDMVJECJJWSRB3HWIZR4IFUGFTMXBOZ", "7W6CJ"),
+            ("steam://ABCD123", "N26DF"),
+            // Various weird lengths
+            ("ddfdf", "932653"),
+            ("HJSGFJHDFDJDJKSDFD", "000034"),
+            ("xvdsfasdfasdasdghsgsdfg", "403786"),
+            ("KAKFJWOSFJ12NWL", "093430"),
         ];
 
         let time = Some(
@@ -277,18 +301,4 @@ mod tests {
         assert_eq!(response.code, "730364".to_string());
         assert_eq!(response.period, 60);
     }
-
-    #[test]
-    fn test_generate_steam() {
-        let key = "steam://HXDMVJECJJWSRB3HWIZR4IFUGFTMXBOZ".to_string();
-        let time = Some(
-            DateTime::parse_from_rfc3339("2023-01-01T00:00:00.000Z")
-                .unwrap()
-                .with_timezone(&Utc),
-        );
-        let response = generate_totp(key, time).unwrap();
-
-        assert_eq!(response.code, "7W6CJ".to_string());
-        assert_eq!(response.period, 30);
-    }
 }
diff --git a/crates/bw/Cargo.toml b/crates/bw/Cargo.toml
index 0ea4877f4..210a6b80a 100644
--- a/crates/bw/Cargo.toml
+++ b/crates/bw/Cargo.toml
@@ -13,7 +13,7 @@ Bitwarden Password Manager CLI
 keywords = ["bitwarden", "password-manager", "cli"]
 
 [dependencies]
-clap = { version = "4.4.16", features = ["derive", "env"] }
+clap = { version = "4.4.18", features = ["derive", "env"] }
 color-eyre = "0.6"
 env_logger = "0.10.1"
 inquire = "0.6.2"
diff --git a/crates/bws/Cargo.toml b/crates/bws/Cargo.toml
index c334d9c01..c2530af63 100644
--- a/crates/bws/Cargo.toml
+++ b/crates/bws/Cargo.toml
@@ -20,8 +20,8 @@ chrono = { version = "0.4.31", features = [
     "clock",
     "std",
 ], default-features = false }
-clap = { version = "4.4.16", features = ["derive", "env", "string"] }
-clap_complete = "4.4.6"
+clap = { version = "4.4.18", features = ["derive", "env", "string"] }
+clap_complete = "4.4.8"
 color-eyre = "0.6"
 comfy-table = "^7.1.0"
 directories = "5.0.1"
diff --git a/languages/js/sdk-client/package-lock.json b/languages/js/sdk-client/package-lock.json
index 144a79f64..f5447f5fe 100644
--- a/languages/js/sdk-client/package-lock.json
+++ b/languages/js/sdk-client/package-lock.json
@@ -39,9 +39,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "18.19.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.7.tgz",
-      "integrity": "sha512-IGRJfoNX10N/PfrReRZ1br/7SQ+2vF/tK3KXNwzXz82D32z5dMQEoOlFew18nLSN+vMNcLY4GrKfzwi/yWI8/w==",
+      "version": "18.19.8",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.8.tgz",
+      "integrity": "sha512-g1pZtPhsvGVTwmeVoexWZLTQaOvXwoSq//pTL0DHeNzUDrFnir4fgETdhjhIxjVnN+hKOuh98+E1eMLnUXstFg==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
diff --git a/languages/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt b/languages/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt
index dd79ff870..f51d0309e 100644
--- a/languages/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt
+++ b/languages/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt
@@ -27,9 +27,9 @@ import com.bitwarden.core.Folder
 import com.bitwarden.core.InitOrgCryptoRequest
 import com.bitwarden.core.InitUserCryptoMethod
 import com.bitwarden.core.InitUserCryptoRequest
-import com.bitwarden.core.Kdf
 import com.bitwarden.core.Uuid
 import com.bitwarden.crypto.HashPurpose
+import com.bitwarden.crypto.Kdf
 import com.bitwarden.myapplication.ui.theme.MyApplicationTheme
 import com.bitwarden.sdk.Client
 import io.ktor.client.HttpClient
diff --git a/languages/swift/build.sh b/languages/swift/build.sh
index 87f9cecdb..69bc9a881 100755
--- a/languages/swift/build.sh
+++ b/languages/swift/build.sh
@@ -28,16 +28,12 @@ cargo run -p uniffi-bindgen generate \
   --out-dir tmp/bindings
 
 # Move generated swift bindings
-mv ./tmp/bindings/BitwardenCore.swift ./Sources/BitwardenSdk/
-mv ./tmp/bindings/BitwardenCrypto.swift ./Sources/BitwardenSdk/
-mv ./tmp/bindings/BitwardenSDK.swift ./Sources/BitwardenSdk/
+mv ./tmp/bindings/*.swift ./Sources/BitwardenSdk/
 
 # Massage the generated files to fit xcframework
 mkdir tmp/Headers
-mv ./tmp/bindings/BitwardenCoreFFI.h ./tmp/Headers/
-mv ./tmp/bindings/BitwardenCryptoFFI.h ./tmp/Headers/
-mv ./tmp/bindings/BitwardenFFI.h ./tmp/Headers/
-cat ./tmp/bindings/BitwardenFFI.modulemap ./tmp/bindings/BitwardenCoreFFI.modulemap ./tmp/bindings/BitwardenCryptoFFI.modulemap > ./tmp/Headers/module.modulemap
+mv ./tmp/bindings/*.h ./tmp/Headers/
+cat ./tmp/bindings/*.modulemap > ./tmp/Headers/module.modulemap
 
 # Build xcframework
 xcodebuild -create-xcframework \
diff --git a/package-lock.json b/package-lock.json
index 3e47d00a0..07b2080f6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,9 +9,9 @@
       "version": "0.0.0",
       "license": "SEE LICENSE IN LICENSE",
       "devDependencies": {
-        "@openapitools/openapi-generator-cli": "2.7.0",
+        "@openapitools/openapi-generator-cli": "2.9.0",
         "handlebars": "^4.7.8",
-        "prettier": "3.2.2",
+        "prettier": "3.2.4",
         "quicktype-core": "23.0.81",
         "rimraf": "5.0.5",
         "ts-node": "10.9.2",
@@ -178,45 +178,93 @@
         "node": ">=8"
       }
     },
-    "node_modules/@nestjs/axios": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-0.1.0.tgz",
-      "integrity": "sha512-b2TT2X6BFbnNoeteiaxCIiHaFcSbVW+S5yygYqiIq5i6H77yIU3IVuLdpQkHq8/EqOWFwMopLN8jdkUT71Am9w==",
+    "node_modules/@nuxtjs/opencollective": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
+      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
       "dev": true,
       "dependencies": {
-        "axios": "0.27.2"
+        "chalk": "^4.1.0",
+        "consola": "^2.15.0",
+        "node-fetch": "^2.6.1"
       },
+      "bin": {
+        "opencollective": "bin/opencollective.js"
+      },
+      "engines": {
+        "node": ">=8.0.0",
+        "npm": ">=5.0.0"
+      }
+    },
+    "node_modules/@openapitools/openapi-generator-cli": {
+      "version": "2.9.0",
+      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.9.0.tgz",
+      "integrity": "sha512-KQpftKeiMoH5aEI/amOVLFGkGeT3DyA7Atj7v7l8xT3O9xnIUpoDmMg0WBTEh+NHxEwEAITQNDzr+JLjkXVaKw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "dependencies": {
+        "@nestjs/axios": "3.0.1",
+        "@nestjs/common": "10.3.0",
+        "@nestjs/core": "10.3.0",
+        "@nuxtjs/opencollective": "0.3.2",
+        "axios": "1.6.5",
+        "chalk": "4.1.2",
+        "commander": "8.3.0",
+        "compare-versions": "4.1.4",
+        "concurrently": "6.5.1",
+        "console.table": "0.10.0",
+        "fs-extra": "10.1.0",
+        "glob": "7.2.3",
+        "inquirer": "8.2.6",
+        "lodash": "4.17.21",
+        "reflect-metadata": "0.1.13",
+        "rxjs": "7.8.1",
+        "tslib": "2.6.2"
+      },
+      "bin": {
+        "openapi-generator-cli": "main.js"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/openapi_generator"
+      }
+    },
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/@nestjs/axios": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@nestjs/axios/-/axios-3.0.1.tgz",
+      "integrity": "sha512-VlOZhAGDmOoFdsmewn8AyClAdGpKXQQaY1+3PGB+g6ceurGIdTxZgRX3VXc1T6Zs60PedWjg3A82TDOB05mrzQ==",
+      "dev": true,
       "peerDependencies": {
-        "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0",
+        "@nestjs/common": "^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0",
+        "axios": "^1.3.1",
         "reflect-metadata": "^0.1.12",
         "rxjs": "^6.0.0 || ^7.0.0"
       }
     },
-    "node_modules/@nestjs/common": {
-      "version": "9.3.11",
-      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-9.3.11.tgz",
-      "integrity": "sha512-IFZ2G/5UKWC2Uo7tJ4SxGed2+aiA+sJyWeWsGTogKVDhq90oxVBToh+uCDeI31HNUpqYGoWmkletfty42zUd8A==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/@nestjs/common": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@nestjs/common/-/common-10.3.0.tgz",
+      "integrity": "sha512-DGv34UHsZBxCM3H5QGE2XE/+oLJzz5+714JQjBhjD9VccFlQs3LRxo/epso4l7nJIiNlZkPyIUC8WzfU/5RTsQ==",
       "dev": true,
       "dependencies": {
         "iterare": "1.2.1",
-        "tslib": "2.5.0",
-        "uid": "2.0.1"
+        "tslib": "2.6.2",
+        "uid": "2.0.2"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/nest"
       },
       "peerDependencies": {
-        "cache-manager": "<=5",
         "class-transformer": "*",
         "class-validator": "*",
         "reflect-metadata": "^0.1.12",
         "rxjs": "^7.1.0"
       },
       "peerDependenciesMeta": {
-        "cache-manager": {
-          "optional": true
-        },
         "class-transformer": {
           "optional": true
         },
@@ -225,16 +273,10 @@
         }
       }
     },
-    "node_modules/@nestjs/common/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
-      "dev": true
-    },
-    "node_modules/@nestjs/core": {
-      "version": "9.3.11",
-      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-9.3.11.tgz",
-      "integrity": "sha512-CI27a2JFd5rvvbgkalWqsiwQNhcP4EAG5BUK8usjp29wVp1kx30ghfBT8FLqIgmkRVo65A0IcEnWsxeXMntkxQ==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/@nestjs/core": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/@nestjs/core/-/core-10.3.0.tgz",
+      "integrity": "sha512-N06P5ncknW/Pm8bj964WvLIZn2gNhHliCBoAO1LeBvNImYkecqKcrmLbY49Fa1rmMfEM3MuBHeDys3edeuYAOA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
@@ -242,18 +284,18 @@
         "fast-safe-stringify": "2.1.1",
         "iterare": "1.2.1",
         "path-to-regexp": "3.2.0",
-        "tslib": "2.5.0",
-        "uid": "2.0.1"
+        "tslib": "2.6.2",
+        "uid": "2.0.2"
       },
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/nest"
       },
       "peerDependencies": {
-        "@nestjs/common": "^9.0.0",
-        "@nestjs/microservices": "^9.0.0",
-        "@nestjs/platform-express": "^9.0.0",
-        "@nestjs/websockets": "^9.0.0",
+        "@nestjs/common": "^10.0.0",
+        "@nestjs/microservices": "^10.0.0",
+        "@nestjs/platform-express": "^10.0.0",
+        "@nestjs/websockets": "^10.0.0",
         "reflect-metadata": "^0.1.12",
         "rxjs": "^7.1.0"
       },
@@ -269,63 +311,27 @@
         }
       }
     },
-    "node_modules/@nestjs/core/node_modules/tslib": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
-      "integrity": "sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==",
-      "dev": true
-    },
-    "node_modules/@nuxtjs/opencollective": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz",
-      "integrity": "sha512-um0xL3fO7Mf4fDxcqx9KryrB7zgRM5JSlvGN5AGkP6JLM5XEKyjeAiPbNxdXVXQ16isuAhYpvP88NgL2BGd6aA==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/axios": {
+      "version": "1.6.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
+      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
       "dev": true,
       "dependencies": {
-        "chalk": "^4.1.0",
-        "consola": "^2.15.0",
-        "node-fetch": "^2.6.1"
-      },
-      "bin": {
-        "opencollective": "bin/opencollective.js"
-      },
-      "engines": {
-        "node": ">=8.0.0",
-        "npm": ">=5.0.0"
+        "follow-redirects": "^1.15.4",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
       }
     },
-    "node_modules/@openapitools/openapi-generator-cli": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.7.0.tgz",
-      "integrity": "sha512-ieEpHTA/KsDz7ANw03lLPYyjdedDEXYEyYoGBRWdduqXWSX65CJtttjqa8ZaB1mNmIjMtchUHwAYQmTLVQ8HYg==",
+    "node_modules/@openapitools/openapi-generator-cli/node_modules/uid": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/uid/-/uid-2.0.2.tgz",
+      "integrity": "sha512-u3xV3X7uzvi5b1MncmZo3i2Aw222Zk1keqLA1YkHldREkAhAqi65wuPfe7lHx8H/Wzy+8CE7S7uS3jekIM5s8g==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
-        "@nestjs/axios": "0.1.0",
-        "@nestjs/common": "9.3.11",
-        "@nestjs/core": "9.3.11",
-        "@nuxtjs/opencollective": "0.3.2",
-        "chalk": "4.1.2",
-        "commander": "8.3.0",
-        "compare-versions": "4.1.4",
-        "concurrently": "6.5.1",
-        "console.table": "0.10.0",
-        "fs-extra": "10.1.0",
-        "glob": "7.1.6",
-        "inquirer": "8.2.5",
-        "lodash": "4.17.21",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "7.8.0",
-        "tslib": "2.0.3"
-      },
-      "bin": {
-        "openapi-generator-cli": "main.js"
+        "@lukeed/csprng": "^1.0.0"
       },
       "engines": {
-        "node": ">=10.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/openapi_generator"
+        "node": ">=8"
       }
     },
     "node_modules/@pkgjs/parseargs": {
@@ -462,16 +468,6 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
       "dev": true
     },
-    "node_modules/axios": {
-      "version": "0.27.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-      "dev": true,
-      "dependencies": {
-        "follow-redirects": "^1.14.9",
-        "form-data": "^4.0.0"
-      }
-    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -922,9 +918,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.5",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz",
+      "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==",
       "dev": true,
       "funding": [
         {
@@ -1013,15 +1009,15 @@
       }
     },
     "node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.0.4",
+        "minimatch": "^3.1.1",
         "once": "^1.3.0",
         "path-is-absolute": "^1.0.0"
       },
@@ -1117,9 +1113,9 @@
       "dev": true
     },
     "node_modules/inquirer": {
-      "version": "8.2.5",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.5.tgz",
-      "integrity": "sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==",
+      "version": "8.2.6",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz",
+      "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==",
       "dev": true,
       "dependencies": {
         "ansi-escapes": "^4.2.1",
@@ -1136,12 +1132,26 @@
         "string-width": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
+        "wrap-ansi": "^6.0.1"
       },
       "engines": {
         "node": ">=12.0.0"
       }
     },
+    "node_modules/inquirer/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
@@ -1470,9 +1480,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.2.tgz",
-      "integrity": "sha512-HTByuKZzw7utPiDO523Tt2pLtEyK7OibUD9suEJQrPUCYQqrHr74GGX6VidMrovbf/I50mPqr8j/II6oBAuc5A==",
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.4.tgz",
+      "integrity": "sha512-FWu1oLHKCrtpO1ypU6J0SbK2d9Ckwysq6bHj/uaCP26DxrPpppCLQRGVuqAxSTvhF00AcvDRyYrLNW7ocBhFFQ==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -1493,6 +1503,12 @@
         "node": ">= 0.6.0"
       }
     },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "dev": true
+    },
     "node_modules/quicktype-core": {
       "version": "23.0.81",
       "resolved": "https://registry.npmjs.org/quicktype-core/-/quicktype-core-23.0.81.tgz",
@@ -1678,20 +1694,14 @@
       }
     },
     "node_modules/rxjs": {
-      "version": "7.8.0",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.0.tgz",
-      "integrity": "sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==",
+      "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
-    "node_modules/rxjs/node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
-      "dev": true
-    },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -1918,9 +1928,9 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.3.tgz",
-      "integrity": "sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==",
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
       "dev": true
     },
     "node_modules/type-fest": {
@@ -1961,18 +1971,6 @@
         "node": ">=0.8.0"
       }
     },
-    "node_modules/uid": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/uid/-/uid-2.0.1.tgz",
-      "integrity": "sha512-PF+1AnZgycpAIEmNtjxGBVmKbZAQguaa4pBUq6KNaGEcpzZ2klCNZLM34tsjp76maN00TttiiUf6zkIBpJQm2A==",
-      "dev": true,
-      "dependencies": {
-        "@lukeed/csprng": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/undici-types": {
       "version": "5.26.5",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
diff --git a/package.json b/package.json
index 2becd41f2..14b5692a0 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "devDependencies": {
-    "@openapitools/openapi-generator-cli": "2.7.0",
+    "@openapitools/openapi-generator-cli": "2.9.0",
     "handlebars": "^4.7.8",
-    "prettier": "3.2.2",
+    "prettier": "3.2.4",
     "quicktype-core": "23.0.81",
     "rimraf": "5.0.5",
     "ts-node": "10.9.2",