@thisisagile/easy-express 7.1.0 → 7.2.0
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.
|
@@ -6,6 +6,7 @@ export declare class ExpressProvider implements AppProvider {
|
|
|
6
6
|
constructor(app?: Express);
|
|
7
7
|
use: (handler: Handler) => void;
|
|
8
8
|
route: (service: Service, resource: Resource) => void;
|
|
9
|
+
private addSecurityMiddleware;
|
|
9
10
|
listen: (port: number, message?: string) => void;
|
|
10
11
|
protected handle: (endpoint: Endpoint, options?: VerbOptions | undefined) => RequestHandler;
|
|
11
12
|
protected toResponse(res: Response, result: unknown, options: Required<VerbOptions>): void;
|
|
@@ -18,14 +18,7 @@ class ExpressProvider {
|
|
|
18
18
|
const router = express_1.default.Router({ mergeParams: true });
|
|
19
19
|
endpoints.forEach(({ endpoint, verb, requires }) => {
|
|
20
20
|
console.log(verb.verb.code, route.route(service.name));
|
|
21
|
-
|
|
22
|
-
if (requires.token)
|
|
23
|
-
middleware.push(SecurityHandler_1.checkToken());
|
|
24
|
-
if (requires.scope)
|
|
25
|
-
middleware.push(SecurityHandler_1.checkScope(requires.scope));
|
|
26
|
-
if (requires.uc)
|
|
27
|
-
middleware.push(SecurityHandler_1.checkUseCase(requires.uc));
|
|
28
|
-
router[verb.verb.toString()](route.route(service.name), ...middleware, this.handle(endpoint, verb.options));
|
|
21
|
+
router[verb.verb.toString()](route.route(service.name), ...this.addSecurityMiddleware(requires), this.handle(endpoint, verb.options));
|
|
29
22
|
});
|
|
30
23
|
this.app.use(router);
|
|
31
24
|
};
|
|
@@ -39,6 +32,16 @@ class ExpressProvider {
|
|
|
39
32
|
.catch(error => next(easy_1.toOriginatedError(error, options)));
|
|
40
33
|
this.app.set('trust proxy', ['loopback', 'linklocal', 'uniquelocal']);
|
|
41
34
|
}
|
|
35
|
+
addSecurityMiddleware(requires) {
|
|
36
|
+
const middleware = [];
|
|
37
|
+
if (requires.token)
|
|
38
|
+
middleware.push(SecurityHandler_1.checkToken());
|
|
39
|
+
if (requires.scope)
|
|
40
|
+
middleware.push(SecurityHandler_1.checkScope(requires.scope));
|
|
41
|
+
if (requires.uc)
|
|
42
|
+
middleware.push(SecurityHandler_1.checkUseCase(requires.uc));
|
|
43
|
+
return middleware;
|
|
44
|
+
}
|
|
42
45
|
toResponse(res, result, options) {
|
|
43
46
|
res.status(options.onOk.status);
|
|
44
47
|
res.type(options.type.code);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpressProvider.js","sourceRoot":"","sources":["../../src/express/ExpressProvider.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA4F;AAC5F,uDAAyE;AACzE,4CAe2B;AAI3B,MAAa,eAAe;IAC1B,YAAsB,MAAe,iBAAO,EAAE;QAAxB,QAAG,GAAH,GAAG,CAAqB;QAI9C,QAAG,GAAG,CAAC,OAAgB,EAAQ,EAAE;YAC/B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,OAAgB,EAAE,QAAkB,EAAQ,EAAE;YACrD,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,aAAM,CAAC,QAAQ,CAAC,CAAC;YAC9C,MAAM,MAAM,GAAG,iBAAO,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YAErD,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAS,EAAE,EAAE;gBACxD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBAEvD,MAAM,
|
|
1
|
+
{"version":3,"file":"ExpressProvider.js","sourceRoot":"","sources":["../../src/express/ExpressProvider.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thisisagile/easy-express",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.2.0",
|
|
4
4
|
"description": "Straightforward library for building domain-driven microservice architectures",
|
|
5
5
|
"author": "Sander Hoogendoorn",
|
|
6
6
|
"license": "MIT",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
"access": "public"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@thisisagile/easy-test": "7.
|
|
34
|
+
"@thisisagile/easy-test": "7.2.0",
|
|
35
35
|
"@types/cls-hooked": "^4.3.3",
|
|
36
36
|
"@types/form-urlencoded": "^4.4.0",
|
|
37
37
|
"@types/jsonwebtoken": "^8.5.2",
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"@types/validator": "^13.1.4"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"@thisisagile/easy": "7.
|
|
44
|
+
"@thisisagile/easy": "7.2.0",
|
|
45
45
|
"@types/express": "^4.17.12",
|
|
46
46
|
"cls-hooked": "^4.2.2",
|
|
47
47
|
"express": "^4.17.1",
|
|
@@ -7,7 +7,7 @@ import {
|
|
|
7
7
|
HttpStatus,
|
|
8
8
|
Resource,
|
|
9
9
|
rest,
|
|
10
|
-
Route,
|
|
10
|
+
Route, RouteRequires,
|
|
11
11
|
routes,
|
|
12
12
|
Service,
|
|
13
13
|
toList,
|
|
@@ -35,17 +35,20 @@ export class ExpressProvider implements AppProvider {
|
|
|
35
35
|
endpoints.forEach(({ endpoint, verb, requires }: Route) => {
|
|
36
36
|
console.log(verb.verb.code, route.route(service.name));
|
|
37
37
|
|
|
38
|
-
|
|
39
|
-
if (requires.token) middleware.push(checkToken());
|
|
40
|
-
if (requires.scope) middleware.push(checkScope(requires.scope));
|
|
41
|
-
if (requires.uc) middleware.push(checkUseCase(requires.uc));
|
|
42
|
-
|
|
43
|
-
router[verb.verb.toString() as ExpressVerb](route.route(service.name), ...middleware, this.handle(endpoint, verb.options));
|
|
38
|
+
router[verb.verb.toString() as ExpressVerb](route.route(service.name), ...this.addSecurityMiddleware(requires), this.handle(endpoint, verb.options));
|
|
44
39
|
});
|
|
45
40
|
|
|
46
41
|
this.app.use(router);
|
|
47
42
|
};
|
|
48
43
|
|
|
44
|
+
private addSecurityMiddleware(requires: RouteRequires): RequestHandler[] {
|
|
45
|
+
const middleware: RequestHandler[] = [];
|
|
46
|
+
if (requires.token) middleware.push(checkToken());
|
|
47
|
+
if (requires.scope) middleware.push(checkScope(requires.scope));
|
|
48
|
+
if (requires.uc) middleware.push(checkUseCase(requires.uc));
|
|
49
|
+
return middleware;
|
|
50
|
+
}
|
|
51
|
+
|
|
49
52
|
listen = (port: number, message = `Service is listening on port ${port}.`): void => {
|
|
50
53
|
this.app.listen(port, () => {
|
|
51
54
|
console.log(message);
|