@jbrowse/plugin-authentication 2.3.4 → 2.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/OAuthModel/model.js +5 -19
- package/dist/OAuthModel/model.js.map +1 -1
- package/dist/index.d.ts +5 -6
- package/dist/index.js +15 -10
- package/dist/index.js.map +1 -1
- package/esm/OAuthModel/model.js +5 -19
- package/esm/OAuthModel/model.js.map +1 -1
- package/esm/index.d.ts +5 -6
- package/esm/index.js +5 -1
- package/esm/index.js.map +1 -1
- package/package.json +2 -2
- package/src/OAuthModel/model.tsx +5 -20
- package/src/index.ts +22 -11
package/dist/OAuthModel/model.js
CHANGED
|
@@ -34,16 +34,6 @@ const jwt_decode_1 = __importDefault(require("jwt-decode"));
|
|
|
34
34
|
function fixup(buf) {
|
|
35
35
|
return buf.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
|
|
36
36
|
}
|
|
37
|
-
function getGlobalObject() {
|
|
38
|
-
// Based on window-or-global
|
|
39
|
-
// https://github.com/purposeindustries/window-or-global/blob/322abc71de0010c9e5d9d0729df40959e1ef8775/lib/index.js
|
|
40
|
-
return (
|
|
41
|
-
// eslint-disable-next-line no-restricted-globals
|
|
42
|
-
(typeof self === 'object' && self.self === self && self) ||
|
|
43
|
-
(typeof global === 'object' && global.global === global && global) ||
|
|
44
|
-
// @ts-ignore
|
|
45
|
-
this);
|
|
46
|
-
}
|
|
47
37
|
const stateModelFactory = (configSchema) => {
|
|
48
38
|
return models_1.InternetAccount.named('OAuthInternetAccount')
|
|
49
39
|
.props({
|
|
@@ -57,9 +47,8 @@ const stateModelFactory = (configSchema) => {
|
|
|
57
47
|
if (codeVerifier) {
|
|
58
48
|
return codeVerifier;
|
|
59
49
|
}
|
|
60
|
-
const global = getGlobalObject();
|
|
61
50
|
const array = new Uint8Array(32);
|
|
62
|
-
|
|
51
|
+
globalThis.crypto.getRandomValues(array);
|
|
63
52
|
codeVerifier = fixup(Buffer.from(array).toString('base64'));
|
|
64
53
|
return codeVerifier;
|
|
65
54
|
},
|
|
@@ -217,12 +206,9 @@ const stateModelFactory = (configSchema) => {
|
|
|
217
206
|
return resolve(token);
|
|
218
207
|
}
|
|
219
208
|
catch (error) {
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
else {
|
|
224
|
-
return reject(new Error(String(error)));
|
|
225
|
-
}
|
|
209
|
+
return error instanceof Error
|
|
210
|
+
? reject(error)
|
|
211
|
+
: reject(new Error(String(error)));
|
|
226
212
|
}
|
|
227
213
|
}
|
|
228
214
|
if (redirectUriWithInfo.includes('access_denied')) {
|
|
@@ -295,7 +281,7 @@ const stateModelFactory = (configSchema) => {
|
|
|
295
281
|
},
|
|
296
282
|
async validateToken(token, location) {
|
|
297
283
|
const decoded = (0, jwt_decode_1.default)(token);
|
|
298
|
-
if (decoded.exp && decoded.exp <
|
|
284
|
+
if (decoded.exp && decoded.exp < Date.now() / 1000) {
|
|
299
285
|
const refreshToken = self.hasRefreshToken && self.retrieveRefreshToken();
|
|
300
286
|
if (refreshToken) {
|
|
301
287
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/OAuthModel/model.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6E;AAC7E,uEAA4E;AAC5E,6CAA4D;AAC5D,qDAAiD;AACjD,4DAAkD;AAgBlD,SAAS,KAAK,CAAC,GAAW;IACxB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AACtE,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/OAuthModel/model.tsx"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import Plugin from '@jbrowse/core/Plugin';
|
|
3
3
|
import PluginManager from '@jbrowse/core/PluginManager';
|
|
4
|
-
import { configSchema as OAuthConfigSchema, modelFactory as OAuthInternetAccountModelFactory } from './OAuthModel';
|
|
5
|
-
import { configSchema as ExternalTokenConfigSchema, modelFactory as ExternalTokenInternetAccountModelFactory } from './ExternalTokenModel';
|
|
6
|
-
import { configSchema as HTTPBasicConfigSchema, modelFactory as HTTPBasicInternetAccountModelFactory } from './HTTPBasicModel';
|
|
7
|
-
import { configSchema as DropboxOAuthConfigSchema, modelFactory as DropboxOAuthInternetAccountModelFactory } from './DropboxOAuthModel';
|
|
8
|
-
import { configSchema as GoogleDriveOAuthConfigSchema, modelFactory as GoogleDriveOAuthInternetAccountModelFactory } from './GoogleDriveOAuthModel';
|
|
9
4
|
export default class AuthenticationPlugin extends Plugin {
|
|
10
5
|
name: string;
|
|
11
6
|
exports: {
|
|
@@ -396,4 +391,8 @@ export default class AuthenticationPlugin extends Plugin {
|
|
|
396
391
|
};
|
|
397
392
|
install(pluginManager: PluginManager): void;
|
|
398
393
|
}
|
|
399
|
-
export {
|
|
394
|
+
export { configSchema as OAuthConfigSchema, modelFactory as OAuthInternetAccountModelFactory, } from './OAuthModel';
|
|
395
|
+
export { configSchema as ExternalTokenConfigSchema, modelFactory as ExternalTokenInternetAccountModelFactory, } from './ExternalTokenModel';
|
|
396
|
+
export { configSchema as HTTPBasicConfigSchema, modelFactory as HTTPBasicInternetAccountModelFactory, } from './HTTPBasicModel';
|
|
397
|
+
export { configSchema as DropboxOAuthConfigSchema, modelFactory as DropboxOAuthInternetAccountModelFactory, } from './DropboxOAuthModel';
|
|
398
|
+
export { configSchema as GoogleDriveOAuthConfigSchema, modelFactory as GoogleDriveOAuthInternetAccountModelFactory, } from './GoogleDriveOAuthModel';
|
package/dist/index.js
CHANGED
|
@@ -7,20 +7,10 @@ exports.GoogleDriveOAuthInternetAccountModelFactory = exports.GoogleDriveOAuthCo
|
|
|
7
7
|
const Plugin_1 = __importDefault(require("@jbrowse/core/Plugin"));
|
|
8
8
|
const InternetAccountType_1 = __importDefault(require("@jbrowse/core/pluggableElementTypes/InternetAccountType"));
|
|
9
9
|
const OAuthModel_1 = require("./OAuthModel");
|
|
10
|
-
Object.defineProperty(exports, "OAuthConfigSchema", { enumerable: true, get: function () { return OAuthModel_1.configSchema; } });
|
|
11
|
-
Object.defineProperty(exports, "OAuthInternetAccountModelFactory", { enumerable: true, get: function () { return OAuthModel_1.modelFactory; } });
|
|
12
10
|
const ExternalTokenModel_1 = require("./ExternalTokenModel");
|
|
13
|
-
Object.defineProperty(exports, "ExternalTokenConfigSchema", { enumerable: true, get: function () { return ExternalTokenModel_1.configSchema; } });
|
|
14
|
-
Object.defineProperty(exports, "ExternalTokenInternetAccountModelFactory", { enumerable: true, get: function () { return ExternalTokenModel_1.modelFactory; } });
|
|
15
11
|
const HTTPBasicModel_1 = require("./HTTPBasicModel");
|
|
16
|
-
Object.defineProperty(exports, "HTTPBasicConfigSchema", { enumerable: true, get: function () { return HTTPBasicModel_1.configSchema; } });
|
|
17
|
-
Object.defineProperty(exports, "HTTPBasicInternetAccountModelFactory", { enumerable: true, get: function () { return HTTPBasicModel_1.modelFactory; } });
|
|
18
12
|
const DropboxOAuthModel_1 = require("./DropboxOAuthModel");
|
|
19
|
-
Object.defineProperty(exports, "DropboxOAuthConfigSchema", { enumerable: true, get: function () { return DropboxOAuthModel_1.configSchema; } });
|
|
20
|
-
Object.defineProperty(exports, "DropboxOAuthInternetAccountModelFactory", { enumerable: true, get: function () { return DropboxOAuthModel_1.modelFactory; } });
|
|
21
13
|
const GoogleDriveOAuthModel_1 = require("./GoogleDriveOAuthModel");
|
|
22
|
-
Object.defineProperty(exports, "GoogleDriveOAuthConfigSchema", { enumerable: true, get: function () { return GoogleDriveOAuthModel_1.configSchema; } });
|
|
23
|
-
Object.defineProperty(exports, "GoogleDriveOAuthInternetAccountModelFactory", { enumerable: true, get: function () { return GoogleDriveOAuthModel_1.modelFactory; } });
|
|
24
14
|
class AuthenticationPlugin extends Plugin_1.default {
|
|
25
15
|
constructor() {
|
|
26
16
|
super(...arguments);
|
|
@@ -77,4 +67,19 @@ class AuthenticationPlugin extends Plugin_1.default {
|
|
|
77
67
|
}
|
|
78
68
|
}
|
|
79
69
|
exports.default = AuthenticationPlugin;
|
|
70
|
+
var OAuthModel_2 = require("./OAuthModel");
|
|
71
|
+
Object.defineProperty(exports, "OAuthConfigSchema", { enumerable: true, get: function () { return OAuthModel_2.configSchema; } });
|
|
72
|
+
Object.defineProperty(exports, "OAuthInternetAccountModelFactory", { enumerable: true, get: function () { return OAuthModel_2.modelFactory; } });
|
|
73
|
+
var ExternalTokenModel_2 = require("./ExternalTokenModel");
|
|
74
|
+
Object.defineProperty(exports, "ExternalTokenConfigSchema", { enumerable: true, get: function () { return ExternalTokenModel_2.configSchema; } });
|
|
75
|
+
Object.defineProperty(exports, "ExternalTokenInternetAccountModelFactory", { enumerable: true, get: function () { return ExternalTokenModel_2.modelFactory; } });
|
|
76
|
+
var HTTPBasicModel_2 = require("./HTTPBasicModel");
|
|
77
|
+
Object.defineProperty(exports, "HTTPBasicConfigSchema", { enumerable: true, get: function () { return HTTPBasicModel_2.configSchema; } });
|
|
78
|
+
Object.defineProperty(exports, "HTTPBasicInternetAccountModelFactory", { enumerable: true, get: function () { return HTTPBasicModel_2.modelFactory; } });
|
|
79
|
+
var DropboxOAuthModel_2 = require("./DropboxOAuthModel");
|
|
80
|
+
Object.defineProperty(exports, "DropboxOAuthConfigSchema", { enumerable: true, get: function () { return DropboxOAuthModel_2.configSchema; } });
|
|
81
|
+
Object.defineProperty(exports, "DropboxOAuthInternetAccountModelFactory", { enumerable: true, get: function () { return DropboxOAuthModel_2.modelFactory; } });
|
|
82
|
+
var GoogleDriveOAuthModel_2 = require("./GoogleDriveOAuthModel");
|
|
83
|
+
Object.defineProperty(exports, "GoogleDriveOAuthConfigSchema", { enumerable: true, get: function () { return GoogleDriveOAuthModel_2.configSchema; } });
|
|
84
|
+
Object.defineProperty(exports, "GoogleDriveOAuthInternetAccountModelFactory", { enumerable: true, get: function () { return GoogleDriveOAuthModel_2.modelFactory; } });
|
|
80
85
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAyC;AAEzC,kHAAyF;AACzF,6CAGqB;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAyC;AAEzC,kHAAyF;AACzF,6CAGqB;AACrB,6DAG6B;AAC7B,qDAGyB;AACzB,2DAG4B;AAC5B,mEAGgC;AAEhC,MAAqB,oBAAqB,SAAQ,gBAAM;IAAxD;;QACE,SAAI,GAAG,sBAAsB,CAAA;QAE7B,YAAO,GAAG;YACR,iBAAiB,EAAjB,yBAAiB;YACjB,gCAAgC,EAAhC,yBAAgC;YAChC,yBAAyB,EAAzB,iCAAyB;YACzB,wCAAwC,EAAxC,iCAAwC;YACxC,qBAAqB,EAArB,6BAAqB;YACrB,oCAAoC,EAApC,6BAAoC;YACpC,wBAAwB,EAAxB,gCAAwB;YACxB,uCAAuC,EAAvC,gCAAuC;YACvC,4BAA4B,EAA5B,oCAA4B;YAC5B,2CAA2C,EAA3C,oCAA2C;SAC5C,CAAA;IA6CH,CAAC;IA3CC,OAAO,CAAC,aAA4B;QAClC,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,6BAAmB,CAAC;gBAC7B,IAAI,EAAE,sBAAsB;gBAC5B,YAAY,EAAE,yBAAiB;gBAC/B,UAAU,EAAE,IAAA,yBAAgC,EAAC,yBAAiB,CAAC;aAChE,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,6BAAmB,CAAC;gBAC7B,IAAI,EAAE,8BAA8B;gBACpC,YAAY,EAAE,iCAAyB;gBACvC,UAAU,EAAE,IAAA,iCAAwC,EAClD,iCAAyB,CAC1B;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,6BAAmB,CAAC;gBAC7B,IAAI,EAAE,0BAA0B;gBAChC,YAAY,EAAE,6BAAqB;gBACnC,UAAU,EAAE,IAAA,6BAAoC,EAAC,6BAAqB,CAAC;aACxE,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,6BAAmB,CAAC;gBAC7B,IAAI,EAAE,6BAA6B;gBACnC,YAAY,EAAE,gCAAwB;gBACtC,UAAU,EAAE,IAAA,gCAAuC,EACjD,gCAAwB,CACzB;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,6BAAmB,CAAC;gBAC7B,IAAI,EAAE,iCAAiC;gBACvC,YAAY,EAAE,oCAA4B;gBAC1C,UAAU,EAAE,IAAA,oCAA2C,EACrD,oCAA4B,CAC7B;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AA3DD,uCA2DC;AAED,2CAGqB;AAFnB,+GAAA,YAAY,OAAqB;AACjC,8HAAA,YAAY,OAAoC;AAElD,2DAG6B;AAF3B,+HAAA,YAAY,OAA6B;AACzC,8IAAA,YAAY,OAA4C;AAG1D,mDAGyB;AAFvB,uHAAA,YAAY,OAAyB;AACrC,sIAAA,YAAY,OAAwC;AAGtD,yDAG4B;AAF1B,6HAAA,YAAY,OAA4B;AACxC,4IAAA,YAAY,OAA2C;AAGzD,iEAGgC;AAF9B,qIAAA,YAAY,OAAgC;AAC5C,oJAAA,YAAY,OAA+C"}
|
package/esm/OAuthModel/model.js
CHANGED
|
@@ -6,16 +6,6 @@ import jwtDecode from 'jwt-decode';
|
|
|
6
6
|
function fixup(buf) {
|
|
7
7
|
return buf.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
|
|
8
8
|
}
|
|
9
|
-
function getGlobalObject() {
|
|
10
|
-
// Based on window-or-global
|
|
11
|
-
// https://github.com/purposeindustries/window-or-global/blob/322abc71de0010c9e5d9d0729df40959e1ef8775/lib/index.js
|
|
12
|
-
return (
|
|
13
|
-
// eslint-disable-next-line no-restricted-globals
|
|
14
|
-
(typeof self === 'object' && self.self === self && self) ||
|
|
15
|
-
(typeof global === 'object' && global.global === global && global) ||
|
|
16
|
-
// @ts-ignore
|
|
17
|
-
this);
|
|
18
|
-
}
|
|
19
9
|
const stateModelFactory = (configSchema) => {
|
|
20
10
|
return InternetAccount.named('OAuthInternetAccount')
|
|
21
11
|
.props({
|
|
@@ -29,9 +19,8 @@ const stateModelFactory = (configSchema) => {
|
|
|
29
19
|
if (codeVerifier) {
|
|
30
20
|
return codeVerifier;
|
|
31
21
|
}
|
|
32
|
-
const global = getGlobalObject();
|
|
33
22
|
const array = new Uint8Array(32);
|
|
34
|
-
|
|
23
|
+
globalThis.crypto.getRandomValues(array);
|
|
35
24
|
codeVerifier = fixup(Buffer.from(array).toString('base64'));
|
|
36
25
|
return codeVerifier;
|
|
37
26
|
},
|
|
@@ -189,12 +178,9 @@ const stateModelFactory = (configSchema) => {
|
|
|
189
178
|
return resolve(token);
|
|
190
179
|
}
|
|
191
180
|
catch (error) {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
else {
|
|
196
|
-
return reject(new Error(String(error)));
|
|
197
|
-
}
|
|
181
|
+
return error instanceof Error
|
|
182
|
+
? reject(error)
|
|
183
|
+
: reject(new Error(String(error)));
|
|
198
184
|
}
|
|
199
185
|
}
|
|
200
186
|
if (redirectUriWithInfo.includes('access_denied')) {
|
|
@@ -267,7 +253,7 @@ const stateModelFactory = (configSchema) => {
|
|
|
267
253
|
},
|
|
268
254
|
async validateToken(token, location) {
|
|
269
255
|
const decoded = jwtDecode(token);
|
|
270
|
-
if (decoded.exp && decoded.exp <
|
|
256
|
+
if (decoded.exp && decoded.exp < Date.now() / 1000) {
|
|
271
257
|
const refreshToken = self.hasRefreshToken && self.retrieveRefreshToken();
|
|
272
258
|
if (refreshToken) {
|
|
273
259
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/OAuthModel/model.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAA;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAA;AAC5E,OAAO,EAAE,UAAU,EAAe,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAY,KAAK,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,SAAyB,MAAM,YAAY,CAAA;AAgBlD,SAAS,KAAK,CAAC,GAAW;IACxB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;AACtE,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../../src/OAuthModel/model.tsx"],"names":[],"mappings":"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"}
|
package/esm/index.d.ts
CHANGED
|
@@ -1,11 +1,6 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import Plugin from '@jbrowse/core/Plugin';
|
|
3
3
|
import PluginManager from '@jbrowse/core/PluginManager';
|
|
4
|
-
import { configSchema as OAuthConfigSchema, modelFactory as OAuthInternetAccountModelFactory } from './OAuthModel';
|
|
5
|
-
import { configSchema as ExternalTokenConfigSchema, modelFactory as ExternalTokenInternetAccountModelFactory } from './ExternalTokenModel';
|
|
6
|
-
import { configSchema as HTTPBasicConfigSchema, modelFactory as HTTPBasicInternetAccountModelFactory } from './HTTPBasicModel';
|
|
7
|
-
import { configSchema as DropboxOAuthConfigSchema, modelFactory as DropboxOAuthInternetAccountModelFactory } from './DropboxOAuthModel';
|
|
8
|
-
import { configSchema as GoogleDriveOAuthConfigSchema, modelFactory as GoogleDriveOAuthInternetAccountModelFactory } from './GoogleDriveOAuthModel';
|
|
9
4
|
export default class AuthenticationPlugin extends Plugin {
|
|
10
5
|
name: string;
|
|
11
6
|
exports: {
|
|
@@ -396,4 +391,8 @@ export default class AuthenticationPlugin extends Plugin {
|
|
|
396
391
|
};
|
|
397
392
|
install(pluginManager: PluginManager): void;
|
|
398
393
|
}
|
|
399
|
-
export {
|
|
394
|
+
export { configSchema as OAuthConfigSchema, modelFactory as OAuthInternetAccountModelFactory, } from './OAuthModel';
|
|
395
|
+
export { configSchema as ExternalTokenConfigSchema, modelFactory as ExternalTokenInternetAccountModelFactory, } from './ExternalTokenModel';
|
|
396
|
+
export { configSchema as HTTPBasicConfigSchema, modelFactory as HTTPBasicInternetAccountModelFactory, } from './HTTPBasicModel';
|
|
397
|
+
export { configSchema as DropboxOAuthConfigSchema, modelFactory as DropboxOAuthInternetAccountModelFactory, } from './DropboxOAuthModel';
|
|
398
|
+
export { configSchema as GoogleDriveOAuthConfigSchema, modelFactory as GoogleDriveOAuthInternetAccountModelFactory, } from './GoogleDriveOAuthModel';
|
package/esm/index.js
CHANGED
|
@@ -60,5 +60,9 @@ export default class AuthenticationPlugin extends Plugin {
|
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
|
-
export {
|
|
63
|
+
export { configSchema as OAuthConfigSchema, modelFactory as OAuthInternetAccountModelFactory, } from './OAuthModel';
|
|
64
|
+
export { configSchema as ExternalTokenConfigSchema, modelFactory as ExternalTokenInternetAccountModelFactory, } from './ExternalTokenModel';
|
|
65
|
+
export { configSchema as HTTPBasicConfigSchema, modelFactory as HTTPBasicInternetAccountModelFactory, } from './HTTPBasicModel';
|
|
66
|
+
export { configSchema as DropboxOAuthConfigSchema, modelFactory as DropboxOAuthInternetAccountModelFactory, } from './DropboxOAuthModel';
|
|
67
|
+
export { configSchema as GoogleDriveOAuthConfigSchema, modelFactory as GoogleDriveOAuthInternetAccountModelFactory, } from './GoogleDriveOAuthModel';
|
|
64
68
|
//# sourceMappingURL=index.js.map
|
package/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,sBAAsB,CAAA;AAEzC,OAAO,mBAAmB,MAAM,yDAAyD,CAAA;AACzF,OAAO,EACL,YAAY,IAAI,iBAAiB,EACjC,YAAY,IAAI,gCAAgC,GACjD,MAAM,cAAc,CAAA;AACrB,OAAO,EACL,YAAY,IAAI,yBAAyB,EACzC,YAAY,IAAI,wCAAwC,GACzD,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EACL,YAAY,IAAI,qBAAqB,EACrC,YAAY,IAAI,oCAAoC,GACrD,MAAM,kBAAkB,CAAA;AACzB,OAAO,EACL,YAAY,IAAI,wBAAwB,EACxC,YAAY,IAAI,uCAAuC,GACxD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EACL,YAAY,IAAI,4BAA4B,EAC5C,YAAY,IAAI,2CAA2C,GAC5D,MAAM,yBAAyB,CAAA;AAEhC,MAAM,CAAC,OAAO,OAAO,oBAAqB,SAAQ,MAAM;IAAxD;;QACE,SAAI,GAAG,sBAAsB,CAAA;QAE7B,YAAO,GAAG;YACR,iBAAiB;YACjB,gCAAgC;YAChC,yBAAyB;YACzB,wCAAwC;YACxC,qBAAqB;YACrB,oCAAoC;YACpC,wBAAwB;YACxB,uCAAuC;YACvC,4BAA4B;YAC5B,2CAA2C;SAC5C,CAAA;IA6CH,CAAC;IA3CC,OAAO,CAAC,aAA4B;QAClC,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,mBAAmB,CAAC;gBAC7B,IAAI,EAAE,sBAAsB;gBAC5B,YAAY,EAAE,iBAAiB;gBAC/B,UAAU,EAAE,gCAAgC,CAAC,iBAAiB,CAAC;aAChE,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,mBAAmB,CAAC;gBAC7B,IAAI,EAAE,8BAA8B;gBACpC,YAAY,EAAE,yBAAyB;gBACvC,UAAU,EAAE,wCAAwC,CAClD,yBAAyB,CAC1B;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,mBAAmB,CAAC;gBAC7B,IAAI,EAAE,0BAA0B;gBAChC,YAAY,EAAE,qBAAqB;gBACnC,UAAU,EAAE,oCAAoC,CAAC,qBAAqB,CAAC;aACxE,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,mBAAmB,CAAC;gBAC7B,IAAI,EAAE,6BAA6B;gBACnC,YAAY,EAAE,wBAAwB;gBACtC,UAAU,EAAE,uCAAuC,CACjD,wBAAwB,CACzB;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QACF,aAAa,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACxC,OAAO,IAAI,mBAAmB,CAAC;gBAC7B,IAAI,EAAE,iCAAiC;gBACvC,YAAY,EAAE,4BAA4B;gBAC1C,UAAU,EAAE,2CAA2C,CACrD,4BAA4B,CAC7B;aACF,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;CACF;AAED,OAAO,EACL,iBAAiB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jbrowse/plugin-authentication",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.1",
|
|
4
4
|
"description": "JBrowse 2 Authentication",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"jbrowse",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"distModule": "esm/index.js",
|
|
58
58
|
"srcModule": "src/index.ts",
|
|
59
59
|
"module": "esm/index.js",
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "747c50c4edc0184827efa4f8dfc576ca9a72caeb"
|
|
61
61
|
}
|
package/src/OAuthModel/model.tsx
CHANGED
|
@@ -22,18 +22,6 @@ function fixup(buf: string) {
|
|
|
22
22
|
return buf.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '')
|
|
23
23
|
}
|
|
24
24
|
|
|
25
|
-
function getGlobalObject(): Window {
|
|
26
|
-
// Based on window-or-global
|
|
27
|
-
// https://github.com/purposeindustries/window-or-global/blob/322abc71de0010c9e5d9d0729df40959e1ef8775/lib/index.js
|
|
28
|
-
return (
|
|
29
|
-
// eslint-disable-next-line no-restricted-globals
|
|
30
|
-
(typeof self === 'object' && self.self === self && self) ||
|
|
31
|
-
(typeof global === 'object' && global.global === global && global) ||
|
|
32
|
-
// @ts-ignore
|
|
33
|
-
this
|
|
34
|
-
)
|
|
35
|
-
}
|
|
36
|
-
|
|
37
25
|
const stateModelFactory = (configSchema: OAuthInternetAccountConfigModel) => {
|
|
38
26
|
return InternetAccount.named('OAuthInternetAccount')
|
|
39
27
|
.props({
|
|
@@ -47,9 +35,8 @@ const stateModelFactory = (configSchema: OAuthInternetAccountConfigModel) => {
|
|
|
47
35
|
if (codeVerifier) {
|
|
48
36
|
return codeVerifier
|
|
49
37
|
}
|
|
50
|
-
const global = getGlobalObject()
|
|
51
38
|
const array = new Uint8Array(32)
|
|
52
|
-
|
|
39
|
+
globalThis.crypto.getRandomValues(array)
|
|
53
40
|
codeVerifier = fixup(Buffer.from(array).toString('base64'))
|
|
54
41
|
return codeVerifier
|
|
55
42
|
},
|
|
@@ -237,11 +224,9 @@ const stateModelFactory = (configSchema: OAuthInternetAccountConfigModel) => {
|
|
|
237
224
|
self.storeToken(token)
|
|
238
225
|
return resolve(token)
|
|
239
226
|
} catch (error) {
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
return reject(new Error(String(error)))
|
|
244
|
-
}
|
|
227
|
+
return error instanceof Error
|
|
228
|
+
? reject(error)
|
|
229
|
+
: reject(new Error(String(error)))
|
|
245
230
|
}
|
|
246
231
|
}
|
|
247
232
|
if (redirectUriWithInfo.includes('access_denied')) {
|
|
@@ -334,7 +319,7 @@ const stateModelFactory = (configSchema: OAuthInternetAccountConfigModel) => {
|
|
|
334
319
|
location: UriLocation,
|
|
335
320
|
): Promise<string> {
|
|
336
321
|
const decoded = jwtDecode<JwtPayload>(token)
|
|
337
|
-
if (decoded.exp && decoded.exp <
|
|
322
|
+
if (decoded.exp && decoded.exp < Date.now() / 1000) {
|
|
338
323
|
const refreshToken =
|
|
339
324
|
self.hasRefreshToken && self.retrieveRefreshToken()
|
|
340
325
|
if (refreshToken) {
|
package/src/index.ts
CHANGED
|
@@ -84,14 +84,25 @@ export default class AuthenticationPlugin extends Plugin {
|
|
|
84
84
|
}
|
|
85
85
|
|
|
86
86
|
export {
|
|
87
|
-
OAuthConfigSchema,
|
|
88
|
-
OAuthInternetAccountModelFactory,
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
87
|
+
configSchema as OAuthConfigSchema,
|
|
88
|
+
modelFactory as OAuthInternetAccountModelFactory,
|
|
89
|
+
} from './OAuthModel'
|
|
90
|
+
export {
|
|
91
|
+
configSchema as ExternalTokenConfigSchema,
|
|
92
|
+
modelFactory as ExternalTokenInternetAccountModelFactory,
|
|
93
|
+
} from './ExternalTokenModel'
|
|
94
|
+
|
|
95
|
+
export {
|
|
96
|
+
configSchema as HTTPBasicConfigSchema,
|
|
97
|
+
modelFactory as HTTPBasicInternetAccountModelFactory,
|
|
98
|
+
} from './HTTPBasicModel'
|
|
99
|
+
|
|
100
|
+
export {
|
|
101
|
+
configSchema as DropboxOAuthConfigSchema,
|
|
102
|
+
modelFactory as DropboxOAuthInternetAccountModelFactory,
|
|
103
|
+
} from './DropboxOAuthModel'
|
|
104
|
+
|
|
105
|
+
export {
|
|
106
|
+
configSchema as GoogleDriveOAuthConfigSchema,
|
|
107
|
+
modelFactory as GoogleDriveOAuthInternetAccountModelFactory,
|
|
108
|
+
} from './GoogleDriveOAuthModel'
|