api: oauth issue 78: Update to ID Token draft 27

Yaniv Inbar · Yaniv Inbar · commit 0ce256f35bc5 · 2013-06-27T10:27:33.000-04:00
https://codereview.appspot.com/10688043/
diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
@@ -92,6 +92,19 @@
     <className>com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential</className>
     <method>com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential usingOAuth2(android.content.Context, java.lang.String, java.lang.String[])</method>
   </difference>
+  <!-- 7006 (Method Return Type changed): className, method, to (to is just the return type) -->
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/api/client/googleapis/auth/oauth2/GoogleIdToken$Payload</className>
+    <method>*</method>
+    <to>*</to>
+  </difference>
+  <!-- 7009 (Method is now Less Accessible): className, method -->
+  <difference>
+    <differenceType>7009</differenceType>
+    <className>com/google/api/client/googleapis/media/MediaHttpUploader</className>
+    <method>void serverErrorCallback()</method>
+  </difference>
   <!-- 8001 (Class removed): className -->
   <difference>
     <differenceType>8001</differenceType>
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
@@ -22,6 +22,7 @@
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.util.List;
 
 /**
  * {@link Beta} <br/>
@@ -85,6 +86,12 @@ public Payload getPayload() {
   /**
    * {@link Beta} <br/>
    * Google ID token payload.
+   *
+   * <p>
+   * Upgrade warning: in prior version 1.15 {@link #getAccessTokenHash()} and
+   * {@link #setAccessTokenHash(String)} accessed {@code "token_hash"}, but starting with version
+   * 1.16 they now access {@code "at_hash"}.
+   * </p>
    */
   @Beta
   public static class Payload extends IdToken.Payload {
@@ -97,10 +104,6 @@ public static class Payload extends IdToken.Payload {
     @Key("cid")
     private String issuee;
 
-    /** Hash of access token or {@code null} for none. */
-    @Key("token_hash")
-    private String accessTokenHash;
-
     /** Hosted domain name if asserted user is a domain managed user or {@code null} for none. */
     @Key("hd")
     private String hostedDomain;
@@ -138,17 +141,6 @@ public Payload setIssuee(String issuee) {
       return this;
     }
 
-    /** Returns the hash of access token or {@code null} for none. */
-    public String getAccessTokenHash() {
-      return accessTokenHash;
-    }
-
-    /** Sets the hash of access token or {@code null} for none. */
-    public Payload setAccessTokenHash(String accessTokenHash) {
-      this.accessTokenHash = accessTokenHash;
-      return this;
-    }
-
     /**
      * Returns the hosted domain name if asserted user is a domain managed user or {@code null} for
      * none.
@@ -220,6 +212,76 @@ public Payload setEmailVerified(boolean emailVerified) {
       return this;
     }
 
+    @Override
+    public Payload setAuthorizationTimeSeconds(Long authorizationTimeSeconds) {
+      return (Payload) super.setAuthorizationTimeSeconds(authorizationTimeSeconds);
+    }
+
+    @Override
+    public Payload setAuthorizedParty(String authorizedParty) {
+      return (Payload) super.setAuthorizedParty(authorizedParty);
+    }
+
+    @Override
+    public Payload setNonce(String nonce) {
+      return (Payload) super.setNonce(nonce);
+    }
+
+    @Override
+    public Payload setAccessTokenHash(String accessTokenHash) {
+      return (Payload) super.setAccessTokenHash(accessTokenHash);
+    }
+
+    @Override
+    public Payload setClassReference(String classReference) {
+      return (Payload) super.setClassReference(classReference);
+    }
+
+    @Override
+    public Payload setMethodsReferences(List<String> methodsReferences) {
+      return (Payload) super.setMethodsReferences(methodsReferences);
+    }
+
+    @Override
+    public Payload setExpirationTimeSeconds(Long expirationTimeSeconds) {
+      return (Payload) super.setExpirationTimeSeconds(expirationTimeSeconds);
+    }
+
+    @Override
+    public Payload setNotBeforeTimeSeconds(Long notBeforeTimeSeconds) {
+      return (Payload) super.setNotBeforeTimeSeconds(notBeforeTimeSeconds);
+    }
+
+    @Override
+    public Payload setIssuedAtTimeSeconds(Long issuedAtTimeSeconds) {
+      return (Payload) super.setIssuedAtTimeSeconds(issuedAtTimeSeconds);
+    }
+
+    @Override
+    public Payload setIssuer(String issuer) {
+      return (Payload) super.setIssuer(issuer);
+    }
+
+    @Override
+    public Payload setAudience(Object audience) {
+      return (Payload) super.setAudience(audience);
+    }
+
+    @Override
+    public Payload setJwtId(String jwtId) {
+      return (Payload) super.setJwtId(jwtId);
+    }
+
+    @Override
+    public Payload setType(String type) {
+      return (Payload) super.setType(type);
+    }
+
+    @Override
+    public Payload setSubject(String subject) {
+      return (Payload) super.setSubject(subject);
+    }
+
     @Override
     public Payload set(String fieldName, Object value) {
       return (Payload) super.set(fieldName, value);
