Skip to content
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

Jump to bottom

fix: bearer token in oauth2 UserInfo flow #2924

Merged
merged 2 commits into from
Jun 13, 2024
Merged

fix: bearer token in oauth2 UserInfo flow #2924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4db3af
fix: user bearer token in oauth2 userinfo flow
strehle Jun 12, 2024
c401ddf
Test fixed
strehle Jun 12, 2024
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
2 changes: 1 addition & 1 deletion ...java/org/cloudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ protected Map<String, Object> getClaimsFromToken(String idToken,
RawExternalOAuthIdentityProviderDefinition narrowedConfig = (RawExternalOAuthIdentityProviderDefinition) config;

HttpHeaders headers = new HttpHeaders();
headers.add("Authorization", "token " + idToken);
headers.add("Authorization", "Bearer " + idToken);
headers.add("Accept", "application/json");

URI requestUri;
Expand Down
4 changes: 1 addition & 3 deletions ...loudfoundry/identity/uaa/provider/oauth/ExternalOAuthAuthenticationManagerGithubTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@
import org.cloudfoundry.identity.uaa.util.TimeServiceImpl;
import org.cloudfoundry.identity.uaa.zone.IdentityZone;
import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
import org.hamcrest.MatcherAssert;
import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -137,7 +135,7 @@ public void getExternalAuthenticationDetails_doesNotThrowWhenIdTokenIsValid() {
mockGithubServer.expect(method(GET))
.andExpect(requestTo(USER_INFO_URL))
.andExpect(header(ACCEPT, APPLICATION_JSON_VALUE))
.andExpect(header(AUTHORIZATION, "token " + accessToken))
.andExpect(header(AUTHORIZATION, "Bearer " + accessToken))
.andRespond(withSuccess(userInfoResponse, APPLICATION_JSON));

ExternalOAuthCodeToken oauth2Authentication = new ExternalOAuthCodeToken(null, origin, "http://uaa.example.com/login/callback/github", idToken, "accesstoken", "signedrequest");
Expand Down
Loading