Browse Source

fix(dropbox-auth): In Electron.

j8
Hristo Terezov 6 years ago
parent
commit
55149670da

+ 6
- 0
modules/API/external/electronPopupsConfig.json View File

4
             "url": "accounts.google.com"
4
             "url": "accounts.google.com"
5
         },
5
         },
6
         "target": "electron"
6
         "target": "electron"
7
+    },
8
+    "dropbox-auth": {
9
+        "matchPatterns": {
10
+            "url": "dropbox.com/oauth2/authorize"
11
+        },
12
+        "target": "electron"
7
     }
13
     }
8
 }
14
 }

+ 2
- 4
react/features/dropbox/functions.web.js View File

23
     return new Promise(resolve => {
23
     return new Promise(resolve => {
24
         const popup = window.open(authUrl, windowName);
24
         const popup = window.open(authUrl, windowName);
25
 
25
 
26
-        gloabalNS.oauthCallbacks[windowName] = () => {
27
-            const returnURL = popup.location.href;
28
-
26
+        gloabalNS.oauthCallbacks[windowName] = url => {
29
             popup.close();
27
             popup.close();
30
             delete gloabalNS.oauthCallbacks.windowName;
28
             delete gloabalNS.oauthCallbacks.windowName;
31
-            resolve(returnURL);
29
+            resolve(url);
32
         };
30
         };
33
     });
31
     });
34
 }
32
 }

+ 1
- 1
static/oauth.html View File

16
                 if (globalNS.oauthCallbacks
16
                 if (globalNS.oauthCallbacks
17
                     && typeof globalNS.oauthCallbacks[windowName]
17
                     && typeof globalNS.oauthCallbacks[windowName]
18
                         === 'function') {
18
                         === 'function') {
19
-                    globalNS.oauthCallbacks[windowName]();
19
+                    globalNS.oauthCallbacks[windowName](window.location.href);
20
                 }
20
                 }
21
             }
21
             }
22
         })();
22
         })();

Loading…
Cancel
Save