|
@@ -2,8 +2,6 @@
|
2
|
2
|
|
3
|
3
|
import { Dropbox, DropboxAuth } from 'dropbox';
|
4
|
4
|
|
5
|
|
-import { getJitsiMeetGlobalNS } from '../base/util';
|
6
|
|
-
|
7
|
5
|
/**
|
8
|
6
|
* Executes the oauth flow.
|
9
|
7
|
*
|
|
@@ -12,18 +10,22 @@ import { getJitsiMeetGlobalNS } from '../base/util';
|
12
|
10
|
*/
|
13
|
11
|
function authorize(authUrl: string): Promise<string> {
|
14
|
12
|
const windowName = `oauth${Date.now()}`;
|
15
|
|
- const gloabalNS = getJitsiMeetGlobalNS();
|
16
|
|
-
|
17
|
|
- gloabalNS.oauthCallbacks = gloabalNS.oauthCallbacks || {};
|
18
|
13
|
|
19
|
14
|
return new Promise(resolve => {
|
20
|
|
- const popup = window.open(authUrl, windowName);
|
21
|
|
-
|
22
|
|
- gloabalNS.oauthCallbacks[windowName] = url => {
|
23
|
|
- popup.close();
|
24
|
|
- delete gloabalNS.oauthCallbacks.windowName;
|
25
|
|
- resolve(url);
|
|
15
|
+ // eslint-disable-next-line prefer-const
|
|
16
|
+ let popup;
|
|
17
|
+ const handleAuth = ({ data }) => {
|
|
18
|
+ if (data && data.type === 'dropbox-login' && data.windowName === windowName) {
|
|
19
|
+ if (popup) {
|
|
20
|
+ popup.close();
|
|
21
|
+ }
|
|
22
|
+ window.removeEventListener('message', handleAuth);
|
|
23
|
+ resolve(data.url);
|
|
24
|
+ }
|
26
|
25
|
};
|
|
26
|
+
|
|
27
|
+ window.addEventListener('message', handleAuth);
|
|
28
|
+ popup = window.open(authUrl, windowName);
|
27
|
29
|
});
|
28
|
30
|
}
|
29
|
31
|
|