Upgrade Dropbox dependency to 9.9.0 and support new promise based urls (

#163)
rogebrd · Jun 4, 2021 · 8f18c6d · 8f18c6d
1 parent cfc780e
commit 8f18c6d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/examples/browser.html b/examples/browser.html
@@ -5,20 +5,17 @@
     <script src="https://cdn.jsdelivr.net/npm/promise-polyfill@7/dist/polyfill.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/fetch/2.0.3/fetch.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/dropbox/dist/Dropbox-sdk.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/dropbox-oauth-popup@2.0.1/dist/dropboxPopup.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/dropbox-oauth-popup@3.0.0/dist/dropboxPopup.js"></script>
 </head>
 
 <body>
     <div>
         <h1>Dropbox OAuth Popup Window</h1>
         <p>
-            See the Dropbox OAuth Popup Window in action by clicking the run example button.
-            This example will authenticate with your Dropbox account and use the token to fetch
-            the current account using the `users.getCurrentAccount` endpoint. (Note, nothing is
-            saved, this is just a demo.)
+            See the Dropbox OAuth Popup Window in action by clicking the run example button. This example will authenticate with your Dropbox account and use the token to fetch the current account using the `users.getCurrentAccount` endpoint. (Note, nothing is saved,
+            this is just a demo.)
         </p>
-        <p>See the code on <a
-                href="https://github.com/rogebrd/dropbox-oauth-popup/blob/main/examples/browser.html">GitHub</a></p>
+        <p>See the code on <a href="https://github.com/rogebrd/dropbox-oauth-popup/blob/main/examples/browser.html">GitHub</a></p>
         <button onclick="runAuth()">Run Example</button>
         <p id="result"></p>
         <script>
@@ -27,6 +24,7 @@ <h1>Dropbox OAuth Popup Window</h1>
                 clientSecret: 'tbjemcamktbyiy9',
                 redirectUri: 'https://rogebrd.github.io/dropbox-oauth-popup/tutorial-browser.html'
             });
+
             function runAuth() {
                 document.getElementById("result").innerHTML = "Waiting for auth...";
                 popup.authUser().then((auth) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dropbox-oauth-popup",
-  "version": "2.0.2",
+  "version": "3.0.0",
   "registry": "npm",
   "description": "This is a simple addition built onto the Dropbox SDK that allows for OAuth in the browser to be done via a popup window.",
   "homepage": "https://github.com/rogebrd/dropbox-oauth-popup",
@@ -30,7 +30,7 @@
     "rollup-plugin-terser": "^7.0.2"
   },
   "dependencies": {
-    "dropbox": "^7.0.0"
+    "dropbox": "^9.8.0"
   },
   "browserslist": [
     "> 0.25%",
@@ -58,4 +58,4 @@
     "front-end",
     "window"
   ]
-}
+}
diff --git a/src/dropboxPopup.js b/src/dropboxPopup.js
@@ -130,10 +130,12 @@ export default class DropboxPopup {
           });
       }
 
-      const authUrl = popup.authObject.getAuthenticationUrl(popup.redirectUri, popup.state, 'code', popup.tokenAccessType, popup.scope, popup.includeGrantedScopes, popup.usePKCE);
-      const popupWindow = window.open(authUrl, windowName, popup.windowOptions);
-      popupWindow.focus();
-      window.addEventListener('message', handleRedirect, false);
+      popup.authObject.getAuthenticationUrl(popup.redirectUri, popup.state, 'code', popup.tokenAccessType, popup.scope, popup.includeGrantedScopes, popup.usePKCE)
+        .then((authUrl) => {
+          const popupWindow = window.open(authUrl, windowName, popup.windowOptions);
+          popupWindow.focus();
+          window.addEventListener('message', handleRedirect, false);
+        });
     });
   }
 }