Move access token to auth (#656)

Move access token from client to auth.
bitwarden · Mar 12, 2024 · 07a4ceb · 07a4ceb
1 parent ec54a89
commit 07a4ceb
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/crates/bitwarden/CHANGELOG.md b/crates/bitwarden/CHANGELOG.md
@@ -9,7 +9,8 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ### Changed
 
-- Switched TLS backend to `rustls`, removing the dependency on `OpenSSL`.
+- Switched TLS backend to `rustls`, removing the dependency on `OpenSSL`. (#374)
+- `client::AccessToken` is now `auth::AccessToken`. (#656)
 
 ## [0.4.0] - 2023-12-21
 

diff --git a/crates/bitwarden/src/client/access_token.rs → crates/bitwarden/src/auth/access_token.rs b/crates/bitwarden/src/client/access_token.rs → crates/bitwarden/src/auth/access_token.rs
@@ -65,12 +65,12 @@ impl FromStr for AccessToken {
 #[cfg(test)]
 mod tests {
 
+    use super::AccessToken;
+
     #[test]
     fn can_decode_access_token() {
         use std::str::FromStr;
 
-        use crate::client::AccessToken;
-
         let access_token = "0.ec2c1d46-6a4b-4751-a310-af9601317f2d.C2IgxjjLF7qSshsbwe8JGcbM075YXw:X8vbvA0bduihIDe/qrzIQQ==";
         let token = AccessToken::from_str(access_token).unwrap();
 
@@ -86,8 +86,6 @@ mod tests {
     fn malformed_tokens() {
         use std::str::FromStr;
 
-        use crate::client::AccessToken;
-
         // Encryption key without base64 padding, we generate it with padding but ignore it when
         // decoding
         let t = "0.ec2c1d46-6a4b-4751-a310-af9601317f2d.C2IgxjjLF7qSshsbwe8JGcbM075YXw:X8vbvA0bduihIDe/qrzIQQ";

diff --git a/crates/bitwarden/src/auth/login/access_token.rs b/crates/bitwarden/src/auth/login/access_token.rs
@@ -11,9 +11,9 @@ use crate::{
     auth::{
         api::{request::AccessTokenRequest, response::IdentityTokenResponse},
         login::{response::two_factor::TwoFactorProviders, PasswordLoginResponse},
-        JWTToken,
+        AccessToken, JWTToken,
     },
-    client::{AccessToken, LoginMethod, ServiceAccountLoginMethod},
+    client::{LoginMethod, ServiceAccountLoginMethod},
     error::{Error, Result},
     secrets_manager::state::{self, ClientState},
     Client,

diff --git a/crates/bitwarden/src/auth/mod.rs b/crates/bitwarden/src/auth/mod.rs
@@ -1,10 +1,12 @@
+mod access_token;
 pub(super) mod api;
 pub mod client_auth;
 mod jwt_token;
 pub mod login;
 #[cfg(feature = "internal")]
 pub mod password;
 pub mod renew;
+pub use access_token::AccessToken;
 pub use jwt_token::JWTToken;
 #[cfg(feature = "internal")]
 mod register;

diff --git a/crates/bitwarden/src/client/client.rs b/crates/bitwarden/src/client/client.rs
@@ -9,9 +9,16 @@ use chrono::Utc;
 use reqwest::header::{self, HeaderValue};
 use uuid::Uuid;
 
-use super::AccessToken;
 #[cfg(feature = "secrets")]
 use crate::auth::login::{AccessTokenLoginRequest, AccessTokenLoginResponse};
+use crate::{
+    auth::AccessToken,
+    client::{
+        client_settings::{ClientSettings, DeviceType},
+        encryption_settings::EncryptionSettings,
+    },
+    error::{Error, Result},
+};
 #[cfg(feature = "internal")]
 use crate::{
     client::flags::Flags,
@@ -20,13 +27,6 @@ use crate::{
         UserApiKeyResponse,
     },
 };
-use crate::{
-    client::{
-        client_settings::{ClientSettings, DeviceType},
-        encryption_settings::EncryptionSettings,
-    },
-    error::{Error, Result},
-};
 
 #[derive(Debug)]
 pub(crate) struct ApiConfigurations {

diff --git a/crates/bitwarden/src/client/mod.rs b/crates/bitwarden/src/client/mod.rs
@@ -1,7 +1,6 @@
 //! Bitwarden SDK Client
 
 pub(crate) use client::*;
-pub(crate) mod access_token;
 #[allow(clippy::module_inception)]
 mod client;
 pub mod client_settings;
@@ -10,5 +9,4 @@ pub(crate) mod encryption_settings;
 #[cfg(feature = "internal")]
 mod flags;
 
-pub use access_token::AccessToken;
 pub use client::Client;
diff --git a/crates/bitwarden/src/secrets_manager/state.rs b/crates/bitwarden/src/secrets_manager/state.rs
@@ -4,7 +4,7 @@ use bitwarden_crypto::{EncString, KeyDecryptable, KeyEncryptable};
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    client::AccessToken,
+    auth::AccessToken,
     error::{Error, Result},
 };
 

diff --git a/crates/bws/src/main.rs b/crates/bws/src/main.rs
@@ -1,8 +1,8 @@
 use std::{path::PathBuf, process, str::FromStr};
 
 use bitwarden::{
-    auth::login::AccessTokenLoginRequest,
-    client::{client_settings::ClientSettings, AccessToken},
+    auth::{login::AccessTokenLoginRequest, AccessToken},
+    client::client_settings::ClientSettings,
     secrets_manager::{
         projects::{
             ProjectCreateRequest, ProjectGetRequest, ProjectPutRequest, ProjectsDeleteRequest,