Resolve clippy

Author: Hinton

crates/bitwarden-core/src/auth/login/access_token.rs

@@ -35,7 +35,7 @@ pub(crate) async fn login_access_token(
                 .set_login_method(LoginMethod::ServiceAccount(
                     ServiceAccountLoginMethod::AccessToken {
                         access_token,
-                        organization_id: organization_id.into(),
+                        organization_id: organization_id,
                         state_file: Some(state_file.to_path_buf()),
                     },
                 ));

crates/bitwarden-core/src/client/encryption_settings.rs

@@ -94,7 +94,7 @@ impl EncryptionSettings {
         #[allow(deprecated)]
         store
             .context_mut()
-            .set_symmetric_key(SymmetricKeyId::Organization(organization_id.into()), key)
+            .set_symmetric_key(SymmetricKeyId::Organization(organization_id), key)
             .expect("Mutable context");
     }
 
@@ -122,7 +122,7 @@ impl EncryptionSettings {
         for (org_id, org_enc_key) in org_enc_keys {
             ctx.decapsulate_key_unsigned(
                 AsymmetricKeyId::UserPrivateKey,
-                SymmetricKeyId::Organization(org_id.into()),
+                SymmetricKeyId::Organization(org_id),
                 &org_enc_key,
             )?;
         }

crates/bitwarden-core/src/client/internal.rs

@@ -223,20 +223,14 @@ impl InternalClient {
         organization_id: OrganizationId,
         key: SymmetricCryptoKey,
     ) {
-        EncryptionSettings::new_single_org_key(organization_id.into(), key, &self.key_store);
+        EncryptionSettings::new_single_org_key(organization_id, key, &self.key_store);
     }
 
     #[cfg(feature = "internal")]
     pub fn initialize_org_crypto(
         &self,
         org_keys: Vec<(OrganizationId, UnsignedSharedKey)>,
     ) -> Result<(), EncryptionSettingsError> {
-        EncryptionSettings::set_org_keys(
-            org_keys
-                .into_iter()
-                .map(|(id, key)| (id.into(), key))
-                .collect(),
-            &self.key_store,
-        )
+        EncryptionSettings::set_org_keys(org_keys, &self.key_store)
     }
 }

crates/bitwarden-vault/src/cipher/cipher.rs

@@ -548,7 +548,7 @@ impl CipherView {
         organization_id: OrganizationId,
     ) -> Result<(), CipherError> {
         let old_key = self.key_identifier();
-        let new_key = SymmetricKeyId::Organization(organization_id.into());
+        let new_key = SymmetricKeyId::Organization(organization_id);
 
         // If any attachment is missing a key we can't reencrypt the attachment keys
         if self.attachments.iter().flatten().any(|a| a.key.is_none()) {
@@ -660,7 +660,7 @@ impl Decryptable<KeyIds, SymmetricKeyId, CipherListView> for Cipher {
 impl IdentifyKey<SymmetricKeyId> for Cipher {
     fn key_identifier(&self) -> SymmetricKeyId {
         match self.organization_id {
-            Some(organization_id) => SymmetricKeyId::Organization(organization_id.into()),
+            Some(organization_id) => SymmetricKeyId::Organization(organization_id),
             None => SymmetricKeyId::User,
         }
     }
@@ -669,7 +669,7 @@ impl IdentifyKey<SymmetricKeyId> for Cipher {
 impl IdentifyKey<SymmetricKeyId> for CipherView {
     fn key_identifier(&self) -> SymmetricKeyId {
         match self.organization_id {
-            Some(organization_id) => SymmetricKeyId::Organization(organization_id.into()),
+            Some(organization_id) => SymmetricKeyId::Organization(organization_id),
             None => SymmetricKeyId::User,
         }
     }
@@ -678,7 +678,7 @@ impl IdentifyKey<SymmetricKeyId> for CipherView {
 impl IdentifyKey<SymmetricKeyId> for CipherListView {
     fn key_identifier(&self) -> SymmetricKeyId {
         match self.organization_id {
-            Some(organization_id) => SymmetricKeyId::Organization(organization_id.into()),
+            Some(organization_id) => SymmetricKeyId::Organization(organization_id),
             None => SymmetricKeyId::User,
         }
     }
@@ -996,7 +996,7 @@ mod tests {
         let org = OrganizationId::new_v4();
         let key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
         let org_key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
-        let key_store = create_test_crypto_with_user_and_org_key(key, org.into(), org_key);
+        let key_store = create_test_crypto_with_user_and_org_key(key, org, org_key);
 
         // Create a cipher with a user key
         let mut cipher = generate_cipher();
@@ -1021,7 +1021,7 @@ mod tests {
         let org = OrganizationId::new_v4();
         let key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
         let org_key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
-        let key_store = create_test_crypto_with_user_and_org_key(key, org.into(), org_key);
+        let key_store = create_test_crypto_with_user_and_org_key(key, org, org_key);
 
         // Create a cipher with a user key
         let mut cipher = generate_cipher();
@@ -1041,7 +1041,7 @@ mod tests {
         let org = OrganizationId::new_v4();
         let key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
         let org_key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
-        let key_store = create_test_crypto_with_user_and_org_key(key, org.into(), org_key);
+        let key_store = create_test_crypto_with_user_and_org_key(key, org, org_key);
 
         let mut cipher = generate_cipher();
         let attachment = AttachmentView {
@@ -1065,8 +1065,8 @@ mod tests {
         let org = OrganizationId::new_v4();
         let key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
         let org_key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
-        let key_store = create_test_crypto_with_user_and_org_key(key, org.into(), org_key);
-        let org_key = SymmetricKeyId::Organization(org.into());
+        let key_store = create_test_crypto_with_user_and_org_key(key, org, org_key);
+        let org_key = SymmetricKeyId::Organization(org);
 
         // Attachment has a key that is encrypted with the user key, as the cipher has no key itself
         let (attachment_key_enc, attachment_key_val) = {
@@ -1133,8 +1133,8 @@ mod tests {
         let org = OrganizationId::new_v4();
         let key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
         let org_key = SymmetricCryptoKey::make_aes256_cbc_hmac_key();
-        let key_store = create_test_crypto_with_user_and_org_key(key, org.into(), org_key);
-        let org_key = SymmetricKeyId::Organization(org.into());
+        let key_store = create_test_crypto_with_user_and_org_key(key, org, org_key);
+        let org_key = SymmetricKeyId::Organization(org);
 
         let mut ctx = key_store.context();
 

crates/bitwarden-vault/src/collection.rs

@@ -48,7 +48,7 @@ pub struct CollectionView {
 
 impl IdentifyKey<SymmetricKeyId> for Collection {
     fn key_identifier(&self) -> SymmetricKeyId {
-        SymmetricKeyId::Organization(self.organization_id.into())
+        SymmetricKeyId::Organization(self.organization_id)
     }
 }