@feathersjs/authentication-oauth 5.0.0-pre.23 → 5.0.0-pre.24
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 +16 -0
- package/lib/index.js +6 -8
- package/lib/index.js.map +1 -1
- package/package.json +8 -8
- package/src/index.ts +9 -13
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
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.24](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.23...v5.0.0-pre.24) (2022-06-21)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **authentication-oauth:** Fix bug and properly set Grant defaults ([#2659](https://github.com/feathersjs/feathers/issues/2659)) ([cb93bb9](https://github.com/feathersjs/feathers/commit/cb93bb911fd92282424da2db805cd685b7e4a45b))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* **cli:** Add typed client to a generated app ([#2669](https://github.com/feathersjs/feathers/issues/2669)) ([5b801b5](https://github.com/feathersjs/feathers/commit/5b801b5017ddc3eaa95622b539f51d605916bc86))
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
# [5.0.0-pre.23](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.22...v5.0.0-pre.23) (2022-06-06)
|
|
7
23
|
|
|
8
24
|
**Note:** Version bump only for package @feathersjs/authentication-oauth
|
package/lib/index.js
CHANGED
|
@@ -14,7 +14,6 @@ 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;
|
|
18
17
|
const service = app.defaultAuthentication ? app.defaultAuthentication(options.authService) : null;
|
|
19
18
|
if (!service) {
|
|
20
19
|
throw new Error('An authentication service must exist before registering @feathersjs/authentication-oauth');
|
|
@@ -26,7 +25,6 @@ const setup = (options) => (app) => {
|
|
|
26
25
|
}
|
|
27
26
|
const { strategyNames } = service;
|
|
28
27
|
// Set up all the defaults
|
|
29
|
-
const { prefix = '/oauth' } = oauth.defaults || {};
|
|
30
28
|
const port = app.get('port');
|
|
31
29
|
let host = app.get('host');
|
|
32
30
|
let protocol = 'https';
|
|
@@ -37,17 +35,17 @@ const setup = (options) => (app) => {
|
|
|
37
35
|
host += `:${port}`;
|
|
38
36
|
}
|
|
39
37
|
}
|
|
40
|
-
const grant = (0, defaultsDeep_1.default)({
|
|
38
|
+
const grant = (0, defaultsDeep_1.default)({}, (0, omit_1.default)(oauth, ['redirect', 'origins']), {
|
|
41
39
|
defaults: {
|
|
42
|
-
prefix,
|
|
43
|
-
origin: `${
|
|
44
|
-
transport:
|
|
40
|
+
prefix: '/oauth',
|
|
41
|
+
origin: `${protocol}://${host}`,
|
|
42
|
+
transport: 'session',
|
|
45
43
|
response: ['tokens', 'raw', 'profile']
|
|
46
44
|
}
|
|
47
|
-
}
|
|
45
|
+
});
|
|
48
46
|
const getUrl = (url) => {
|
|
49
47
|
const { defaults } = grant;
|
|
50
|
-
return `${defaults.origin}${prefix}/${url}`;
|
|
48
|
+
return `${defaults.origin}${defaults.prefix}/${url}`;
|
|
51
49
|
};
|
|
52
50
|
(0, each_1.default)(grant, (value, name) => {
|
|
53
51
|
if (name !== 'defaults') {
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AAAA,uEAA8C;AAC9C,uDAA8B;AAC9B,uDAA8B;AAC9B,iDAAiD;AAEjD,yCAAwD;AAM3B,8FANpB,wBAAa,OAMoB;AAL1C,wDAAmD;AACnD,mCAAgE;AAEhE,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,kCAAkC,CAAC,CAAA;AAItD,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.24",
|
|
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.
|
|
57
|
-
"@feathersjs/commons": "^5.0.0-pre.
|
|
58
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
59
|
-
"@feathersjs/express": "^5.0.0-pre.
|
|
60
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
56
|
+
"@feathersjs/authentication": "^5.0.0-pre.24",
|
|
57
|
+
"@feathersjs/commons": "^5.0.0-pre.24",
|
|
58
|
+
"@feathersjs/errors": "^5.0.0-pre.24",
|
|
59
|
+
"@feathersjs/express": "^5.0.0-pre.24",
|
|
60
|
+
"@feathersjs/feathers": "^5.0.0-pre.24",
|
|
61
61
|
"express-session": "^1.17.3",
|
|
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.24",
|
|
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.8.1",
|
|
76
76
|
"typescript": "^4.7.3"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "72779fa2938f43d7b345b6861ff0035481a07de3"
|
|
79
79
|
}
|
package/src/index.ts
CHANGED
|
@@ -30,7 +30,6 @@ export const setup = (options: OauthSetupSettings) => (app: Application) => {
|
|
|
30
30
|
const { strategyNames } = service
|
|
31
31
|
|
|
32
32
|
// Set up all the defaults
|
|
33
|
-
const { prefix = '/oauth' } = oauth.defaults || {}
|
|
34
33
|
const port = app.get('port')
|
|
35
34
|
let host = app.get('host')
|
|
36
35
|
let protocol = 'https'
|
|
@@ -43,21 +42,18 @@ export const setup = (options: OauthSetupSettings) => (app: Application) => {
|
|
|
43
42
|
}
|
|
44
43
|
}
|
|
45
44
|
|
|
46
|
-
const grant = defaultsDeep(
|
|
47
|
-
{
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
},
|
|
55
|
-
omit(oauth, ['redirect', 'origins'])
|
|
56
|
-
)
|
|
45
|
+
const grant = defaultsDeep({}, omit(oauth, ['redirect', 'origins']), {
|
|
46
|
+
defaults: {
|
|
47
|
+
prefix: '/oauth',
|
|
48
|
+
origin: `${protocol}://${host}`,
|
|
49
|
+
transport: 'session',
|
|
50
|
+
response: ['tokens', 'raw', 'profile']
|
|
51
|
+
}
|
|
52
|
+
})
|
|
57
53
|
|
|
58
54
|
const getUrl = (url: string) => {
|
|
59
55
|
const { defaults } = grant
|
|
60
|
-
return `${defaults.origin}${prefix}/${url}`
|
|
56
|
+
return `${defaults.origin}${defaults.prefix}/${url}`
|
|
61
57
|
}
|
|
62
58
|
|
|
63
59
|
each(grant, (value, name) => {
|