@feathersjs/authentication-oauth 4.5.8 → 4.5.12
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/CHANGELOG.md +45 -0
- package/lib/express.d.ts +12 -0
- package/lib/express.js +19 -5
- package/lib/express.js.map +1 -1
- package/lib/index.js +11 -9
- package/lib/index.js.map +1 -1
- package/lib/strategy.d.ts +1 -1
- package/lib/strategy.js +2 -2
- package/lib/strategy.js.map +1 -1
- package/lib/utils.js +2 -1
- package/lib/utils.js.map +1 -1
- package/package.json +20 -20
- package/src/express.ts +31 -7
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,51 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.5.12](https://github.com/feathersjs/feathers/compare/v4.5.11...v4.5.12) (2022-01-06)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **authentication-oauth:** OAuth redirect lost sometimes due to session store race ([#2514](https://github.com/feathersjs/feathers/issues/2514)) ([#2515](https://github.com/feathersjs/feathers/issues/2515)) ([67a7e31](https://github.com/feathersjs/feathers/commit/67a7e31ae332992f3b52bdb35e3848f66726cbc6))
|
|
12
|
+
* Update all dependencies for crow release ([#2520](https://github.com/feathersjs/feathers/issues/2520)) ([1c63e6b](https://github.com/feathersjs/feathers/commit/1c63e6be37ff85edbe8dd318415ca6919864c033))
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
## [4.5.11](https://github.com/feathersjs/feathers/compare/v4.5.10...v4.5.11) (2020-12-05)
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
### Bug Fixes
|
|
22
|
+
|
|
23
|
+
* **socketio-client:** Throw an error and show a warning if someone tries to use socket.io-client v3 ([#2135](https://github.com/feathersjs/feathers/issues/2135)) ([cc3521c](https://github.com/feathersjs/feathers/commit/cc3521c935a1cbd690e29b7057998e3898f282db))
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
## [4.5.10](https://github.com/feathersjs/feathers/compare/v4.5.9...v4.5.10) (2020-11-08)
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
### Bug Fixes
|
|
33
|
+
|
|
34
|
+
* **authentication-oauth:** session.destroy is undefined when use cookie-session package ([#2100](https://github.com/feathersjs/feathers/issues/2100)) ([46e84b8](https://github.com/feathersjs/feathers/commit/46e84b83f2acce985380243fc6d08c64e96f0068))
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
## [4.5.9](https://github.com/feathersjs/feathers/compare/v4.5.8...v4.5.9) (2020-10-09)
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
### Bug Fixes
|
|
44
|
+
|
|
45
|
+
* **authentication-oauth:** Always end session after oAuth flows are finished ([#2087](https://github.com/feathersjs/feathers/issues/2087)) ([d219d0d](https://github.com/feathersjs/feathers/commit/d219d0d89c5e45aa289dd67cb0c8bdc05044c846))
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
|
|
6
51
|
## [4.5.8](https://github.com/feathersjs/feathers/compare/v4.5.7...v4.5.8) (2020-08-12)
|
|
7
52
|
|
|
8
53
|
**Note:** Version bump only for package @feathersjs/authentication-oauth
|
package/lib/express.d.ts
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
1
|
import { Application } from '@feathersjs/feathers';
|
|
2
2
|
import { OauthSetupSettings } from './utils';
|
|
3
|
+
declare module 'express-session' {
|
|
4
|
+
interface SessionData {
|
|
5
|
+
redirect: string;
|
|
6
|
+
accessToken: string;
|
|
7
|
+
query: {
|
|
8
|
+
[key: string]: any;
|
|
9
|
+
};
|
|
10
|
+
grant: {
|
|
11
|
+
[key: string]: any;
|
|
12
|
+
};
|
|
13
|
+
}
|
|
14
|
+
}
|
|
3
15
|
declare const _default: (options: OauthSetupSettings) => (feathersApp: Application) => void;
|
|
4
16
|
export default _default;
|
package/lib/express.js
CHANGED
|
@@ -29,8 +29,8 @@ const debug_1 = __importDefault(require("debug"));
|
|
|
29
29
|
const express_session_1 = __importDefault(require("express-session"));
|
|
30
30
|
const querystring_1 = __importDefault(require("querystring"));
|
|
31
31
|
const express_1 = require("@feathersjs/express");
|
|
32
|
-
const grant = grant_1.express();
|
|
33
|
-
const debug = debug_1.default('@feathersjs/authentication-oauth/express');
|
|
32
|
+
const grant = (0, grant_1.express)();
|
|
33
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication-oauth/express');
|
|
34
34
|
exports.default = (options) => {
|
|
35
35
|
return (feathersApp) => {
|
|
36
36
|
const { authService, linkStrategy } = options;
|
|
@@ -41,13 +41,13 @@ exports.default = (options) => {
|
|
|
41
41
|
return;
|
|
42
42
|
}
|
|
43
43
|
const { path } = config.defaults;
|
|
44
|
-
const expressSession = options.expressSession || express_session_1.default({
|
|
44
|
+
const expressSession = options.expressSession || (0, express_session_1.default)({
|
|
45
45
|
secret: Math.random().toString(36).substring(7),
|
|
46
46
|
saveUninitialized: true,
|
|
47
47
|
resave: true
|
|
48
48
|
});
|
|
49
49
|
const grantApp = grant(config);
|
|
50
|
-
const authApp = express_1.original();
|
|
50
|
+
const authApp = (0, express_1.original)();
|
|
51
51
|
authApp.use(expressSession);
|
|
52
52
|
authApp.get('/:name', (req, res) => {
|
|
53
53
|
const _a = req.query, { feathers_token, redirect } = _a, query = __rest(_a, ["feathers_token", "redirect"]);
|
|
@@ -58,7 +58,14 @@ exports.default = (options) => {
|
|
|
58
58
|
}
|
|
59
59
|
req.session.redirect = redirect;
|
|
60
60
|
req.session.query = query;
|
|
61
|
-
|
|
61
|
+
req.session.save((err) => {
|
|
62
|
+
if (err) {
|
|
63
|
+
res.status(500).send(`Error storing session: ${err}`);
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
res.redirect(`${path}/connect/${name}?${querystring_1.default.stringify(query)}`);
|
|
67
|
+
}
|
|
68
|
+
});
|
|
62
69
|
});
|
|
63
70
|
authApp.get('/:name/callback', (req, res) => {
|
|
64
71
|
res.redirect(`${path}/connect/${req.params.name}/callback?${querystring_1.default.stringify(req.query)}`);
|
|
@@ -95,6 +102,13 @@ exports.default = (options) => {
|
|
|
95
102
|
const payload = config.defaults.transport === 'session' ?
|
|
96
103
|
grant.response : req.query;
|
|
97
104
|
const authentication = Object.assign({ strategy: name }, payload);
|
|
105
|
+
yield new Promise((resolve, reject) => {
|
|
106
|
+
if (!req.session.destroy) {
|
|
107
|
+
req.session = null;
|
|
108
|
+
resolve();
|
|
109
|
+
}
|
|
110
|
+
req.session.destroy((err) => err ? reject(err) : resolve());
|
|
111
|
+
});
|
|
98
112
|
debug(`Calling ${authService}.create authentication with strategy ${name}`);
|
|
99
113
|
const authResult = yield service.create(authentication, params);
|
|
100
114
|
debug('Successful oAuth authentication, sending response');
|
package/lib/express.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express.js","sourceRoot":"","sources":["../src/express.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,aAAa;AACb,iCAAgD;AAChD,kDAA0B;AAC1B,sEAAsC;AAGtC,8DAA6B;AAC7B,iDAG6B;AAI7B,MAAM,KAAK,GAAG,eAAY,
|
|
1
|
+
{"version":3,"file":"express.js","sourceRoot":"","sources":["../src/express.ts"],"names":[],"mappings":"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"}
|
package/lib/index.js
CHANGED
|
@@ -12,8 +12,8 @@ const strategy_1 = require("./strategy");
|
|
|
12
12
|
Object.defineProperty(exports, "OAuthStrategy", { enumerable: true, get: function () { return strategy_1.OAuthStrategy; } });
|
|
13
13
|
const express_1 = __importDefault(require("./express"));
|
|
14
14
|
const utils_1 = require("./utils");
|
|
15
|
-
const debug = debug_1.default('@feathersjs/authentication-oauth');
|
|
16
|
-
|
|
15
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication-oauth');
|
|
16
|
+
const setup = (options) => (app) => {
|
|
17
17
|
const service = app.defaultAuthentication ? app.defaultAuthentication(options.authService) : null;
|
|
18
18
|
if (!service) {
|
|
19
19
|
throw new Error('An authentication service must exist before registering @feathersjs/authentication-oauth');
|
|
@@ -36,19 +36,19 @@ exports.setup = (options) => (app) => {
|
|
|
36
36
|
host += ':' + port;
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
const grant = merge_1.default({
|
|
39
|
+
const grant = (0, merge_1.default)({
|
|
40
40
|
defaults: {
|
|
41
41
|
path,
|
|
42
42
|
host,
|
|
43
43
|
protocol,
|
|
44
44
|
transport: 'session'
|
|
45
45
|
}
|
|
46
|
-
}, omit_1.default(oauth, 'redirect'));
|
|
46
|
+
}, (0, omit_1.default)(oauth, 'redirect'));
|
|
47
47
|
const getUrl = (url) => {
|
|
48
48
|
const { defaults } = grant;
|
|
49
49
|
return `${defaults.protocol}://${defaults.host}${path}/${url}`;
|
|
50
50
|
};
|
|
51
|
-
each_1.default(grant, (value, name) => {
|
|
51
|
+
(0, each_1.default)(grant, (value, name) => {
|
|
52
52
|
if (name !== 'defaults') {
|
|
53
53
|
value.callback = value.callback || getUrl(`${name}/authenticate`);
|
|
54
54
|
value.redirect_uri = value.redirect_uri || getUrl(`${name}/callback`);
|
|
@@ -60,10 +60,12 @@ exports.setup = (options) => (app) => {
|
|
|
60
60
|
});
|
|
61
61
|
app.set('grant', grant);
|
|
62
62
|
};
|
|
63
|
-
exports.
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
app.configure(
|
|
63
|
+
exports.setup = setup;
|
|
64
|
+
const express = (settings = {}) => (app) => {
|
|
65
|
+
const options = (0, utils_1.getDefaultSettings)(app, settings);
|
|
66
|
+
app.configure((0, exports.setup)(options));
|
|
67
|
+
app.configure((0, express_1.default)(options));
|
|
67
68
|
};
|
|
69
|
+
exports.express = express;
|
|
68
70
|
exports.expressOauth = exports.express;
|
|
69
71
|
//# sourceMappingURL=index.js.map
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,yDAAiC;AACjC,uDAA+B;AAC/B,uDAA+B;AAE/B,yCAAyD;AAM5B,8FANpB,wBAAa,OAMoB;AAL1C,wDAAoD;AACpD,mCAAiE;AAEjE,MAAM,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/lib/strategy.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export declare class OAuthStrategy extends AuthenticationBaseStrategy {
|
|
|
18
18
|
getRedirect(data: AuthenticationResult | Error, params?: Params): Promise<string | null>;
|
|
19
19
|
findEntity(profile: OAuthProfile, params: Params): Promise<any>;
|
|
20
20
|
createEntity(profile: OAuthProfile, params: Params): Promise<any>;
|
|
21
|
-
updateEntity(entity: any, profile: OAuthProfile, params: Params): Promise<any>;
|
|
21
|
+
updateEntity(entity: any, profile: OAuthProfile, params: Params): Promise<any[]>;
|
|
22
22
|
getEntity(result: any, params: Params): Promise<any>;
|
|
23
23
|
authenticate(authentication: AuthenticationRequest, originalParams: Params): Promise<{
|
|
24
24
|
[x: string]: any;
|
package/lib/strategy.js
CHANGED
|
@@ -30,7 +30,7 @@ const querystring_1 = __importDefault(require("querystring"));
|
|
|
30
30
|
const debug_1 = __importDefault(require("debug"));
|
|
31
31
|
const authentication_1 = require("@feathersjs/authentication");
|
|
32
32
|
const errors_1 = require("@feathersjs/errors");
|
|
33
|
-
const debug = debug_1.default('@feathersjs/authentication-oauth/strategy');
|
|
33
|
+
const debug = (0, debug_1.default)('@feathersjs/authentication-oauth/strategy');
|
|
34
34
|
class OAuthStrategy extends authentication_1.AuthenticationBaseStrategy {
|
|
35
35
|
get configuration() {
|
|
36
36
|
const { entity, service, entityId, oauth } = this.authentication.configuration;
|
|
@@ -63,7 +63,7 @@ class OAuthStrategy extends authentication_1.AuthenticationBaseStrategy {
|
|
|
63
63
|
const config = this.app.get('grant');
|
|
64
64
|
const provider = config[data.strategy];
|
|
65
65
|
debug('getProfile of oAuth profile from grant-profile with', data);
|
|
66
|
-
return client_1.default(provider, data);
|
|
66
|
+
return (0, client_1.default)(provider, data);
|
|
67
67
|
});
|
|
68
68
|
}
|
|
69
69
|
getCurrentEntity(params) {
|
package/lib/strategy.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,aAAa;AACb,sEAAkD;AAClD,8DAAsC;AACtC,kDAA0B;AAC1B,+DAEoC;AAEpC,+CAAsD;AAEtD,MAAM,KAAK,GAAG,eAAK,
|
|
1
|
+
{"version":3,"file":"strategy.js","sourceRoot":"","sources":["../src/strategy.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getDefaultSettings = void 0;
|
|
4
|
-
|
|
4
|
+
const getDefaultSettings = (_app, other) => {
|
|
5
5
|
const defaults = Object.assign({ linkStrategy: 'jwt' }, other);
|
|
6
6
|
return defaults;
|
|
7
7
|
};
|
|
8
|
+
exports.getDefaultSettings = getDefaultSettings;
|
|
8
9
|
//# sourceMappingURL=utils.js.map
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AASO,MAAM,kBAAkB,GAAG,CAAC,IAAiB,EAAE,KAAmC,EAAE,EAAE;IAC3F,MAAM,QAAQ,mBACZ,YAAY,EAAE,KAAK,IAChB,KAAK,CACT,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAPW,QAAA,kBAAkB,sBAO7B"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@feathersjs/authentication-oauth",
|
|
3
3
|
"description": "oAuth 1 and 2 authentication for Feathers. Powered by Grant.",
|
|
4
|
-
"version": "4.5.
|
|
4
|
+
"version": "4.5.12",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -52,28 +52,28 @@
|
|
|
52
52
|
"access": "public"
|
|
53
53
|
},
|
|
54
54
|
"dependencies": {
|
|
55
|
-
"@feathersjs/authentication": "^4.5.
|
|
56
|
-
"@feathersjs/errors": "^4.5.
|
|
57
|
-
"@feathersjs/express": "^4.5.
|
|
58
|
-
"@feathersjs/feathers": "^4.5.
|
|
59
|
-
"debug": "^4.
|
|
60
|
-
"express-session": "^1.17.
|
|
55
|
+
"@feathersjs/authentication": "^4.5.12",
|
|
56
|
+
"@feathersjs/errors": "^4.5.12",
|
|
57
|
+
"@feathersjs/express": "^4.5.12",
|
|
58
|
+
"@feathersjs/feathers": "^4.5.12",
|
|
59
|
+
"debug": "^4.3.3",
|
|
60
|
+
"express-session": "^1.17.2",
|
|
61
61
|
"grant": "^4.7.0",
|
|
62
62
|
"grant-profile": "^0.0.11",
|
|
63
|
-
"lodash": "^4.17.
|
|
63
|
+
"lodash": "^4.17.21"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@types/debug": "^4.1.
|
|
67
|
-
"@types/express": "^4.17.
|
|
68
|
-
"@types/express-session": "^1.17.
|
|
69
|
-
"@types/lodash": "^4.14.
|
|
70
|
-
"@types/mocha": "^
|
|
71
|
-
"@types/node": "^
|
|
72
|
-
"axios": "^0.
|
|
73
|
-
"mocha": "^
|
|
74
|
-
"shx": "^0.3.
|
|
75
|
-
"ts-node": "^
|
|
76
|
-
"typescript": "^
|
|
66
|
+
"@types/debug": "^4.1.7",
|
|
67
|
+
"@types/express": "^4.17.13",
|
|
68
|
+
"@types/express-session": "^1.17.4",
|
|
69
|
+
"@types/lodash": "^4.14.178",
|
|
70
|
+
"@types/mocha": "^9.0.0",
|
|
71
|
+
"@types/node": "^17.0.8",
|
|
72
|
+
"axios": "^0.24.0",
|
|
73
|
+
"mocha": "^9.1.3",
|
|
74
|
+
"shx": "^0.3.3",
|
|
75
|
+
"ts-node": "^10.4.0",
|
|
76
|
+
"typescript": "^4.5.4"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "8697ecc85808437e9aab63e5d2327679340c5401"
|
|
79
79
|
}
|
package/src/express.ts
CHANGED
|
@@ -15,6 +15,15 @@ import { OAuthStrategy } from './strategy';
|
|
|
15
15
|
const grant = grantExpress();
|
|
16
16
|
const debug = Debug('@feathersjs/authentication-oauth/express');
|
|
17
17
|
|
|
18
|
+
declare module 'express-session' {
|
|
19
|
+
interface SessionData {
|
|
20
|
+
redirect: string;
|
|
21
|
+
accessToken: string;
|
|
22
|
+
query: { [key: string]: any };
|
|
23
|
+
grant: { [key: string]: any };
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
18
27
|
export default (options: OauthSetupSettings) => {
|
|
19
28
|
return (feathersApp: Application) => {
|
|
20
29
|
const { authService, linkStrategy } = options;
|
|
@@ -37,25 +46,31 @@ export default (options: OauthSetupSettings) => {
|
|
|
37
46
|
|
|
38
47
|
authApp.use(expressSession);
|
|
39
48
|
|
|
40
|
-
authApp.get('/:name', (req, res) => {
|
|
49
|
+
authApp.get('/:name', (req: any, res: any) => {
|
|
41
50
|
const { feathers_token, redirect, ...query } = req.query;
|
|
42
51
|
const { name } = req.params as any;
|
|
43
52
|
|
|
44
53
|
if (feathers_token) {
|
|
45
54
|
debug(`Got feathers_token query parameter to link accounts`, feathers_token);
|
|
46
|
-
req.session.accessToken = feathers_token;
|
|
55
|
+
req.session.accessToken = feathers_token as string;
|
|
47
56
|
}
|
|
48
|
-
req.session.redirect = redirect;
|
|
57
|
+
req.session.redirect = redirect as string;
|
|
49
58
|
req.session.query = query;
|
|
50
59
|
|
|
51
|
-
|
|
60
|
+
req.session.save((err: any) => {
|
|
61
|
+
if (err) {
|
|
62
|
+
res.status(500).send(`Error storing session: ${err}`);
|
|
63
|
+
} else {
|
|
64
|
+
res.redirect(`${path}/connect/${name}?${qs.stringify(query as any)}`);
|
|
65
|
+
}
|
|
66
|
+
});
|
|
52
67
|
});
|
|
53
68
|
|
|
54
69
|
authApp.get('/:name/callback', (req: any, res: any) => {
|
|
55
70
|
res.redirect(`${path}/connect/${req.params.name}/callback?${qs.stringify(req.query)}`);
|
|
56
71
|
});
|
|
57
72
|
|
|
58
|
-
authApp.get('/:name/authenticate', async (req, res, next) => {
|
|
73
|
+
authApp.get('/:name/authenticate', async (req: any, res: any, next: any) => {
|
|
59
74
|
const { name } = req.params as any;
|
|
60
75
|
const { accessToken, grant, query = {}, redirect } = req.session;
|
|
61
76
|
const service = app.defaultAuthentication(authService);
|
|
@@ -81,7 +96,7 @@ export default (options: OauthSetupSettings) => {
|
|
|
81
96
|
} else {
|
|
82
97
|
res.json(data);
|
|
83
98
|
}
|
|
84
|
-
} catch (error) {
|
|
99
|
+
} catch (error: any) {
|
|
85
100
|
debug('oAuth error', error);
|
|
86
101
|
next(error);
|
|
87
102
|
}
|
|
@@ -95,6 +110,15 @@ export default (options: OauthSetupSettings) => {
|
|
|
95
110
|
...payload
|
|
96
111
|
};
|
|
97
112
|
|
|
113
|
+
await new Promise<void>((resolve, reject) => {
|
|
114
|
+
if (!req.session.destroy) {
|
|
115
|
+
req.session = null;
|
|
116
|
+
resolve();
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
req.session.destroy((err: any) => err ? reject(err) : resolve());
|
|
120
|
+
});
|
|
121
|
+
|
|
98
122
|
debug(`Calling ${authService}.create authentication with strategy ${name}`);
|
|
99
123
|
|
|
100
124
|
const authResult = await service.create(authentication, params);
|
|
@@ -102,7 +126,7 @@ export default (options: OauthSetupSettings) => {
|
|
|
102
126
|
debug('Successful oAuth authentication, sending response');
|
|
103
127
|
|
|
104
128
|
await sendResponse(authResult);
|
|
105
|
-
} catch (error) {
|
|
129
|
+
} catch (error: any) {
|
|
106
130
|
debug('Received oAuth authentication error', error.stack);
|
|
107
131
|
await sendResponse(error);
|
|
108
132
|
}
|