Add getAccountId() to DbxAuthFinish.

jiuyangzhao · jiuyangzhao · commit 9153575b3c86 · 2018-01-11T16:33:08.000-08:00
diff --git a/examples/authorize/src/main/java/com/dropbox/core/examples/authorize/Main.java b/examples/authorize/src/main/java/com/dropbox/core/examples/authorize/Main.java
@@ -87,6 +87,7 @@ public static void main(String[] args) throws IOException {
 
         System.out.println("Authorization complete.");
         System.out.println("- User ID: " + authFinish.getUserId());
+        System.out.println("- Account ID: " + authFinish.getAccountId());
         System.out.println("- Access Token: " + authFinish.getAccessToken());
 
         // Save auth information to output file.
diff --git a/src/main/java/com/dropbox/core/DbxAuthFinish.java b/src/main/java/com/dropbox/core/DbxAuthFinish.java
@@ -21,6 +21,7 @@
 public final class DbxAuthFinish {
     private final String accessToken;
     private final String userId;
+    private final String accountId;
     private final /*@Nullable*/String urlState;
 
     /**
@@ -29,9 +30,10 @@ public final class DbxAuthFinish {
      * @param urlState State data passed in to {@link DbxWebAuth#start} or {@code null} if no state
      * was passed
      */
-    public DbxAuthFinish(String accessToken, String userId, /*@Nullable*/String urlState) {
+    public DbxAuthFinish(String accessToken, String userId, String accountId, /*@Nullable*/String urlState) {
         this.accessToken = accessToken;
         this.userId = userId;
+        this.accountId = accountId;
         this.urlState = urlState;
     }
 
@@ -47,14 +49,24 @@ public String getAccessToken() {
 
     /**
      * Returns the Dropbox user ID of the user who just approved your app for access to their
-     * Dropbox account.
+     * Dropbox account. We use user ID to identify user in API V1.
      *
      * @return Dropbox user ID of user that approved your app for access to their account
      */
     public String getUserId() {
         return userId;
     }
 
+    /**
+     * Returns the Dropbox account ID of the user who just approved your app for access to their
+     * Dropbox account. We use account ID to identify user in API V2.
+     *
+     * @return Dropbox account ID of user that approved your app for access to their account
+     */
+    public String getAccountId() {
+        return accountId;
+    }
+
     /**
      * Returns the state data you passed in to {@link DbxWebAuth#start}.  If you didn't pass
      * anything in, or you used {@link DbxWebAuthNoRedirect}, this will be {@code null}.
@@ -76,7 +88,7 @@ DbxAuthFinish withUrlState(/*@Nullable*/ String urlState) {
         if (this.urlState != null) {
             throw new IllegalStateException("Already have URL state.");
         }
-        return new DbxAuthFinish(accessToken, userId, urlState);
+        return new DbxAuthFinish(accessToken, userId, accountId, urlState);
     }
 
     /**
@@ -89,6 +101,7 @@ public DbxAuthFinish read(JsonParser parser) throws IOException, JsonReadExcepti
             String accessToken = null;
             String tokenType = null;
             String userId = null;
+            String accountId = null;
             String state = null;
 
             while (parser.getCurrentToken() == JsonToken.FIELD_NAME) {
@@ -105,6 +118,9 @@ else if (fieldName.equals("access_token")) {
                     else if (fieldName.equals("uid")) {
                         userId = JsonReader.StringReader.readField(parser, fieldName, userId);
                     }
+                    else if (fieldName.equals("account_id")) {
+                        accountId = JsonReader.StringReader.readField(parser, fieldName, accountId);
+                    }
                     else if (fieldName.equals("state")) {
                         state = JsonReader.StringReader.readField(parser, fieldName, state);
                     }
@@ -123,8 +139,9 @@ else if (fieldName.equals("state")) {
             if (tokenType == null) throw new JsonReadException("missing field \"token_type\"", top);
             if (accessToken == null) throw new JsonReadException("missing field \"access_token\"", top);
             if (userId == null) throw new JsonReadException("missing field \"uid\"", top);
+            if (accountId == null) throw new JsonReadException("missing field \"account_id\"", top);
 
-            return new DbxAuthFinish(accessToken, userId, state);
+            return new DbxAuthFinish(accessToken, userId, accountId, state);
         }
     };
 
diff --git a/src/test/java/com/dropbox/core/DbxWebAuthTest.java b/src/test/java/com/dropbox/core/DbxWebAuthTest.java
@@ -150,14 +150,17 @@ public void testFinishWithState() throws Exception {
 
         assertNotNull(sessionStore.get());
 
-        DbxAuthFinish expected = new DbxAuthFinish("test-access-token", "test-user-id", state);
+        DbxAuthFinish expected = new DbxAuthFinish(
+                "test-access-token", "test-user-id", "test", state
+        );
         ByteArrayOutputStream body = new ByteArrayOutputStream();
         ByteArrayInputStream responseStream = new ByteArrayInputStream(
             (
              "{" +
              "\"token_type\":\"Bearer\"" +
              ",\"access_token\":\"" + expected.getAccessToken() + "\"" +
              ",\"uid\":\"" + expected.getUserId() + "\"" +
+             ",\"account_id\":\"" + expected.getAccountId() + "\"" +
              "}"
             ).getBytes("UTF-8")
         );
