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

rogebrd · web-flow · commit 8f18c6ddc6e8 · 2021-06-04T12:26:16.000-04:00
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);
+        });
     });
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -130,10 +130,12 @@ export default class DropboxPopup {`
`130`	`130`	`});`
`131`	`131`	`}`
`132`	`132`
`133`		`- const authUrl = popup.authObject.getAuthenticationUrl(popup.redirectUri, popup.state, 'code', popup.tokenAccessType, popup.scope, popup.includeGrantedScopes, popup.usePKCE);`
`134`		`- const popupWindow = window.open(authUrl, windowName, popup.windowOptions);`
`135`		`- popupWindow.focus();`
`136`		`- window.addEventListener('message', handleRedirect, false);`
	`133`	`+ popup.authObject.getAuthenticationUrl(popup.redirectUri, popup.state, 'code', popup.tokenAccessType, popup.scope, popup.includeGrantedScopes, popup.usePKCE)`
	`134`	`+ .then((authUrl) => {`
	`135`	`+ const popupWindow = window.open(authUrl, windowName, popup.windowOptions);`
	`136`	`+ popupWindow.focus();`
	`137`	`+ window.addEventListener('message', handleRedirect, false);`
	`138`	`+ });`
`137`	`139`	`});`
`138`	`140`	`}`
`139`	`141`	`}`