Skip to content

Support Google's new issuer that includes scheme #982

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
ejona86 merged 1 commit into from
Nov 9, 2015
Merged

Support Google's new issuer that includes scheme #982

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ...ent/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.io.IOException;
import java.security.GeneralSecurityException;
import java.security.PublicKey;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;

Expand Down Expand Up @@ -158,7 +159,7 @@ public final long getExpirationTimeMilliseconds() {
* the public certificate endpoint.</li>
* <li>The current time against the issued at and expiration time (allowing for a 5 minute clock
* skew).</li>
* <li>The issuer is {@code "accounts.google.com"}.</li>
* <li>The issuer is {@code "accounts.google.com"} or {@code "https://accounts.google.com"}.</li>
* </ul>
*
* @param googleIdToken Google ID token
Expand Down Expand Up @@ -241,7 +242,7 @@ public Builder(HttpTransport transport, JsonFactory jsonFactory) {
*/
public Builder(GooglePublicKeysManager publicKeys) {
this.publicKeys = Preconditions.checkNotNull(publicKeys);
setIssuer("accounts.google.com");
setIssuers(Arrays.asList("accounts.google.com", "https://accounts.google.com"));
}

/** Builds a new instance of {@link GoogleIdTokenVerifier}. */
Expand Down Expand Up @@ -311,6 +312,11 @@ public Builder setIssuer(String issuer) {
return (Builder) super.setIssuer(issuer);
}

@Override
public Builder setIssuers(Collection<String> issuers) {
return (Builder) super.setIssuers(issuers);
}

@Override
public Builder setAudience(Collection<String> audience) {
return (Builder) super.setAudience(audience);
Expand Down