Fix clippy errors

Author: quexten

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

@@ -27,6 +27,9 @@ pub enum EncryptionSettingsError {
     #[error("Invalid private key")]
     InvalidPrivateKey,
 
+    #[error("Invalid signing key")]
+    InvalidSigningKey,
+
     #[error(transparent)]
     MissingPrivateKey(#[from] MissingPrivateKeyError),
 
@@ -72,26 +75,26 @@ impl EncryptionSettings {
             //         .map_err(|_| EncryptionSettingsError::InvalidPrivateKey)?,
             // )
         };
-        let signing_key = signing_key.map(|key| {
-            use bitwarden_crypto::{CoseKeyContentFormat, SerializedBytes};
-
-            let dec: Vec<u8> = key.decrypt_with_key(&user_key).unwrap();
-            let dec: SerializedBytes<CoseKeyContentFormat> = SerializedBytes::from(dec);
-            SigningKey::from_cose(&dec).unwrap()
-        });
 
         // FIXME: [PM-18098] When this is part of crypto we won't need to use deprecated methods
         #[allow(deprecated)]
         {
             let mut ctx = store.context_mut();
-            ctx.set_symmetric_key(SymmetricKeyId::User, user_key)?;
-            if let Some(private_key) = private_key {
-                ctx.set_asymmetric_key(AsymmetricKeyId::UserPrivateKey, private_key)?;
-            }
 
             if let Some(signing_key) = signing_key {
+                use bitwarden_crypto::SerializedBytes;
+
+                let dec: Vec<u8> = signing_key.decrypt_with_key(&user_key).unwrap();
+                let signing_key = SigningKey::from_cose(&SerializedBytes::from(dec))
+                    .map_err(|_| EncryptionSettingsError::InvalidSigningKey)?;
                 ctx.set_signing_key(SigningKeyId::UserSigningKey, signing_key)?;
             }
+
+            if let Some(private_key) = private_key {
+                ctx.set_asymmetric_key(AsymmetricKeyId::UserPrivateKey, private_key)?;
+            }
+
+            ctx.set_symmetric_key(SymmetricKeyId::User, user_key)?;
         }
 
         Ok(())