@feathersjs/authentication-oauth 5.0.0-pre.33 → 5.0.0-pre.35
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 +12 -0
- package/lib/index.js +1 -1
- package/lib/index.js.map +1 -1
- package/lib/service.d.ts +2 -2
- package/lib/utils.d.ts +1 -1
- package/lib/utils.js +3 -3
- package/lib/utils.js.map +1 -1
- package/package.json +18 -18
- package/src/index.ts +2 -2
- package/src/utils.ts +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,18 @@
|
|
|
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.35](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.34...v5.0.0-pre.35) (2023-01-12)
|
|
7
|
+
|
|
8
|
+
### Features
|
|
9
|
+
|
|
10
|
+
- **generators:** Move core code generators to shared generators package ([#2982](https://github.com/feathersjs/feathers/issues/2982)) ([0328d22](https://github.com/feathersjs/feathers/commit/0328d2292153870bc43958f73d2c6f288a8cec17))
|
|
11
|
+
|
|
12
|
+
# [5.0.0-pre.34](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.33...v5.0.0-pre.34) (2022-12-14)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- **core:** Improve service option usage and method option typings ([#2902](https://github.com/feathersjs/feathers/issues/2902)) ([164d75c](https://github.com/feathersjs/feathers/commit/164d75c0f11139a316baa91f1762de8f8eb7da2d))
|
|
17
|
+
|
|
6
18
|
# [5.0.0-pre.33](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.32...v5.0.0-pre.33) (2022-11-08)
|
|
7
19
|
|
|
8
20
|
**Note:** Version bump only for package @feathersjs/authentication-oauth
|
package/lib/index.js
CHANGED
|
@@ -22,7 +22,7 @@ const oauth = (settings = {}) => (app) => {
|
|
|
22
22
|
...settings
|
|
23
23
|
};
|
|
24
24
|
const grantConfig = (0, utils_1.getGrantConfig)(authService);
|
|
25
|
-
const serviceOptions = (0, utils_1.
|
|
25
|
+
const serviceOptions = (0, utils_1.authenticationServiceOptions)(authService, oauthOptions);
|
|
26
26
|
const servicePath = `${grantConfig.defaults.prefix || 'oauth'}/:provider`;
|
|
27
27
|
app.use(servicePath, new service_1.OAuthService(authService, oauthOptions), serviceOptions);
|
|
28
28
|
const oauthService = app.service(servicePath);
|
package/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,iDAAiD;AACjD,+CAAoD;AAEpD,yCAAwD;AAM3B,8FANpB,wBAAa,OAMoB;AAL1C,uCAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,iDAAiD;AACjD,+CAAoD;AAEpD,yCAAwD;AAM3B,8FANpB,wBAAa,OAMoB;AAL1C,uCAAsD;AACtD,mCAA0F;AAE1F,MAAM,KAAK,GAAG,IAAA,qBAAW,EAAC,kCAAkC,CAAC,CAAA;AAItD,MAAM,KAAK,GAChB,CAAC,WAAwC,EAAE,EAAE,EAAE,CAC/C,CAAC,GAAgB,EAAE,EAAE;IACnB,MAAM,WAAW,GAAG,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,GAAG,CAAC,qBAAqB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IAEtG,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,0FAA0F,CAC3F,CAAA;KACF;IAED,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,KAAK,EAAE;QACpC,KAAK,CAAC,qFAAqF,CAAC,CAAA;QAC5F,OAAM;KACP;IAED,MAAM,YAAY,GAAG;QACnB,YAAY,EAAE,KAAK;QACnB,GAAG,QAAQ;KACZ,CAAA;IAED,MAAM,WAAW,GAAG,IAAA,sBAAc,EAAC,WAAW,CAAC,CAAA;IAC/C,MAAM,cAAc,GAAG,IAAA,oCAA4B,EAAC,WAAW,EAAE,YAAY,CAAC,CAAA;IAC9E,MAAM,WAAW,GAAG,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,IAAI,OAAO,YAAY,CAAA;IAEzE,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,sBAAY,CAAC,WAAW,EAAE,YAAY,CAAC,EAAE,cAAc,CAAC,CAAA;IAEjF,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;IAE7C,YAAY,CAAC,KAAK,CAAC;QACjB,MAAM,EAAE,EAAE,GAAG,EAAE,CAAC,IAAA,wBAAe,GAAE,EAAE,IAAA,sBAAY,GAAE,CAAC,EAAE;KACrD,CAAC,CAAA;IAEF,IAAI,OAAO,YAAY,CAAC,OAAO,KAAK,UAAU,EAAE;QAC9C,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAA;KAC7C;AACH,CAAC,CAAA;AApCU,QAAA,KAAK,SAoCf"}
|
package/lib/service.d.ts
CHANGED
|
@@ -2,12 +2,12 @@ import { HookContext, NextFunction, Params } from '@feathersjs/feathers';
|
|
|
2
2
|
import { FeathersError } from '@feathersjs/errors';
|
|
3
3
|
import { AuthenticationService } from '@feathersjs/authentication';
|
|
4
4
|
import { OauthSetupSettings } from './utils';
|
|
5
|
-
export
|
|
5
|
+
export type GrantResponse = {
|
|
6
6
|
location: string;
|
|
7
7
|
session: any;
|
|
8
8
|
state: any;
|
|
9
9
|
};
|
|
10
|
-
export
|
|
10
|
+
export type OAuthParams = Omit<Params, 'route'> & {
|
|
11
11
|
session: any;
|
|
12
12
|
state: Record<string, any>;
|
|
13
13
|
route: {
|
package/lib/utils.d.ts
CHANGED
|
@@ -14,4 +14,4 @@ export interface OauthSetupSettings {
|
|
|
14
14
|
export declare const getGrantConfig: (service: AuthenticationService) => GrantConfig;
|
|
15
15
|
export declare const setExpressParams: RequestHandler;
|
|
16
16
|
export declare const setKoaParams: Middleware;
|
|
17
|
-
export declare const
|
|
17
|
+
export declare const authenticationServiceOptions: (service: AuthenticationService, settings: OauthSetupSettings) => ServiceOptions;
|
package/lib/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.authenticationServiceOptions = exports.setKoaParams = exports.setExpressParams = exports.getGrantConfig = void 0;
|
|
7
7
|
require("@feathersjs/koa");
|
|
8
8
|
require("@feathersjs/express");
|
|
9
9
|
const cookie_session_1 = __importDefault(require("cookie-session"));
|
|
@@ -68,7 +68,7 @@ const setKoaParams = async (ctx, next) => {
|
|
|
68
68
|
await next();
|
|
69
69
|
};
|
|
70
70
|
exports.setKoaParams = setKoaParams;
|
|
71
|
-
const
|
|
71
|
+
const authenticationServiceOptions = (service, settings) => {
|
|
72
72
|
const { secret } = service.configuration;
|
|
73
73
|
const koaApp = service.app;
|
|
74
74
|
if (koaApp.context) {
|
|
@@ -90,5 +90,5 @@ const getServiceOptions = (service, settings) => {
|
|
|
90
90
|
}
|
|
91
91
|
};
|
|
92
92
|
};
|
|
93
|
-
exports.
|
|
93
|
+
exports.authenticationServiceOptions = authenticationServiceOptions;
|
|
94
94
|
//# 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":";;;;;;AAKA,2BAAwB;AACxB,+BAA4B;AAC5B,oEAAiD;AACjD,8DAA0C;AAK1C,mCAAiD;AAS1C,MAAM,cAAc,GAAG,CAAC,OAA8B,EAAe,EAAE;IAC5E,MAAM,EACJ,GAAG,EACH,aAAa,EAAE,EAAE,KAAK,EAAE,EACzB,GAAG,OAAO,CAAA;IACX,0BAA0B;IAC1B,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC5B,IAAI,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IAC1B,IAAI,QAAQ,GAAG,OAAO,CAAA;IAEtB,sEAAsE;IACtE,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,EAAE;QACzC,QAAQ,GAAG,MAAM,CAAA;QACjB,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YACzB,IAAI,IAAI,IAAI,IAAI,EAAE,CAAA;SACnB;KACF;IAED,MAAM,KAAK,GAAgB,IAAA,qBAAY,EAAC,EAAE,EAAE,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE;QAChF,QAAQ,EAAE;YACR,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE,GAAG,QAAQ,MAAM,IAAI,EAAE;YAC/B,SAAS,EAAE,OAAO;YAClB,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,SAAS,CAAC;SACvC;KACF,CAAC,CAAA;IAEF,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE;QAC7B,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAA;QAC1B,OAAO,GAAG,QAAQ,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,GAAG,EAAE,CAAA;IACtD,CAAC,CAAA;IAED,IAAA,aAAI,EAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC1B,IAAI,IAAI,KAAK,UAAU,EAAE;YACvB,KAAK,CAAC,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,MAAM,CAAC,GAAG,IAAI,WAAW,CAAC,CAAA;SACtE;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAvCY,QAAA,cAAc,kBAuC1B;AAEM,MAAM,gBAAgB,GAAmB,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;IACjE,MAAA,GAAG,CAAC,OAAO,EAAC,OAAO,QAAP,OAAO,GAAK,GAAG,EAAE;QAC3B,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACpB,CAAC,EAAA;IAED,GAAG,CAAC,QAAQ,GAAG;QACb,GAAG,GAAG,CAAC,QAAQ;QACf,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,MAAM;KAClB,CAAA;IAED,IAAI,EAAE,CAAA;AACR,CAAC,CAAA;AAZY,QAAA,gBAAgB,oBAY5B;AAEM,MAAM,YAAY,GAAe,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;;IAC1D,MAAA,GAAG,CAAC,OAAO,EAAC,OAAO,QAAP,OAAO,GAAK,GAAG,EAAE;QAC3B,GAAG,CAAC,OAAO,GAAG,IAAI,CAAA;IACpB,CAAC,EAAA;IAED,GAAG,CAAC,QAAQ,GAAG;QACb,GAAG,GAAG,CAAC,QAAQ;QACf,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,KAAK,EAAE,GAAG,CAAC,KAAK;KACV,CAAA;IAER,MAAM,IAAI,EAAE,CAAA;AACd,CAAC,CAAA;AAZY,QAAA,YAAY,gBAYxB;AAEM,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.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.35",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"scripts": {
|
|
44
44
|
"start": "ts-node test/app",
|
|
45
45
|
"prepublish": "npm run compile",
|
|
46
|
-
"pack": "npm pack --pack-destination ../
|
|
46
|
+
"pack": "npm pack --pack-destination ../generators/test/build",
|
|
47
47
|
"compile": "shx rm -rf lib/ && tsc && npm run pack",
|
|
48
48
|
"test": "mocha --config ../../.mocharc.json --recursive test/**.test.ts test/**/*.test.ts"
|
|
49
49
|
},
|
|
@@ -54,13 +54,13 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@feathersjs/authentication": "^5.0.0-pre.
|
|
58
|
-
"@feathersjs/commons": "^5.0.0-pre.
|
|
59
|
-
"@feathersjs/errors": "^5.0.0-pre.
|
|
60
|
-
"@feathersjs/express": "^5.0.0-pre.
|
|
61
|
-
"@feathersjs/feathers": "^5.0.0-pre.
|
|
62
|
-
"@feathersjs/koa": "^5.0.0-pre.
|
|
63
|
-
"@feathersjs/schema": "^5.0.0-pre.
|
|
57
|
+
"@feathersjs/authentication": "^5.0.0-pre.35",
|
|
58
|
+
"@feathersjs/commons": "^5.0.0-pre.35",
|
|
59
|
+
"@feathersjs/errors": "^5.0.0-pre.35",
|
|
60
|
+
"@feathersjs/express": "^5.0.0-pre.35",
|
|
61
|
+
"@feathersjs/feathers": "^5.0.0-pre.35",
|
|
62
|
+
"@feathersjs/koa": "^5.0.0-pre.35",
|
|
63
|
+
"@feathersjs/schema": "^5.0.0-pre.35",
|
|
64
64
|
"cookie-session": "^2.0.0",
|
|
65
65
|
"grant": "^5.4.21",
|
|
66
66
|
"koa-session": "^6.2.0",
|
|
@@ -68,20 +68,20 @@
|
|
|
68
68
|
"qs": "^6.11.0"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
|
-
"@feathersjs/memory": "^5.0.0-pre.
|
|
71
|
+
"@feathersjs/memory": "^5.0.0-pre.35",
|
|
72
72
|
"@types/cookie-session": "^2.0.44",
|
|
73
|
-
"@types/express": "^4.17.
|
|
73
|
+
"@types/express": "^4.17.15",
|
|
74
74
|
"@types/koa-session": "^5.10.6",
|
|
75
|
-
"@types/lodash": "^4.14.
|
|
76
|
-
"@types/mocha": "^10.0.
|
|
77
|
-
"@types/node": "^18.11.
|
|
75
|
+
"@types/lodash": "^4.14.191",
|
|
76
|
+
"@types/mocha": "^10.0.1",
|
|
77
|
+
"@types/node": "^18.11.18",
|
|
78
78
|
"@types/tough-cookie": "^4.0.2",
|
|
79
|
-
"axios": "^1.
|
|
80
|
-
"mocha": "^10.
|
|
79
|
+
"axios": "^1.2.2",
|
|
80
|
+
"mocha": "^10.2.0",
|
|
81
81
|
"shx": "^0.3.4",
|
|
82
82
|
"tough-cookie": "^4.1.2",
|
|
83
83
|
"ts-node": "^10.9.1",
|
|
84
|
-
"typescript": "^4.
|
|
84
|
+
"typescript": "^4.9.4"
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "c641598d9a4de3ceda10f56cf2af288a4236b15e"
|
|
87
87
|
}
|
package/src/index.ts
CHANGED
|
@@ -4,7 +4,7 @@ import { resolveDispatch } from '@feathersjs/schema'
|
|
|
4
4
|
|
|
5
5
|
import { OAuthStrategy, OAuthProfile } from './strategy'
|
|
6
6
|
import { redirectHook, OAuthService } from './service'
|
|
7
|
-
import { getGrantConfig,
|
|
7
|
+
import { getGrantConfig, authenticationServiceOptions, OauthSetupSettings } from './utils'
|
|
8
8
|
|
|
9
9
|
const debug = createDebug('@feathersjs/authentication-oauth')
|
|
10
10
|
|
|
@@ -32,7 +32,7 @@ export const oauth =
|
|
|
32
32
|
}
|
|
33
33
|
|
|
34
34
|
const grantConfig = getGrantConfig(authService)
|
|
35
|
-
const serviceOptions =
|
|
35
|
+
const serviceOptions = authenticationServiceOptions(authService, oauthOptions)
|
|
36
36
|
const servicePath = `${grantConfig.defaults.prefix || 'oauth'}/:provider`
|
|
37
37
|
|
|
38
38
|
app.use(servicePath, new OAuthService(authService, oauthOptions), serviceOptions)
|
package/src/utils.ts
CHANGED
|
@@ -89,7 +89,7 @@ export const setKoaParams: Middleware = async (ctx, next) => {
|
|
|
89
89
|
await next()
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
export const
|
|
92
|
+
export const authenticationServiceOptions = (
|
|
93
93
|
service: AuthenticationService,
|
|
94
94
|
settings: OauthSetupSettings
|
|
95
95
|
): ServiceOptions => {
|