@privateaim/server-http-kit 0.8.13 → 0.8.15
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 +38 -0
- package/dist/middlewares/error.js +3 -1
- package/dist/middlewares/error.js.map +1 -1
- package/dist/middlewares/module.d.ts +2 -2
- package/dist/middlewares/module.d.ts.map +1 -1
- package/dist/middlewares/module.js +11 -16
- package/dist/middlewares/module.js.map +1 -1
- package/dist/middlewares/types.d.ts +1 -1
- package/dist/middlewares/types.d.ts.map +1 -1
- package/dist/request/permission/module.js +2 -2
- package/dist/request/permission/module.js.map +1 -1
- package/dist/services/authup/utils.d.ts.map +1 -1
- package/dist/services/authup/utils.js +2 -1
- package/dist/services/authup/utils.js.map +1 -1
- package/package.json +19 -18
- package/src/middlewares/error.ts +2 -2
- package/src/middlewares/module.ts +15 -18
- package/src/middlewares/types.ts +1 -1
- package/src/request/permission/module.ts +2 -2
- package/src/services/authup/utils.ts +3 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,43 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [0.8.15](https://github.com/PrivateAIM/hub/compare/v0.8.14...v0.8.15) (2025-07-30)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Features
|
|
7
|
+
|
|
8
|
+
* event (re-) modelling ([#1125](https://github.com/PrivateAIM/hub/issues/1125)) ([621f704](https://github.com/PrivateAIM/hub/commit/621f7041794d0bf6d530445a9c3e7c9b66a373ba))
|
|
9
|
+
* explicitly enable middlewares ([dcb95e1](https://github.com/PrivateAIM/hub/commit/dcb95e1c5750f4119977d12fb4a0a74c1a8424c8))
|
|
10
|
+
* migrated to authup v1.0.0-beta.27 ([f96db78](https://github.com/PrivateAIM/hub/commit/f96db782a5b74e3aa8ab1ada270af770f3c92631))
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Dependencies
|
|
14
|
+
|
|
15
|
+
* The following workspace dependencies were updated
|
|
16
|
+
* dependencies
|
|
17
|
+
* @privateaim/kit bumped from ^0.8.14 to ^0.8.15
|
|
18
|
+
* @privateaim/server-kit bumped from ^0.8.14 to ^0.8.15
|
|
19
|
+
|
|
20
|
+
## [0.8.14](https://github.com/PrivateAIM/hub/compare/v0.8.13...v0.8.14) (2025-07-10)
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
### Features
|
|
24
|
+
|
|
25
|
+
* **messenger:** mount default middlewares ([d7ede75](https://github.com/PrivateAIM/hub/commit/d7ede752688b73a43bb9ca99557ffb17e9594cc1))
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
### Bug Fixes
|
|
29
|
+
|
|
30
|
+
* **deps:** bump the minorandpatch group across 1 directory with 19 updates ([#1099](https://github.com/PrivateAIM/hub/issues/1099)) ([30b0ab6](https://github.com/PrivateAIM/hub/commit/30b0ab6b748b287380eb84ac0c8aae4ee22e0be7))
|
|
31
|
+
* **deps:** bump the minorandpatch group across 1 directory with 24 updates ([#1084](https://github.com/PrivateAIM/hub/issues/1084)) ([92a3f43](https://github.com/PrivateAIM/hub/commit/92a3f43eb47795a7fff756939a036f2e771bd3cd))
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
### Dependencies
|
|
35
|
+
|
|
36
|
+
* The following workspace dependencies were updated
|
|
37
|
+
* dependencies
|
|
38
|
+
* @privateaim/kit bumped from ^0.8.13 to ^0.8.14
|
|
39
|
+
* @privateaim/server-kit bumped from ^0.8.13 to ^0.8.14
|
|
40
|
+
|
|
3
41
|
## [0.8.13](https://github.com/PrivateAIM/hub/compare/v0.8.12...v0.8.13) (2025-05-05)
|
|
4
42
|
|
|
5
43
|
|
|
@@ -18,10 +18,12 @@ function mountErrorMiddleware(router) {
|
|
|
18
18
|
const isServerError = error.statusCode >= 500 &&
|
|
19
19
|
error.statusCode < 600;
|
|
20
20
|
if (isServerError || error.logMessage) {
|
|
21
|
-
(0, server_kit_1.useLogger)().error(error);
|
|
22
21
|
if (error.cause) {
|
|
23
22
|
(0, server_kit_1.useLogger)().error(error.cause);
|
|
24
23
|
}
|
|
24
|
+
else {
|
|
25
|
+
(0, server_kit_1.useLogger)().error(error);
|
|
26
|
+
}
|
|
25
27
|
}
|
|
26
28
|
if (error.cause instanceof access_1.PermissionError) {
|
|
27
29
|
error.expose = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/middlewares/error.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAUH,oDAyEC;AAjFD,2CAAoE;AACpE,yCAA2C;AAE3C,mCAAsC;AACtC,uDAAmD;AACnD,yDAA8D;AAC9D,qCAA6C;AAE7C,SAAgB,oBAAoB,CAAC,MAAc;IAC/C,MAAM,CAAC,GAAG,CAAC,IAAA,qBAAY,EAAC,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QACxC,MAAM,aAAa,GAAG,KAAK,CAAC,UAAU,IAAI,GAAG;YACzC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;QAE3B,IAAI,aAAa,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACpC,IAAA,sBAAS,GAAE,CAAC,KAAK,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"error.js","sourceRoot":"","sources":["../../src/middlewares/error.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { Router } from 'routup';
|
|
2
|
-
import type {
|
|
3
|
-
export declare function mountMiddlewares(router: Router,
|
|
2
|
+
import type { MiddlewareMountOptions } from './types';
|
|
3
|
+
export declare function mountMiddlewares(router: Router, options?: MiddlewareMountOptions): void;
|
|
4
4
|
//# sourceMappingURL=module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/middlewares/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AASrC,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/middlewares/module.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AASrC,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAEtD,wBAAgB,gBAAgB,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,sBAA2B,QA6BvC"}
|
|
@@ -15,32 +15,27 @@ const decorators_1 = require("./decorators");
|
|
|
15
15
|
const prometheus_1 = require("./prometheus");
|
|
16
16
|
const rate_limit_1 = require("./rate-limit");
|
|
17
17
|
const swagger_1 = require("./swagger");
|
|
18
|
-
function mountMiddlewares(router,
|
|
19
|
-
|
|
20
|
-
ctx.cors ??= true;
|
|
21
|
-
ctx.prometheus ??= true;
|
|
22
|
-
ctx.rateLimit ??= true;
|
|
23
|
-
ctx.swagger ??= true;
|
|
24
|
-
if (ctx.cors) {
|
|
18
|
+
function mountMiddlewares(router, options = {}) {
|
|
19
|
+
if (options.cors) {
|
|
25
20
|
(0, cors_1.mountCorsMiddleware)(router);
|
|
26
21
|
}
|
|
27
|
-
if (
|
|
22
|
+
if (options.basic) {
|
|
28
23
|
(0, basic_1.mountBasicMiddleware)(router);
|
|
29
24
|
}
|
|
30
|
-
if (
|
|
31
|
-
(0, services_1.mountAuthupMiddleware)(router,
|
|
25
|
+
if (options.authup) {
|
|
26
|
+
(0, services_1.mountAuthupMiddleware)(router, options.authup);
|
|
32
27
|
}
|
|
33
|
-
if (
|
|
28
|
+
if (options.prometheus) {
|
|
34
29
|
(0, prometheus_1.mountPrometheusMiddleware)(router);
|
|
35
30
|
}
|
|
36
|
-
if (
|
|
31
|
+
if (options.rateLimit) {
|
|
37
32
|
(0, rate_limit_1.mountRateLimiterMiddleware)(router);
|
|
38
33
|
}
|
|
39
|
-
if (
|
|
40
|
-
(0, swagger_1.mountSwaggerMiddleware)(router, (0, utils_1.boolableToObject)(
|
|
34
|
+
if (options.swagger) {
|
|
35
|
+
(0, swagger_1.mountSwaggerMiddleware)(router, (0, utils_1.boolableToObject)(options.swagger));
|
|
41
36
|
}
|
|
42
|
-
if (
|
|
43
|
-
(0, decorators_1.mountDecoratorsMiddleware)(router,
|
|
37
|
+
if (options.decorators) {
|
|
38
|
+
(0, decorators_1.mountDecoratorsMiddleware)(router, options.decorators);
|
|
44
39
|
}
|
|
45
40
|
}
|
|
46
41
|
//# sourceMappingURL=module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/middlewares/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/middlewares/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAaH,4CA+BC;AAzCD,0CAAoD;AACpD,oCAA4C;AAC5C,mCAA+C;AAC/C,iCAA6C;AAC7C,6CAAyD;AACzD,6CAAyD;AACzD,6CAA0D;AAC1D,uCAAmD;AAGnD,SAAgB,gBAAgB,CAC5B,MAAc,EACd,UAAkC,EAAE;IAEpC,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACf,IAAA,0BAAmB,EAAC,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,IAAA,4BAAoB,EAAC,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACjB,IAAA,gCAAqB,EAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,IAAA,sCAAyB,EAAC,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;QACpB,IAAA,uCAA0B,EAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClB,IAAA,gCAAsB,EAAC,MAAM,EAAE,IAAA,wBAAgB,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;QACrB,IAAA,sCAAyB,EAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1D,CAAC;AACL,CAAC"}
|
|
@@ -7,7 +7,7 @@ export type MiddlewareSwaggerOptions = {
|
|
|
7
7
|
export type MiddlewareDecoratorsOptions = {
|
|
8
8
|
controllers: (ClassType | Record<string, any>)[];
|
|
9
9
|
};
|
|
10
|
-
export type
|
|
10
|
+
export type MiddlewareMountOptions = {
|
|
11
11
|
options?: MiddlewareSwaggerOptions;
|
|
12
12
|
authup?: AuthupMiddlewareRegistrationOptions;
|
|
13
13
|
basic?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/middlewares/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,aAAa,CAAC;AAEvE,MAAM,MAAM,wBAAwB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACtC,WAAW,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAA;CACnD,CAAC;AAEF,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/middlewares/types.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,mCAAmC,EAAE,MAAM,aAAa,CAAC;AAEvE,MAAM,MAAM,wBAAwB,GAAG;IACnC,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACtC,WAAW,EAAE,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,EAAE,CAAA;CACnD,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACjC,OAAO,CAAC,EAAE,wBAAwB,CAAC;IAEnC,MAAM,CAAC,EAAE,mCAAmC,CAAC;IAC7C,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,UAAU,CAAC,EAAE,2BAA2B,CAAC;IACzC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,wBAAwB,GAAG,OAAO,CAAC;CAChD,CAAC"}
|
|
@@ -35,8 +35,8 @@ class RequestPermissionChecker {
|
|
|
35
35
|
extendCheckContext(ctx) {
|
|
36
36
|
const scopes = (0, env_1.useRequestEnv)(this.req, 'scopes') || [];
|
|
37
37
|
if (scopes.indexOf(core_kit_1.ScopeName.GLOBAL) !== -1) {
|
|
38
|
-
ctx.
|
|
39
|
-
...ctx.
|
|
38
|
+
ctx.input = {
|
|
39
|
+
...ctx.input || {},
|
|
40
40
|
identity: (0, identity_1.useRequestIdentity)(this.req),
|
|
41
41
|
};
|
|
42
42
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/request/permission/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAA6C;AAM7C,gCAAuC;AACvC,0CAAiD;AAEjD,MAAa,wBAAwB;IACvB,GAAG,CAAU;IAEb,OAAO,CAAoB;IAErC,YAAY,GAAY,EAAE,OAA0B;QAChD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,iEAAiE;IAEjE,KAAK,CAAC,KAAK,CAAC,GAAkC;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAkC;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,iEAAiE;IAEjE,KAAK,CAAC,aAAa,CAAC,GAAkC;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAkC;QAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,iEAAiE;IAEvD,kBAAkB,CAAC,GAAkC;QAC3D,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvD,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1C,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../../src/request/permission/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+CAA6C;AAM7C,gCAAuC;AACvC,0CAAiD;AAEjD,MAAa,wBAAwB;IACvB,GAAG,CAAU;IAEb,OAAO,CAAoB;IAErC,YAAY,GAAY,EAAE,OAA0B;QAChD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,iEAAiE;IAEjE,KAAK,CAAC,KAAK,CAAC,GAAkC;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAkC;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,iEAAiE;IAEjE,KAAK,CAAC,aAAa,CAAC,GAAkC;QAClD,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACpE,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAkC;QAC/C,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACjE,CAAC;IAED,iEAAiE;IAEvD,kBAAkB,CAAC,GAAkC;QAC3D,MAAM,MAAM,GAAG,IAAA,mBAAa,EAAC,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;QACvD,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YAC1C,GAAG,CAAC,KAAK,GAAG;gBACR,GAAG,GAAG,CAAC,KAAK,IAAI,EAAE;gBAClB,QAAQ,EAAE,IAAA,6BAAkB,EAAC,IAAI,CAAC,GAAG,CAAC;aACzC,CAAC;QACN,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;CACJ;AA3CD,4DA2CC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAItC,KAAK,4BAA4B,GAAG,IAAI,CACxC,qBAAqB,EACrB,aAAa,GACb,UAAU,GACV,YAAY,GACZ,KAAK,GACL,UAAU,GACV,UAAU,GACV,OAAO,CACN,CAAC;AAEF,wBAAgB,+BAA+B,IAAI,4BAA4B,CAW9E;AAED,wBAAgB,0BAA0B,CACtC,GAAG,EAAE,OAAO,EACZ,IAAI,EAAE,4BAA4B,EAClC,aAAa,CAAC,EAAE,OAAO,QA2B1B"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.createFakeTokenVerificationData = createFakeTokenVerificationData;
|
|
10
10
|
exports.applyTokenVerificationData = applyTokenVerificationData;
|
|
11
|
+
const specs_1 = require("@authup/specs");
|
|
11
12
|
const access_1 = require("@authup/access");
|
|
12
13
|
const core_kit_1 = require("@authup/core-kit");
|
|
13
14
|
const request_1 = require("../../request");
|
|
@@ -45,6 +46,6 @@ function applyTokenVerificationData(req, data, fakeAbilities) {
|
|
|
45
46
|
name: data.sub_name,
|
|
46
47
|
},
|
|
47
48
|
});
|
|
48
|
-
(0, request_1.setRequestEnv)(req, 'scopes', (0,
|
|
49
|
+
(0, request_1.setRequestEnv)(req, 'scopes', (0, specs_1.unwrapOAuth2Scope)(data.scope || []));
|
|
49
50
|
}
|
|
50
51
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/services/authup/utils.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;AAsBH,0EAWC;AAED,gEA8BC;AA/DD,yCAAkD;AAElD,2CAA6E;AAC7E,+CAAqD;AAGrD,2CAAwE;AACxE,+DAA+D;AAa/D,SAAgB,+BAA+B;IAC3C,OAAO;QACH,QAAQ,EAAE,sCAAsC;QAChD,UAAU,EAAE,4BAAiB;QAE7B,QAAQ,EAAE,MAAM;QAChB,GAAG,EAAE,sCAAsC;QAC3C,QAAQ,EAAE,OAAO;QAEjB,WAAW,EAAE,EAAE;KAClB,CAAC;AACN,CAAC;AAED,SAAgB,0BAA0B,CACtC,GAAY,EACZ,IAAkC,EAClC,aAAuB;IAEvB,IAAI,QAA6B,CAAC;IAClC,IAAI,aAAa,EAAE,CAAC;QAChB,QAAQ,GAAG,IAAI,4CAAsB,EAAE,CAAC;IAC5C,CAAC;SAAM,CAAC;QACJ,QAAQ,GAAG,IAAI,iCAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAI,0BAAiB,CAAC;QAC5C,QAAQ;KACX,CAAC,CAAC;IACH,MAAM,wBAAwB,GAAG,IAAI,kCAAwB,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACtF,IAAA,uBAAa,EAAC,GAAG,EAAE,mBAAmB,EAAE,wBAAwB,CAAC,CAAC;IAElE,IAAA,uBAAa,EAAC,GAAG,EAAE,UAAU,EAAE;QAC3B,EAAE,EAAE,IAAI,CAAC,GAAG;QACZ,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,OAAO,EAAE,IAAI,CAAC,QAAQ;QACtB,SAAS,EAAE,IAAI,CAAC,UAAU;QAC1B,UAAU,EAAE;YACR,EAAE,EAAE,IAAI,CAAC,GAAG;YACZ,IAAI,EAAE,IAAI,CAAC,QAAQ;SACtB;KACJ,CAAC,CAAC;IAEH,IAAA,uBAAa,EAAC,GAAG,EAAE,QAAQ,EAAE,IAAA,yBAAiB,EAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@privateaim/server-http-kit",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.15",
|
|
4
4
|
"main": "dist/index.js",
|
|
5
5
|
"types": "dist/index.d.ts",
|
|
6
6
|
"author": {
|
|
@@ -11,34 +11,35 @@
|
|
|
11
11
|
"license": "Apache-2.0",
|
|
12
12
|
"description": "This package contains the realtime application which connects the API with socket based clients.",
|
|
13
13
|
"dependencies": {
|
|
14
|
-
"@authup/access": "^1.0.0-beta.
|
|
15
|
-
"@authup/kit": "^1.0.0-beta.
|
|
16
|
-
"@authup/core-kit": "^1.0.0-beta.
|
|
17
|
-
"@authup/core-http-kit": "^1.0.0-beta.
|
|
18
|
-
"@authup/
|
|
19
|
-
"@authup/server-adapter-
|
|
14
|
+
"@authup/access": "^1.0.0-beta.27",
|
|
15
|
+
"@authup/kit": "^1.0.0-beta.27",
|
|
16
|
+
"@authup/core-kit": "^1.0.0-beta.27",
|
|
17
|
+
"@authup/core-http-kit": "^1.0.0-beta.27",
|
|
18
|
+
"@authup/specs": "^1.0.0-beta.27",
|
|
19
|
+
"@authup/server-adapter-kit": "^1.0.0-beta.27",
|
|
20
|
+
"@authup/server-adapter-http": "^1.0.0-beta.27",
|
|
20
21
|
"@ebec/http": "^2.3.0",
|
|
21
|
-
"@privateaim/kit": "^0.8.
|
|
22
|
-
"@privateaim/server-kit": "^0.8.
|
|
23
|
-
"@routup/basic": "^1.4.
|
|
24
|
-
"@routup/decorators": "^3.4.
|
|
25
|
-
"@routup/prometheus": "^2.4.
|
|
26
|
-
"@routup/rate-limit": "^2.4.
|
|
27
|
-
"@routup/swagger": "^2.4.
|
|
22
|
+
"@privateaim/kit": "^0.8.15",
|
|
23
|
+
"@privateaim/server-kit": "^0.8.15",
|
|
24
|
+
"@routup/basic": "^1.4.2",
|
|
25
|
+
"@routup/decorators": "^3.4.2",
|
|
26
|
+
"@routup/prometheus": "^2.4.1",
|
|
27
|
+
"@routup/rate-limit": "^2.4.1",
|
|
28
|
+
"@routup/swagger": "^2.4.2",
|
|
28
29
|
"cors": "^2.8.5",
|
|
29
|
-
"hapic": "^2.
|
|
30
|
+
"hapic": "^2.7.0",
|
|
30
31
|
"locter": "^2.1.6",
|
|
31
32
|
"validup": "^0.1.8"
|
|
32
33
|
},
|
|
33
34
|
"devDependencies": {
|
|
34
|
-
"@types/cors": "^2.8.
|
|
35
|
+
"@types/cors": "^2.8.19",
|
|
35
36
|
"redis-extension": "^2.0.2",
|
|
36
|
-
"routup": "^4.0.
|
|
37
|
+
"routup": "^4.0.2",
|
|
37
38
|
"typeorm-extension": "^3.7.1"
|
|
38
39
|
},
|
|
39
40
|
"peerDependencies": {
|
|
40
41
|
"redis-extension": "^2.0.2",
|
|
41
|
-
"routup": "^4.0.
|
|
42
|
+
"routup": "^4.0.2",
|
|
42
43
|
"typeorm-extension": "^3.7.1"
|
|
43
44
|
},
|
|
44
45
|
"scripts": {
|
package/src/middlewares/error.ts
CHANGED
|
@@ -19,10 +19,10 @@ export function mountErrorMiddleware(router: Router) {
|
|
|
19
19
|
error.statusCode < 600;
|
|
20
20
|
|
|
21
21
|
if (isServerError || error.logMessage) {
|
|
22
|
-
useLogger().error(error);
|
|
23
|
-
|
|
24
22
|
if (error.cause) {
|
|
25
23
|
useLogger().error(error.cause);
|
|
24
|
+
} else {
|
|
25
|
+
useLogger().error(error);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
|
|
@@ -14,40 +14,37 @@ import { mountDecoratorsMiddleware } from './decorators';
|
|
|
14
14
|
import { mountPrometheusMiddleware } from './prometheus';
|
|
15
15
|
import { mountRateLimiterMiddleware } from './rate-limit';
|
|
16
16
|
import { mountSwaggerMiddleware } from './swagger';
|
|
17
|
-
import type {
|
|
17
|
+
import type { MiddlewareMountOptions } from './types';
|
|
18
18
|
|
|
19
|
-
export function mountMiddlewares(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
ctx.swagger ??= true;
|
|
25
|
-
|
|
26
|
-
if (ctx.cors) {
|
|
19
|
+
export function mountMiddlewares(
|
|
20
|
+
router: Router,
|
|
21
|
+
options: MiddlewareMountOptions = {},
|
|
22
|
+
) {
|
|
23
|
+
if (options.cors) {
|
|
27
24
|
mountCorsMiddleware(router);
|
|
28
25
|
}
|
|
29
26
|
|
|
30
|
-
if (
|
|
27
|
+
if (options.basic) {
|
|
31
28
|
mountBasicMiddleware(router);
|
|
32
29
|
}
|
|
33
30
|
|
|
34
|
-
if (
|
|
35
|
-
mountAuthupMiddleware(router,
|
|
31
|
+
if (options.authup) {
|
|
32
|
+
mountAuthupMiddleware(router, options.authup);
|
|
36
33
|
}
|
|
37
34
|
|
|
38
|
-
if (
|
|
35
|
+
if (options.prometheus) {
|
|
39
36
|
mountPrometheusMiddleware(router);
|
|
40
37
|
}
|
|
41
38
|
|
|
42
|
-
if (
|
|
39
|
+
if (options.rateLimit) {
|
|
43
40
|
mountRateLimiterMiddleware(router);
|
|
44
41
|
}
|
|
45
42
|
|
|
46
|
-
if (
|
|
47
|
-
mountSwaggerMiddleware(router, boolableToObject(
|
|
43
|
+
if (options.swagger) {
|
|
44
|
+
mountSwaggerMiddleware(router, boolableToObject(options.swagger));
|
|
48
45
|
}
|
|
49
46
|
|
|
50
|
-
if (
|
|
51
|
-
mountDecoratorsMiddleware(router,
|
|
47
|
+
if (options.decorators) {
|
|
48
|
+
mountDecoratorsMiddleware(router, options.decorators);
|
|
52
49
|
}
|
|
53
50
|
}
|
package/src/middlewares/types.ts
CHANGED
|
@@ -17,7 +17,7 @@ export type MiddlewareDecoratorsOptions = {
|
|
|
17
17
|
controllers: (ClassType | Record<string, any>)[]
|
|
18
18
|
};
|
|
19
19
|
|
|
20
|
-
export type
|
|
20
|
+
export type MiddlewareMountOptions = {
|
|
21
21
|
options?: MiddlewareSwaggerOptions,
|
|
22
22
|
|
|
23
23
|
authup?: AuthupMiddlewareRegistrationOptions,
|
|
@@ -49,8 +49,8 @@ export class RequestPermissionChecker {
|
|
|
49
49
|
protected extendCheckContext(ctx: PermissionCheckerCheckContext) {
|
|
50
50
|
const scopes = useRequestEnv(this.req, 'scopes') || [];
|
|
51
51
|
if (scopes.indexOf(ScopeName.GLOBAL) !== -1) {
|
|
52
|
-
ctx.
|
|
53
|
-
...ctx.
|
|
52
|
+
ctx.input = {
|
|
53
|
+
...ctx.input || {},
|
|
54
54
|
identity: useRequestIdentity(this.req),
|
|
55
55
|
};
|
|
56
56
|
}
|
|
@@ -5,9 +5,10 @@
|
|
|
5
5
|
* view the LICENSE file that was distributed with this source code.
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
|
+
import { unwrapOAuth2Scope } from '@authup/specs';
|
|
8
9
|
import type { PermissionProvider } from '@authup/access';
|
|
9
10
|
import { PermissionChecker, PermissionMemoryProvider } from '@authup/access';
|
|
10
|
-
import { REALM_MASTER_NAME
|
|
11
|
+
import { REALM_MASTER_NAME } from '@authup/core-kit';
|
|
11
12
|
import type { TokenVerificationData } from '@authup/server-adapter-kit';
|
|
12
13
|
import type { Request } from 'routup';
|
|
13
14
|
import { RequestPermissionChecker, setRequestEnv } from '../../request';
|
|
@@ -66,5 +67,5 @@ export function applyTokenVerificationData(
|
|
|
66
67
|
},
|
|
67
68
|
});
|
|
68
69
|
|
|
69
|
-
setRequestEnv(req, 'scopes',
|
|
70
|
+
setRequestEnv(req, 'scopes', unwrapOAuth2Scope(data.scope || []));
|
|
70
71
|
}
|