Skip to content

Commit 6750acd

Browse files
committed
Fix code formatting
Apply cargo fmt to fix import ordering and line wrapping to comply with CI style checks.
1 parent f79ed34 commit 6750acd

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,8 @@ impl InternalClient {
289289
/// This includes the user key, tokens, and encrypted private/signing keys
290290
#[cfg(feature = "internal")]
291291
pub fn export_session(&self) -> Result<String, CryptoError> {
292-
use bitwarden_encoding::B64;
293292
use crate::key_management::{AsymmetricKeyId, SymmetricKeyId};
293+
use bitwarden_encoding::B64;
294294
use serde::{Deserialize, Serialize};
295295

296296
#[derive(Serialize, Deserialize)]
@@ -336,8 +336,7 @@ impl InternalClient {
336336
};
337337

338338
// Serialize to JSON and then base64 encode
339-
let json = serde_json::to_string(&session_data)
340-
.map_err(|_| CryptoError::InvalidKey)?;
339+
let json = serde_json::to_string(&session_data).map_err(|_| CryptoError::InvalidKey)?;
341340
let encoded = bitwarden_encoding::B64::from(json.as_bytes());
342341

343342
Ok(encoded.to_string())
@@ -347,9 +346,9 @@ impl InternalClient {
347346
/// This includes restoring the user key, private key, and setting tokens
348347
#[cfg(feature = "internal")]
349348
pub fn import_session(&self, session: &str) -> Result<(), CryptoError> {
349+
use crate::key_management::{AsymmetricKeyId, SymmetricKeyId};
350350
use bitwarden_crypto::{AsymmetricCryptoKey, Pkcs8PrivateKeyBytes};
351351
use bitwarden_encoding::B64;
352-
use crate::key_management::{AsymmetricKeyId, SymmetricKeyId};
353352
use serde::{Deserialize, Serialize};
354353

355354
#[derive(Serialize, Deserialize)]
@@ -362,12 +361,11 @@ impl InternalClient {
362361
}
363362

364363
// Decode from base64 and parse JSON
365-
let decoded = B64::try_from(session.to_string())
366-
.map_err(|_| CryptoError::InvalidKey)?;
367-
let json_str = String::from_utf8(decoded.as_bytes().to_vec())
368-
.map_err(|_| CryptoError::InvalidKey)?;
369-
let session_data: SessionData = serde_json::from_str(&json_str)
370-
.map_err(|_| CryptoError::InvalidKey)?;
364+
let decoded = B64::try_from(session.to_string()).map_err(|_| CryptoError::InvalidKey)?;
365+
let json_str =
366+
String::from_utf8(decoded.as_bytes().to_vec()).map_err(|_| CryptoError::InvalidKey)?;
367+
let session_data: SessionData =
368+
serde_json::from_str(&json_str).map_err(|_| CryptoError::InvalidKey)?;
371369

372370
// Restore the user key and private key
373371
let user_key = SymmetricCryptoKey::try_from(session_data.user_key)?;
@@ -379,8 +377,8 @@ impl InternalClient {
379377

380378
// Restore private key if present
381379
if let Some(private_key_b64) = session_data.private_key {
382-
let private_key_b64_parsed = B64::try_from(private_key_b64)
383-
.map_err(|_| CryptoError::InvalidKey)?;
380+
let private_key_b64_parsed =
381+
B64::try_from(private_key_b64).map_err(|_| CryptoError::InvalidKey)?;
384382
let private_key_der = Pkcs8PrivateKeyBytes::from(private_key_b64_parsed.as_bytes());
385383
let private_key = AsymmetricCryptoKey::from_der(&private_key_der)?;
386384
ctx.set_asymmetric_key(AsymmetricKeyId::UserPrivateKey, private_key)?;

0 commit comments

Comments
 (0)