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: Not loosing the access token when calling UserCredentials#ToBuil… #993

Merged
merged 6 commits into from
Dec 2, 2022
Merged

Fix: Not loosing the access token when calling UserCredentials#ToBuil… #993

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
7783d1a
#992 Not loosing the access token when calling UserCredentials#ToBuil…
qcastel Sep 7, 2022
be45e01
#992 Implement comments and add some builder setters which were missing
qcastel Sep 8, 2022
ce81cb0
Update oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTe…
qcastel Oct 28, 2022
166c0e6
Merge branch 'main' into bugfix/992-fix-usercredentials-builder
qcastel Oct 28, 2022
6a4ab31
Merge branch 'main' into bugfix/992-fix-usercredentials-builder
TimurSadykov Dec 2, 2022
50b593e
lint fixes
TimurSadykov Dec 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions oauth2_http/java/com/google/auth/oauth2/UserCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,7 @@ public static class Builder extends GoogleCredentials.Builder {
protected Builder() {}

protected Builder(UserCredentials credentials) {
super(credentials);
this.clientId = credentials.clientId;
this.clientSecret = credentials.clientSecret;
this.refreshToken = credentials.refreshToken;
Expand Down
21 changes: 21 additions & 0 deletions oauth2_http/javatests/com/google/auth/oauth2/UserCredentialsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,27 @@ public void IdTokenCredentials_NoUserEmailScope_throws() throws IOException {
}
}

@Test
public void toBuilder() throws IOException {
qcastel marked this conversation as resolved.
Show resolved Hide resolved
final URI tokenServer1 = URI.create("https://foo1.com/bar");
AccessToken accessToken = new AccessToken(ACCESS_TOKEN, null);
MockHttpTransportFactory httpTransportFactory = new MockHttpTransportFactory();
UserCredentials credentials =
UserCredentials.newBuilder()
.setClientId(CLIENT_ID)
.setClientSecret(CLIENT_SECRET)
.setRefreshToken(REFRESH_TOKEN)
.setAccessToken(accessToken)
.setHttpTransportFactory(httpTransportFactory)
.setTokenServerUri(tokenServer1)
.build();

credentials.toBuilder().build();
qcastel marked this conversation as resolved.
Show resolved Hide resolved
UserCredentials otherCredentials = credentials.toBuilder().build();
assertEquals(credentials, otherCredentials);
}

qcastel marked this conversation as resolved.
Show resolved Hide resolved

static GenericJson writeUserJson(
String clientId, String clientSecret, String refreshToken, String quotaProjectId) {
GenericJson json = new GenericJson();
Expand Down