@feathersjs/authentication-oauth 5.0.9 → 5.0.11
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/service.d.ts +2 -2
- package/lib/service.js +3 -3
- package/lib/service.js.map +1 -1
- package/package.json +15 -15
- package/src/service.ts +6 -6
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.11](https://github.com/feathersjs/feathers/compare/v5.0.10...v5.0.11) (2023-10-11)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
- **knex:** Update all dependencies and Knex peer ([#3308](https://github.com/feathersjs/feathers/issues/3308)) ([d2f9860](https://github.com/feathersjs/feathers/commit/d2f986036c4741cce2339d8abbcc6b2eb037a12a))
|
|
11
|
+
|
|
12
|
+
## [5.0.10](https://github.com/feathersjs/feathers/compare/v5.0.9...v5.0.10) (2023-10-03)
|
|
13
|
+
|
|
14
|
+
### Bug Fixes
|
|
15
|
+
|
|
16
|
+
- **authentication-oauth:** Move Grant error handling to the correct spot ([#3297](https://github.com/feathersjs/feathers/issues/3297)) ([e9c0828](https://github.com/feathersjs/feathers/commit/e9c0828937453c3f0a1bd16010089b825185eab6))
|
|
17
|
+
|
|
6
18
|
## [5.0.9](https://github.com/feathersjs/feathers/compare/v5.0.8...v5.0.9) (2023-09-27)
|
|
7
19
|
|
|
8
20
|
### Bug Fixes
|
package/lib/service.d.ts
CHANGED
|
@@ -15,8 +15,8 @@ export type OAuthParams = Omit<Params, 'route'> & {
|
|
|
15
15
|
};
|
|
16
16
|
};
|
|
17
17
|
export declare class OAuthError extends FeathersError {
|
|
18
|
-
location
|
|
19
|
-
constructor(message: string, data: any, location
|
|
18
|
+
location: string;
|
|
19
|
+
constructor(message: string, data: any, location: string);
|
|
20
20
|
}
|
|
21
21
|
export declare const redirectHook: () => (context: HookContext, next: NextFunction) => Promise<void>;
|
|
22
22
|
export declare class OAuthService {
|
package/lib/service.js
CHANGED
|
@@ -89,10 +89,10 @@ class OAuthService {
|
|
|
89
89
|
strategy: name,
|
|
90
90
|
...payload
|
|
91
91
|
};
|
|
92
|
-
if (payload.error) {
|
|
93
|
-
throw new OAuthError(payload.error_description || payload.error, payload);
|
|
94
|
-
}
|
|
95
92
|
try {
|
|
93
|
+
if (payload.error) {
|
|
94
|
+
throw new errors_1.GeneralError(payload.error_description || payload.error, payload);
|
|
95
|
+
}
|
|
96
96
|
debug(`Calling ${authService}.create authentication with strategy ${name}`);
|
|
97
97
|
const authResult = await this.service.create(authentication, authParams);
|
|
98
98
|
debug('Successful oAuth authentication, sending response');
|
package/lib/service.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAiD;AAEjD,+
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.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.
|
|
4
|
+
"version": "5.0.11",
|
|
5
5
|
"homepage": "https://feathersjs.com",
|
|
6
6
|
"main": "lib/",
|
|
7
7
|
"types": "lib/",
|
|
@@ -54,34 +54,34 @@
|
|
|
54
54
|
"access": "public"
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
|
-
"@feathersjs/authentication": "^5.0.
|
|
58
|
-
"@feathersjs/commons": "^5.0.
|
|
59
|
-
"@feathersjs/errors": "^5.0.
|
|
60
|
-
"@feathersjs/express": "^5.0.
|
|
61
|
-
"@feathersjs/feathers": "^5.0.
|
|
62
|
-
"@feathersjs/koa": "^5.0.
|
|
63
|
-
"@feathersjs/schema": "^5.0.
|
|
57
|
+
"@feathersjs/authentication": "^5.0.11",
|
|
58
|
+
"@feathersjs/commons": "^5.0.11",
|
|
59
|
+
"@feathersjs/errors": "^5.0.11",
|
|
60
|
+
"@feathersjs/express": "^5.0.11",
|
|
61
|
+
"@feathersjs/feathers": "^5.0.11",
|
|
62
|
+
"@feathersjs/koa": "^5.0.11",
|
|
63
|
+
"@feathersjs/schema": "^5.0.11",
|
|
64
64
|
"cookie-session": "^2.0.0",
|
|
65
|
-
"grant": "^5.4.
|
|
65
|
+
"grant": "^5.4.22",
|
|
66
66
|
"koa-session": "^6.4.0",
|
|
67
67
|
"lodash": "^4.17.21",
|
|
68
68
|
"qs": "^6.11.2"
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
|
-
"@feathersjs/memory": "^5.0.
|
|
71
|
+
"@feathersjs/memory": "^5.0.11",
|
|
72
72
|
"@types/cookie-session": "^2.0.45",
|
|
73
|
-
"@types/express": "^4.17.
|
|
73
|
+
"@types/express": "^4.17.19",
|
|
74
74
|
"@types/koa-session": "^6.4.2",
|
|
75
75
|
"@types/lodash": "^4.14.199",
|
|
76
|
-
"@types/mocha": "^10.0.
|
|
77
|
-
"@types/node": "^20.
|
|
76
|
+
"@types/mocha": "^10.0.2",
|
|
77
|
+
"@types/node": "^20.8.4",
|
|
78
78
|
"@types/tough-cookie": "^4.0.3",
|
|
79
|
-
"axios": "^1.5.
|
|
79
|
+
"axios": "^1.5.1",
|
|
80
80
|
"mocha": "^10.2.0",
|
|
81
81
|
"shx": "^0.3.4",
|
|
82
82
|
"tough-cookie": "^4.1.3",
|
|
83
83
|
"ts-node": "^10.9.1",
|
|
84
84
|
"typescript": "^5.2.2"
|
|
85
85
|
},
|
|
86
|
-
"gitHead": "
|
|
86
|
+
"gitHead": "91294817845178ff0e9d4709127cb3e46d3562be"
|
|
87
87
|
}
|
package/src/service.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { createDebug } from '@feathersjs/commons'
|
|
2
2
|
import { HookContext, NextFunction, Params } from '@feathersjs/feathers'
|
|
3
|
-
import { FeathersError } from '@feathersjs/errors'
|
|
3
|
+
import { FeathersError, GeneralError } from '@feathersjs/errors'
|
|
4
4
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
5
5
|
//@ts-ignore
|
|
6
6
|
import Grant from 'grant/lib/grant'
|
|
@@ -28,7 +28,7 @@ export class OAuthError extends FeathersError {
|
|
|
28
28
|
constructor(
|
|
29
29
|
message: string,
|
|
30
30
|
data: any,
|
|
31
|
-
public location
|
|
31
|
+
public location: string
|
|
32
32
|
) {
|
|
33
33
|
super(message, 'NotAuthenticated', 401, 'not-authenticated', data)
|
|
34
34
|
}
|
|
@@ -121,11 +121,11 @@ export class OAuthService {
|
|
|
121
121
|
...payload
|
|
122
122
|
}
|
|
123
123
|
|
|
124
|
-
if (payload.error) {
|
|
125
|
-
throw new OAuthError(payload.error_description || payload.error, payload)
|
|
126
|
-
}
|
|
127
|
-
|
|
128
124
|
try {
|
|
125
|
+
if (payload.error) {
|
|
126
|
+
throw new GeneralError(payload.error_description || payload.error, payload)
|
|
127
|
+
}
|
|
128
|
+
|
|
129
129
|
debug(`Calling ${authService}.create authentication with strategy ${name}`)
|
|
130
130
|
|
|
131
131
|
const authResult = await this.service.create(authentication, authParams)
|