Correctly recognize cancellation of Dropbox login

lurchmath · Sep 7, 2017 · b02cc13 · b02cc13
1 parent 7cbaa6a
commit b02cc13
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -47,7 +47,7 @@ two functions, about half way through [cloud-storage.js](cloud-storage.js).
 
 ## Status
 
-There are several things that need to be improved about this project.
+There are a few things that need to be improved about this project.
 See [the to-do list](TODO.md) for details.
 
 ## License

diff --git a/TODO.md b/TODO.md
@@ -19,9 +19,3 @@ I list them in this file.
     * In that same HTML file you will find the IDs for the files list and
       buttons footer.
     * Other tidbits appear in the existing [dialog.css](dialog.css) file.
-
-## Missing pieces
-
- * The [Dropbox back end](dropbox-backend.js) does not call the failure
-   callback if the user cancels the login.  I don't yet know how to do this.
-   Figure out how and call the failure callback in such cases.
diff --git a/dropbox-backend.js b/dropbox-backend.js
@@ -55,10 +55,14 @@ DropboxFileSystem.prototype.getAccess = function ( successCB, failureCB )
                 if ( command == 'dialogLogin' ) {
                     loginWindow.close();
                     that.accountData = message.shift();
-                    that.dropbox = new Dropbox( {
-                        accessToken : that.accountData.access_token
-                    } );
-                    successCB();
+                    if ( that.accountData.access_token ) {
+                        that.dropbox = new Dropbox( {
+                            accessToken : that.accountData.access_token
+                        } );
+                        successCB();
+                    } else {
+                        failureCB( that.accountData );
+                    }
                 }
             } catch ( e ) { }
         } );

diff --git a/dropbox-login.html b/dropbox-login.html
@@ -99,7 +99,7 @@
              * use that information to access the user's Dropbox.
              */
             var hashData = parseQueryString( window.location.hash );
-            if ( hashData.access_token )
+            if ( hashData.access_token || hashData.error )
                 window.opener.postMessage(
                     JSON.stringify( [ 'dialogLogin', hashData ] ), '*' );
         </script>