add azure_core::auth::AccessToken (#827)

Author: ctaggart

sdk/core/Cargo.toml

@@ -21,13 +21,11 @@ dyn-clone = "1.0"
 futures = "0.3"
 http = "0.2"
 log = "0.4"
-oauth2 = { version = "4.0", default-features = false }
 rand = "0.8"
 reqwest = { version = "0.11", features = [
   "stream",
 ], default-features = false, optional = true }
-serde = "1.0"
-serde_derive = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 url = "2.2"
 uuid = { version = "1.0" }
@@ -47,9 +45,9 @@ thiserror = "1.0"
 
 [features]
 default = ["enable_reqwest"]
-enable_reqwest = ["reqwest/default-tls", "oauth2/native-tls"]
+enable_reqwest = ["reqwest/default-tls"]
 enable_reqwest_gzip = ["reqwest/gzip"]
-enable_reqwest_rustls = ["reqwest/rustls-tls", "oauth2/rustls-tls"]
+enable_reqwest_rustls = ["reqwest/rustls-tls"]
 test_e2e = []
 azurite_workaround = []
 mock_transport_framework = []

sdk/core/src/auth.rs

@@ -1,9 +1,21 @@
 //! Azure authentication and authorization.
 
 use chrono::{DateTime, Utc};
-use oauth2::AccessToken;
+use serde::{Deserialize, Serialize};
 use std::fmt::Debug;
 
+#[derive(Debug, Clone, Deserialize, Serialize)]
+pub struct AccessToken(String);
+
+impl AccessToken {
+    pub fn new(access_token: String) -> Self {
+        Self(access_token)
+    }
+    pub fn secret(&self) -> &str {
+        self.0.as_str()
+    }
+}
+
 /// Represents an Azure service bearer access token with expiry information.
 #[derive(Debug, Clone)]
 pub struct TokenResponse {

sdk/device_update/src/lib.rs

@@ -8,10 +8,9 @@ use crate::device_update::UpdateOperation;
 
 #[cfg(test)]
 mod tests {
-    use azure_core::auth::{TokenCredential, TokenResponse};
+    use azure_core::auth::{AccessToken, TokenCredential, TokenResponse};
     use azure_identity::AutoRefreshingTokenCredential;
     use chrono::{Duration, Utc};
-    use oauth2::AccessToken;
     use std::sync::Arc;
 
     pub(crate) fn mock_client() -> crate::client::DeviceUpdateClient {

sdk/identity/src/client_credentials_flow/login_response.rs

@@ -1,5 +1,5 @@
+use azure_core::auth::AccessToken;
 use chrono::{DateTime, TimeZone, Utc};
-use oauth2::AccessToken;
 use serde::{de, Deserialize, Deserializer};
 
 #[derive(Debug, Clone, Deserialize)]

sdk/identity/src/device_code_flow/device_code_responses.rs

@@ -1,4 +1,4 @@
-use oauth2::AccessToken;
+use azure_core::auth::AccessToken;
 use serde::Deserialize;
 use std::fmt;
 

sdk/identity/src/refresh_token.rs

@@ -1,12 +1,13 @@
 //! Refresh token utilities
 
 use azure_core::{
+    auth::AccessToken,
     content_type,
     error::{Error, ErrorKind, ResultExt},
     headers, HttpClient, Request,
 };
 use http::Method;
-use oauth2::{AccessToken, ClientId, ClientSecret};
+use oauth2::{ClientId, ClientSecret};
 use serde::Deserialize;
 use std::fmt;
 use std::sync::Arc;

sdk/identity/src/token_credentials/azure_cli_credentials.rs

@@ -1,7 +1,6 @@
-use azure_core::auth::{TokenCredential, TokenResponse};
+use azure_core::auth::{AccessToken, TokenCredential, TokenResponse};
 use azure_core::error::{Error, ErrorKind, ResultExt};
 use chrono::{DateTime, Utc};
-use oauth2::AccessToken;
 use serde::Deserialize;
 use std::process::Command;
 use std::str;

sdk/identity/src/token_credentials/client_certificate_credentials.rs

@@ -1,9 +1,8 @@
 use super::{authority_hosts, TokenCredential};
-use azure_core::auth::TokenResponse;
+use azure_core::auth::{AccessToken, TokenResponse};
 use azure_core::error::{ErrorKind, ResultExt};
 use base64::{CharacterSet, Config};
 use chrono::Utc;
-use oauth2::AccessToken;
 use openssl::{
     error::ErrorStack,
     hash::{hash, DigestBytes, MessageDigest},

sdk/identity/src/token_credentials/client_secret_credentials.rs

@@ -1,9 +1,7 @@
-use azure_core::auth::{TokenCredential, TokenResponse};
+use azure_core::auth::{AccessToken, TokenCredential, TokenResponse};
 use azure_core::error::{ErrorKind, ResultExt};
 use chrono::Utc;
-use oauth2::{
-    basic::BasicClient, reqwest::async_http_client, AccessToken, AuthType, AuthUrl, Scope, TokenUrl,
-};
+use oauth2::{basic::BasicClient, reqwest::async_http_client, AuthType, AuthUrl, Scope, TokenUrl};
 use std::{str, time::Duration};
 use url::Url;
 

sdk/identity/src/token_credentials/imds_managed_identity_credentials.rs

@@ -1,9 +1,8 @@
-use azure_core::auth::{TokenCredential, TokenResponse};
+use azure_core::auth::{AccessToken, TokenCredential, TokenResponse};
 use azure_core::error::{Error, ErrorKind, ResultExt};
 use azure_core::{HttpClient, Request};
 use chrono::{DateTime, TimeZone, Utc};
 use http::Method;
-use oauth2::AccessToken;
 use serde::{
     de::{self, Deserializer},
     Deserialize,

sdk/security_keyvault/src/lib.rs

@@ -7,9 +7,9 @@ pub use client::{CertificateClient, KeyClient};
 
 #[cfg(test)]
 mod tests {
+    use azure_core::auth::AccessToken;
     use azure_core::auth::{TokenCredential, TokenResponse};
     use chrono::{Duration, Utc};
-    use oauth2::AccessToken;
 
     #[macro_export]
     macro_rules! mock_key_client {

sdk/storage_blobs/examples/device_code_flow.rs

@@ -74,7 +74,7 @@ async fn main() -> azure_core::Result<()> {
     let storage_account_client = StorageAccountClient::new_bearer_token(
         http_client.clone(),
         &storage_account_name,
-        authorization.access_token().secret() as &str,
+        authorization.access_token().secret(),
     );
     let blob_service_client = storage_account_client.as_blob_service_client();
 

sdk/storage_datalake/src/authorization_policies/token_credential.rs

@@ -44,7 +44,7 @@ impl Policy for TokenCredentialAuthorizationPolicy {
         );
 
         let token = self.credential.get_token(&self.resource).await?;
-        let auth_header_value = format!("Bearer {}", token.token.secret().clone());
+        let auth_header_value = format!("Bearer {}", token.token.secret());
 
         request
             .headers_mut()