Fix BadRequest errors when using DbxWebAuth and custom state (DbxWebAuth.Request.Builder.withState(..)).

Karl Rieb · Karl Rieb · commit 8d913c15c7eb · 2016-07-01T12:50:10.000-07:00
Fixes T103763
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,6 +1,7 @@
 2.0.7 (2016-06-20)
 ---------------------------------------------
 - Add configureRequest(..) method for simpler subclassing of OkHttpRequestor and OkHttp3Requestor.
+- Fix BadRequest error when adding custom state to a DbxWebAuth.Request object.
 
 2.0.6 (2016-06-20)
 ---------------------------------------------
diff --git a/src/main/java/com/dropbox/core/DbxAuthFinish.java b/src/main/java/com/dropbox/core/DbxAuthFinish.java
@@ -66,6 +66,19 @@ public String getUserId() {
         return urlState;
     }
 
+    /**
+     * State is not returned from /oauth2/token call, so we must
+     * append it after the JSON parsing.
+     *
+     * @param urlState Custom state passed into /oauth2/authorize
+     */
+    DbxAuthFinish withUrlState(/*@Nullable*/ String urlState) {
+        if (this.urlState != null) {
+            throw new IllegalStateException("Already have URL state.");
+        }
+        return new DbxAuthFinish(accessToken, userId, urlState);
+    }
+
     /**
      * For JSON parsing.
      */
diff --git a/src/main/java/com/dropbox/core/DbxWebAuth.java b/src/main/java/com/dropbox/core/DbxWebAuth.java
@@ -369,7 +369,7 @@ private DbxAuthFinish finish(String code) throws DbxException {
         return finish(code, null, null);
     }
 
-    private DbxAuthFinish finish(String code, String redirectUri, String state) throws DbxException {
+    private DbxAuthFinish finish(String code, String redirectUri, final String state) throws DbxException {
         if (code == null) throw new NullPointerException("code");
 
         Map<String, String> params = new HashMap<String, String>();
@@ -379,7 +379,6 @@ private DbxAuthFinish finish(String code, String redirectUri, String state) thro
 
         if (redirectUri != null) {
             params.put("redirect_uri", redirectUri);
-            params.put("state", state);
         }
 
         List<HttpRequestor.Header> headers = new ArrayList<HttpRequestor.Header>();
@@ -398,7 +397,8 @@ public DbxAuthFinish handle(HttpRequestor.Response response) throws DbxException
                     if (response.getStatusCode() != 200) {
                         throw DbxRequestUtil.unexpectedStatus(response);
                     }
-                    return DbxRequestUtil.readJsonFromResponse(DbxAuthFinish.Reader, response);
+                    return DbxRequestUtil.readJsonFromResponse(DbxAuthFinish.Reader, response)
+                        .withUrlState(state);
                 }
             }
         );

Original file line number	Diff line number	Diff line change
`@@ -369,7 +369,7 @@ private DbxAuthFinish finish(String code) throws DbxException {`
`369`	`369`	`return finish(code, null, null);`
`370`	`370`	`}`
`371`	`371`
`372`		`- private DbxAuthFinish finish(String code, String redirectUri, String state) throws DbxException {`
	`372`	`+ private DbxAuthFinish finish(String code, String redirectUri, final String state) throws DbxException {`
`373`	`373`	`if (code == null) throw new NullPointerException("code");`
`374`	`374`
`375`	`375`	`Map<String, String> params = new HashMap<String, String>();`
`@@ -379,7 +379,6 @@ private DbxAuthFinish finish(String code, String redirectUri, String state) thro`
`379`	`379`
`380`	`380`	`if (redirectUri != null) {`
`381`	`381`	`params.put("redirect_uri", redirectUri);`
`382`		`- params.put("state", state);`
`383`	`382`	`}`
`384`	`383`
`385`	`384`	`List<HttpRequestor.Header> headers = new ArrayList<HttpRequestor.Header>();`
`@@ -398,7 +397,8 @@ public DbxAuthFinish handle(HttpRequestor.Response response) throws DbxException`
`398`	`397`	`if (response.getStatusCode() != 200) {`
`399`	`398`	`throw DbxRequestUtil.unexpectedStatus(response);`
`400`	`399`	`}`
`401`		`- return DbxRequestUtil.readJsonFromResponse(DbxAuthFinish.Reader, response);`
	`400`	`+ return DbxRequestUtil.readJsonFromResponse(DbxAuthFinish.Reader, response)`
	`401`	`+ .withUrlState(state);`
`402`	`402`	`}`
`403`	`403`	`}`
`404`	`404`	`);`