Merge pull request #117 from gcurtis/auth-state

Remove client ID and secret from connection state

Author: gcurtis

src/main/java/com/box/sdk/BoxAPIConnection.java

@@ -106,35 +106,14 @@ public BoxAPIConnection(String clientID, String clientSecret) {
      * Restores a BoxAPIConnection from a saved state.
      *
      * @see    #save
-     * @param  state the saved state that was created with {@link #save}.
-     * @return       a restored API connection.
-     */
-    public static BoxAPIConnection restore(String state) {
-        JsonObject json = JsonObject.readFrom(state);
-        String clientID = json.get("clientID").asString();
-        String clientSecret = json.get("clientSecret").asString();
-        String accessToken = json.get("accessToken").asString();
-        String refreshToken = json.get("refreshToken").asString();
-        long lastRefresh = json.get("lastRefresh").asLong();
-        long expires = json.get("expires").asLong();
-        String userAgent = json.get("userAgent").asString();
-        String tokenURL = json.get("tokenURL").asString();
-        String baseURL = json.get("baseURL").asString();
-        String baseUploadURL = json.get("baseUploadURL").asString();
-        boolean autoRefresh = json.get("autoRefresh").asBoolean();
-        int maxRequestAttempts = json.get("maxRequestAttempts").asInt();
-
-        BoxAPIConnection api = new BoxAPIConnection(clientID, clientSecret, accessToken, refreshToken);
-        api.accessToken = accessToken;
-        api.refreshToken = refreshToken;
-        api.lastRefresh = lastRefresh;
-        api.expires = expires;
-        api.userAgent = userAgent;
-        api.tokenURL = tokenURL;
-        api.baseURL = baseURL;
-        api.baseUploadURL = baseUploadURL;
-        api.autoRefresh = autoRefresh;
-        api.maxRequestAttempts = maxRequestAttempts;
+     * @param  clientID     the client ID to use with the connection.
+     * @param  clientSecret the client secret to use with the connection.
+     * @param  state        the saved state that was created with {@link #save}.
+     * @return              a restored API connection.
+     */
+    public static BoxAPIConnection restore(String clientID, String clientSecret, String state) {
+        BoxAPIConnection api = new BoxAPIConnection(clientID, clientSecret);
+        api.restore(state);
         return api;
     }
 
@@ -427,6 +406,37 @@ public void refresh() {
         this.refreshLock.writeLock().unlock();
     }
 
+    /**
+     * Restores a saved connection state into this BoxAPIConnection.
+     *
+     * @see    #save
+     * @param  state the saved state that was created with {@link #save}.
+     */
+    public void restore(String state) {
+        JsonObject json = JsonObject.readFrom(state);
+        String accessToken = json.get("accessToken").asString();
+        String refreshToken = json.get("refreshToken").asString();
+        long lastRefresh = json.get("lastRefresh").asLong();
+        long expires = json.get("expires").asLong();
+        String userAgent = json.get("userAgent").asString();
+        String tokenURL = json.get("tokenURL").asString();
+        String baseURL = json.get("baseURL").asString();
+        String baseUploadURL = json.get("baseUploadURL").asString();
+        boolean autoRefresh = json.get("autoRefresh").asBoolean();
+        int maxRequestAttempts = json.get("maxRequestAttempts").asInt();
+
+        this.accessToken = accessToken;
+        this.refreshToken = refreshToken;
+        this.lastRefresh = lastRefresh;
+        this.expires = expires;
+        this.userAgent = userAgent;
+        this.tokenURL = tokenURL;
+        this.baseURL = baseURL;
+        this.baseUploadURL = baseUploadURL;
+        this.autoRefresh = autoRefresh;
+        this.maxRequestAttempts = maxRequestAttempts;
+    }
+
     /**
      * Notifies a refresh event to all the listeners.
      */
@@ -485,8 +495,6 @@ public void setRequestInterceptor(RequestInterceptor interceptor) {
      */
     public String save() {
         JsonObject state = new JsonObject()
-            .add("clientID", this.clientID)
-            .add("clientSecret", this.clientSecret)
             .add("accessToken", this.accessToken)
             .add("refreshToken", this.refreshToken)
             .add("lastRefresh", this.lastRefresh)

src/test/java/com/box/sdk/BoxAPIConnectionTest.java

@@ -91,7 +91,7 @@ public void restoreConnectionThatDoesNotNeedRefresh() {
         api.setLastRefresh(System.currentTimeMillis());
         String state = api.save();
 
-        final BoxAPIConnection restoredAPI = BoxAPIConnection.restore(state);
+        final BoxAPIConnection restoredAPI = BoxAPIConnection.restore("fake client ID", "fake client secret", state);
         restoredAPI.setRequestInterceptor(new RequestInterceptor() {
             @Override
             public BoxAPIResponse onRequest(BoxAPIRequest request) {
@@ -203,7 +203,8 @@ public void successfullySavesAndRestoresConnection() {
             originalAccessToken, originalRefreshToken);
         String state = api.save();
 
-        BoxAPIConnection restoredAPI = BoxAPIConnection.restore(state);
+        BoxAPIConnection restoredAPI = BoxAPIConnection.restore(TestConfig.getClientID(), TestConfig.getClientSecret(),
+            state);
         BoxFolder.Info rootFolderInfo = BoxFolder.getRootFolder(restoredAPI).getInfo();
 
         TestConfig.setAccessToken(restoredAPI.getAccessToken());