Skip to content

Add support for bearer token auth #3401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Sep 7, 2022
Merged

Add support for bearer token auth #3401

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d0ab07
Add support for bearer token auth
dagnir Sep 2, 2022
85799cd
Fix tests to account for new jitter
dagnir Sep 2, 2022
17d310e
Refactoring of Ssoidc Token test cases
joviegas Sep 5, 2022
2765cea
Refactoring of Ssoidc Token test cases
joviegas Sep 5, 2022
b84cfb6
Merge branch 'joviegas/feature/master/bearer-token-squashed' of githu…
joviegas Sep 5, 2022
5816fef
Handle None Type Request Auth after Bearer Token merge
joviegas Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix tests to account for new jitter
  • Loading branch information
@dagnir
dagnir committed Sep 2, 2022
commit 85799cd900e7972fb2f7e076442da8e8b20e2739
8 changes: 4 additions & 4 deletions .../test/java/software/amazon/awssdk/services/ssooidc/internal/SsoOidcTokenProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ public void token_is_retrieved_automatically_when_prefetch_time_is_set() throws
mockTokenManager.storeToken(cachedDiskToken);

when(ssoOidcClient.createToken(any(CreateTokenRequest.class)))
.thenReturn(getDefaultServiceResponse().accessToken("tokenGreaterThanStaleButLessThanPrefetch").expiresIn(200)
.thenReturn(getDefaultServiceResponse().accessToken("tokenGreaterThanStaleButLessThanPrefetch").expiresIn(1)
.build())
.thenReturn(getDefaultServiceResponse().accessToken("tokenVeryHighExpiry").expiresIn(20000).build());

Expand All @@ -424,14 +424,14 @@ public void token_is_retrieved_automatically_when_prefetch_time_is_set() throws
.build();

Thread.sleep(100);
verify(ssoOidcClient, times(1)).createToken(any(CreateTokenRequest.class));
SdkToken sdkToken = tokenProvider.resolveToken();
assertThat(sdkToken.token()).isEqualTo("tokenGreaterThanStaleButLessThanPrefetch");

Thread.sleep(100);
Thread.sleep(1000);
// Sleep to make sure Async prefetch thread gets picked up and it calls createToken to get new token.
verify(ssoOidcClient, times(2)).createToken(any(CreateTokenRequest.class));
verify(ssoOidcClient, times(1)).createToken(any(CreateTokenRequest.class));
SdkToken highExpiryDateToken = tokenProvider.resolveToken();
Thread.sleep(1000);
assertThat(highExpiryDateToken.token()).isEqualTo("tokenVeryHighExpiry");
}

Expand Down
3 changes: 2 additions & 1 deletion .../software/amazon/awssdk/services/ssooidc/internal/common/SsoOidcTokenRefreshTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public void tokenReadFromService_And_DiscCacheUpdate_whenTokenInCacheIsExpired()
}

@Test
public void tokenProvider_with_customStaleTime_refreshes_token() throws IOException {
public void tokenProvider_with_customStaleTime_refreshes_token() throws IOException, InterruptedException {

// Creating a token and saving to disc
OnDiskTokenManager onDiskTokenManager = OnDiskTokenManager.create(testSessionName);
Expand All @@ -160,6 +160,7 @@ public void tokenProvider_with_customStaleTime_refreshes_token() throws IOExcept
assertThat(loadedFromDiscAfterSecondRefresh).hasValue(firstResolvedToken);

// Resolve second time
Thread.sleep(1000);
SsoOidcToken secondResolvedToken = (SsoOidcToken) awsTokenProvider.resolveToken();
assert_oldCachedToken_isNoSameAs_NewResolvedToken(firstResolvedToken, secondResolvedToken);
loadedFromDiscAfterSecondRefresh = onDiskTokenManager.loadToken();
Expand Down