OMGeeky/yup-oauth2
1
0
Fork 0
mirror of https://github.com/OMGeeky/yup-oauth2.git synced 2025-12-26 16:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests and examples to use token() method on AccessToken

Browse Source
This commit is contained in:
Brandon Ogle
2022-10-10 12:46:23 -07:00
parent 818d1c2eea
commit db8dd7d68d
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/custom_client.rs
View File

@@ -22,11 +22,11 @@ where
S::Future: Send + Unpin + 'static,
S::Error: Into<Box<dyn StdError + Send + Sync>>,
{
let token = authenticator.token(&["email"]).await?;
let access_token = authenticator.token(&["email"]).await?;
let request = http::Request::get("https://example.com")
.header(
http::header::AUTHORIZATION,
format!("Bearer {}", token.access_token().ok_or("no access token")?),
format!("Bearer {}", access_token.token().ok_or("no access token")?),
)
.body(hyper::body::Body::empty())?;
let response = client.request(request).await?;

32
tests/tests.rs
View File

@@ -94,7 +94,7 @@ async fn test_device_success() {
.token(&["https://www.googleapis.com/scope/1"])
.await
.expect("token failed");
assert_eq!("accesstoken", token.access_token().expect("should have access token"));
assert_eq!("accesstoken", token.token().expect("should have access token"));
}
#[tokio::test]
@@ -255,7 +255,7 @@ async fn test_installed_interactive_success() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!("accesstoken", tok.access_token().expect("should have access token"));
assert_eq!("accesstoken", tok.token().expect("should have access token"));
}
#[tokio::test]
@@ -284,7 +284,7 @@ async fn test_installed_redirect_success() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!("accesstoken", tok.access_token().expect("should have access token"));
assert_eq!("accesstoken", tok.token().expect("should have access token"));
}
#[tokio::test]
@@ -353,7 +353,7 @@ async fn test_service_account_success() {
.token(&["https://www.googleapis.com/auth/pubsub"])
.await
.expect("token failed");
assert!(tok.access_token().expect("should have access token").contains("ya29.c.ElouBywiys0Ly"));
assert!(tok.token().expect("should have access token").contains("ya29.c.ElouBywiys0Ly"));
assert!(OffsetDateTime::now_utc() + time::Duration::seconds(3600) >= tok.expiration_time().unwrap());
}
@@ -404,7 +404,7 @@ async fn test_refresh() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!("accesstoken", tok.access_token().expect("should have access token"));
assert_eq!("accesstoken", tok.token().expect("should have access token"));
server.expect(
Expectation::matching(all_of![
@@ -425,7 +425,7 @@ async fn test_refresh() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!("accesstoken2", tok.access_token().expect("should have access token"));
assert_eq!("accesstoken2", tok.token().expect("should have access token"));
server.expect(
Expectation::matching(all_of![
@@ -446,7 +446,7 @@ async fn test_refresh() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!("accesstoken3", tok.access_token().expect("should have access token"));
assert_eq!("accesstoken3", tok.token().expect("should have access token"));
// Refresh fails, but renewing the token succeeds.
// PR #165
@@ -516,7 +516,7 @@ async fn test_memory_storage() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!(token1.access_token().expect("should have access token"), "accesstoken");
assert_eq!(token1.token().expect("should have access token"), "accesstoken");
assert_eq!(token1, token2);
// Create a new authenticator. This authenticator does not share a cache
@@ -542,7 +542,7 @@ async fn test_memory_storage() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!(token3.access_token().expect("should have access token"), "accesstoken2");
assert_eq!(token3.token().expect("should have access token"), "accesstoken2");
}
#[tokio::test]
@@ -584,7 +584,7 @@ async fn test_disk_storage() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!(token1.access_token().expect("should have access token"), "accesstoken");
assert_eq!(token1.token().expect("should have access token"), "accesstoken");
assert_eq!(token1, token2);
}
@@ -606,7 +606,7 @@ async fn test_disk_storage() {
.token(&["https://googleapis.com/some/scope"])
.await
.expect("failed to get token");
assert_eq!(token1.access_token().expect("should have access token"), "accesstoken");
assert_eq!(token1.token().expect("should have access token"), "accesstoken");
assert_eq!(token1, token2);
}
@@ -638,22 +638,22 @@ async fn test_default_application_credentials_from_metadata_server() {
ApplicationDefaultCredentialsTypes::InstanceMetadata(auth) => auth.build().await.unwrap(),
_ => panic!("We are not testing service account adc model"),
};
let token = authenticator
let access_token = authenticator
.token(&["https://googleapis.com/some/scope"])
.await
.unwrap();
assert_eq!(token.as_str(), "accesstoken");
assert_eq!(access_token.token().expect("should have access token"), "accesstoken");
}
#[tokio::test]
async fn test_access_token() {
async fn test_token() {
let authenticator = AccessTokenAuthenticator::with_client("0815".to_string(), DefaultHyperClient)
.build()
.await
.unwrap();
let token = authenticator
let access_token = authenticator
.token(&["https://googleapis.com/some/scope"])
.await
.unwrap();
assert_eq!(token.as_str(), "0815".to_string());
assert_eq!(access_token.token().expect("should have access token"), "0815".to_string());
}