@feathersjs/authentication-oauth 5.0.0-pre.20 → 5.0.0-pre.21
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 +11 -0
- package/lib/index.js +5 -4
- package/lib/index.js.map +1 -1
- package/package.json +7 -7
- package/src/index.ts +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
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
|
+
# [5.0.0-pre.21](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.20...v5.0.0-pre.21) (2022-05-23)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **authentication-oauth:** Fix regression using incorrect callback and redirect_uri ([#2631](https://github.com/feathersjs/feathers/issues/2631)) ([43d8a08](https://github.com/feathersjs/feathers/commit/43d8a082d7e1807f8a431c44a1dbd9b04c3af0d2))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [5.0.0-pre.20](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.19...v5.0.0-pre.20) (2022-05-04)
|
|
7
18
|
|
|
8
19
|
|
package/lib/index.js
CHANGED
|
@@ -14,6 +14,7 @@ const express_1 = __importDefault(require("./express"));
|
|
|
14
14
|
const utils_1 = require("./utils");
|
|
15
15
|
const debug = (0, commons_1.createDebug)('@feathersjs/authentication-oauth');
|
|
16
16
|
const setup = (options) => (app) => {
|
|
17
|
+
var _a, _b, _c, _d, _e, _f;
|
|
17
18
|
const service = app.defaultAuthentication ? app.defaultAuthentication(options.authService) : null;
|
|
18
19
|
if (!service) {
|
|
19
20
|
throw new Error('An authentication service must exist before registering @feathersjs/authentication-oauth');
|
|
@@ -36,14 +37,14 @@ const setup = (options) => (app) => {
|
|
|
36
37
|
host += `:${port}`;
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
|
-
const grant = (0, defaultsDeep_1.default)({
|
|
40
|
+
const grant = (0, defaultsDeep_1.default)({
|
|
40
41
|
defaults: {
|
|
41
42
|
prefix,
|
|
42
|
-
origin: `${protocol}://${host}`,
|
|
43
|
-
transport: 'session',
|
|
43
|
+
origin: `${(_b = (_a = oauth === null || oauth === void 0 ? void 0 : oauth.defaults) === null || _a === void 0 ? void 0 : _a.protocol) !== null && _b !== void 0 ? _b : protocol}://${(_d = (_c = oauth === null || oauth === void 0 ? void 0 : oauth.defaults) === null || _c === void 0 ? void 0 : _c.host) !== null && _d !== void 0 ? _d : host}`,
|
|
44
|
+
transport: (_f = (_e = oauth === null || oauth === void 0 ? void 0 : oauth.defaults) === null || _e === void 0 ? void 0 : _e.transport) !== null && _f !== void 0 ? _f : 'session',
|
|
44
45
|
response: ['tokens', 'raw', 'profile']
|
|
45
46
|
}
|
|
46
|
-
});
|
|
47
|
+
}, (0, omit_1.default)(oauth, ['redirect', 'origins']));
|
|
47
48
|
const getUrl = (url) => {
|
|
48
49
|
const { defaults } = grant;
|
|
49
50
|
return `${defaults.origin}${prefix}/${url}`;
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA+C;AAC/C,uDAA+B;AAC/B,uDAA+B;AAC/B,iDAAkD;AAElD,yCAAyD;AAM5B,8FANpB,wBAAa,OAMoB;AAL1C,wDAAoD;AACpD,mCAAiE;AAEjE,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,kCAAkC,CAAC,CAAC;AAIvD,MAAM,KAAK,GAAG,CAAC,OAA2B,EAAE,EAAE,CAAC,CAAC,GAAgB,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
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": "5.0.0-pre.
|
|
4
|
+
"version": "5.0.0-pre.21",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -53,17 +53,17 @@
|
|
|
53
53
|
"access": "public"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@feathersjs/authentication": "^5.0.0-pre.
|
|
56
|
+
"@feathersjs/authentication": "^5.0.0-pre.21",
|
|
57
57
|
"@feathersjs/commons": "^5.0.0-pre.20",
|
|
58
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
59
|
-
"@feathersjs/express": "^5.0.0-pre.
|
|
60
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
58
|
+
"@feathersjs/errors": "^5.0.0-pre.21",
|
|
59
|
+
"@feathersjs/express": "^5.0.0-pre.21",
|
|
60
|
+
"@feathersjs/feathers": "^5.0.0-pre.21",
|
|
61
61
|
"express-session": "^1.17.2",
|
|
62
62
|
"grant": "^5.4.21",
|
|
63
63
|
"lodash": "^4.17.21"
|
|
64
64
|
},
|
|
65
65
|
"devDependencies": {
|
|
66
|
-
"@feathersjs/memory": "^5.0.0-pre.
|
|
66
|
+
"@feathersjs/memory": "^5.0.0-pre.21",
|
|
67
67
|
"@types/express": "^4.17.13",
|
|
68
68
|
"@types/express-session": "^1.17.4",
|
|
69
69
|
"@types/lodash": "^4.14.182",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
"ts-node": "^10.7.0",
|
|
76
76
|
"typescript": "^4.6.4"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "ac3baed231f72370a80a06c5944538915479b96e"
|
|
79
79
|
}
|
package/src/index.ts
CHANGED
|
@@ -41,14 +41,14 @@ export const setup = (options: OauthSetupSettings) => (app: Application) => {
|
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
|
|
44
|
-
const grant = defaultsDeep({
|
|
44
|
+
const grant = defaultsDeep({
|
|
45
45
|
defaults: {
|
|
46
46
|
prefix,
|
|
47
|
-
origin: `${protocol}://${host}`,
|
|
48
|
-
transport: 'session',
|
|
47
|
+
origin: `${oauth?.defaults?.protocol ?? protocol}://${oauth?.defaults?.host ?? host}`,
|
|
48
|
+
transport: oauth?.defaults?.transport ?? 'session',
|
|
49
49
|
response: ['tokens', 'raw', 'profile']
|
|
50
50
|
}
|
|
51
|
-
});
|
|
51
|
+
}, omit(oauth, ['redirect', 'origins']));
|
|
52
52
|
|
|
53
53
|
const getUrl = (url: string) => {
|
|
54
54
|
const { defaults } = grant;
|