@volcanicminds/backend 0.1.5 → 0.1.8
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/.nvmrc +1 -1
- package/README.md +98 -0
- package/TODO.md +6 -0
- package/dist/api/me/routes.js +1 -2
- package/dist/api/me/routes.js.map +1 -1
- package/dist/config/roles.js.map +1 -1
- package/dist/index.js +3 -3
- package/dist/index.js.map +1 -1
- package/dist/loader/roles.js +13 -4
- package/dist/loader/roles.js.map +1 -1
- package/dist/loader/router.js +9 -8
- package/dist/loader/router.js.map +1 -1
- package/index.d.ts +0 -1
- package/lib/api/me/routes.ts +1 -1
- package/lib/config/roles.ts +0 -7
- package/lib/index.ts +3 -3
- package/lib/loader/roles.ts +17 -9
- package/lib/loader/router.ts +10 -10
- package/package.json +1 -1
- package/types/global.d.ts +2 -8
package/.nvmrc
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
v18.12.0
|
package/README.md
CHANGED
|
@@ -144,3 +144,101 @@ SRV_HELMET=false
|
|
|
144
144
|
SRV_RATELIMIT=false
|
|
145
145
|
SRV_COMPRESS=false
|
|
146
146
|
```
|
|
147
|
+
|
|
148
|
+
## Routes
|
|
149
|
+
|
|
150
|
+
Minimal setup (routes.ts):
|
|
151
|
+
|
|
152
|
+
```js
|
|
153
|
+
module.exports = {
|
|
154
|
+
routes: [
|
|
155
|
+
{
|
|
156
|
+
method: 'GET',
|
|
157
|
+
path: '/',
|
|
158
|
+
handler: 'myController.test'
|
|
159
|
+
}
|
|
160
|
+
]
|
|
161
|
+
}
|
|
162
|
+
```
|
|
163
|
+
|
|
164
|
+
Some notes:
|
|
165
|
+
|
|
166
|
+
- It's possible define a generic **config** (optional).
|
|
167
|
+
- It's possible define a **config** for a specific route (optional).
|
|
168
|
+
- It's possible define a list of **roles** (optional).
|
|
169
|
+
- It's possible define a list of **middleware** (optional).
|
|
170
|
+
|
|
171
|
+
```js
|
|
172
|
+
module.exports = {
|
|
173
|
+
config: {
|
|
174
|
+
title: 'Example of routes.ts',
|
|
175
|
+
description: 'Example of routes.ts',
|
|
176
|
+
controller: 'controller',
|
|
177
|
+
tags: ['user', 'code'], // swagger
|
|
178
|
+
enable: true,
|
|
179
|
+
deprecated: false, // swagger
|
|
180
|
+
version: false // swagger
|
|
181
|
+
},
|
|
182
|
+
routes: [
|
|
183
|
+
{
|
|
184
|
+
method: 'GET',
|
|
185
|
+
path: '/',
|
|
186
|
+
roles: [],
|
|
187
|
+
handler: 'demo.user',
|
|
188
|
+
middlewares: ['global.isAuthenticated'],
|
|
189
|
+
config: {
|
|
190
|
+
enable: true,
|
|
191
|
+
title: 'Demo title', // swagger summary
|
|
192
|
+
description: 'Demo description', // swagger
|
|
193
|
+
tags: ['user', 'code'], // swagger
|
|
194
|
+
deprecated: false, // swagger
|
|
195
|
+
version: false, // swagger
|
|
196
|
+
response: {
|
|
197
|
+
403: {
|
|
198
|
+
description: 'Unsuccessful response',
|
|
199
|
+
type: 'object',
|
|
200
|
+
properties: {
|
|
201
|
+
hello: { type: 'string' }
|
|
202
|
+
}
|
|
203
|
+
},
|
|
204
|
+
200: {
|
|
205
|
+
description: 'Successful response',
|
|
206
|
+
type: 'object',
|
|
207
|
+
properties: {
|
|
208
|
+
id: { type: 'number' }
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
} // swagger
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
]
|
|
215
|
+
}
|
|
216
|
+
```
|
|
217
|
+
|
|
218
|
+
## Roles
|
|
219
|
+
|
|
220
|
+
By default, there are some basic roles:
|
|
221
|
+
|
|
222
|
+
- **public**
|
|
223
|
+
- **admin**
|
|
224
|
+
- **backoffice**
|
|
225
|
+
|
|
226
|
+
In this way you can add custom roles:
|
|
227
|
+
|
|
228
|
+
```js
|
|
229
|
+
import { Role } from '@volcanicminds/backend'
|
|
230
|
+
|
|
231
|
+
export const roles: Role[] = [
|
|
232
|
+
{
|
|
233
|
+
code: 'customer',
|
|
234
|
+
name: 'Customer',
|
|
235
|
+
description: 'Customer role'
|
|
236
|
+
}
|
|
237
|
+
]
|
|
238
|
+
```
|
|
239
|
+
|
|
240
|
+
You can use something like this to specify which roles (routes.ts) can recall some routes:
|
|
241
|
+
|
|
242
|
+
```js
|
|
243
|
+
roles: [roles.admin, roles.public]
|
|
244
|
+
```
|
package/TODO.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# TODO
|
|
2
2
|
|
|
3
|
+
https://tutorialjavascript.altervista.org/moduli-typescript
|
|
4
|
+
https://swagger.io/specification/v2/#swaggerObject
|
|
5
|
+
https://github.com/fastify/fastify-swagger
|
|
6
|
+
https://www.fastify.io/docs/latest/Reference/Validation-and-Serialization/
|
|
7
|
+
https://json-schema.org/draft/2020-12/json-schema-validation.html#name-pattern
|
|
8
|
+
|
|
3
9
|
- roles
|
|
4
10
|
- database psql
|
|
5
11
|
- hooks (esposti, es come middlewares ma per nome file specifico es onReady ecc)
|
package/dist/api/me/routes.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../lib/api/me/routes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../lib/api/me/routes.ts"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,GAAG;IACf,MAAM,EAAE;QACN,KAAK,EAAE,kBAAkB;QACzB,WAAW,EAAE,kBAAkB;QAC/B,UAAU,EAAE,YAAY;QACxB,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACtB,MAAM,EAAE,IAAI;QACZ,UAAU,EAAE,KAAK;QACjB,OAAO,EAAE,KAAK;KACf;IACD,MAAM,EAAE;QACN;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,CAAC,wBAAwB,CAAC;YACvC,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACtB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;gBACd,QAAQ,EAAE;oBACR,GAAG,EAAE;wBACH,WAAW,EAAE,qBAAqB;wBAClC,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBAC1B;qBACF;oBACD,GAAG,EAAE;wBACH,WAAW,EAAE,kBAAkB;wBAC/B,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBACvB;qBACF;iBACF;aACF;SACF;QACD;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,WAAW;YACjB,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,YAAY;YACrB,WAAW,EAAE,CAAC,wBAAwB,CAAC;YACvC,MAAM,EAAE;gBACN,KAAK,EAAE,OAAO;gBACd,WAAW,EAAE,OAAO;gBACpB,MAAM,EAAE,IAAI;gBACZ,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;aACf;SACF;QACD;YACE,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE;YACT,OAAO,EAAE,SAAS;YAClB,WAAW,EAAE,CAAC,gBAAgB,CAAC;YAC/B,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI;gBACZ,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,gBAAgB;gBAC7B,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;gBACtB,UAAU,EAAE,KAAK;gBACjB,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE;wBACV,EAAE,EAAE;4BACF,IAAI,EAAE,QAAQ;4BACd,WAAW,EAAE,SAAS;yBACvB;qBACF;iBACF;gBACD,QAAQ,EAAE;oBACR,GAAG,EAAE;wBACH,WAAW,EAAE,qBAAqB;wBAClC,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBAC1B;qBACF;oBACD,GAAG,EAAE;wBACH,WAAW,EAAE,kBAAkB;wBAC/B,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;yBACxB;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAA"}
|
package/dist/config/roles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../lib/config/roles.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../lib/config/roles.ts"],"names":[],"mappings":";;;AAEa,QAAA,KAAK,GAAW;IAC3B;QACE,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,WAAW,EAAE,aAAa;KAC3B;IACD;QACE,IAAI,EAAE,OAAO;QACb,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,YAAY;KAC1B;IACD;QACE,IAAI,EAAE,YAAY;QAClB,IAAI,EAAE,YAAY;QAClB,WAAW,EAAE,iBAAiB;KAC/B;CACF,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -69,7 +69,7 @@ function attachApollo(fastify) {
|
|
|
69
69
|
function addApolloRouting(fastify, apollo) {
|
|
70
70
|
return __awaiter(this, void 0, void 0, function* () {
|
|
71
71
|
if (apollo) {
|
|
72
|
-
log.
|
|
72
|
+
log.trace('Add graphql routes');
|
|
73
73
|
yield fastify.register((0, fastify_2.default)(apollo), {
|
|
74
74
|
context: context_1.myContextFunction
|
|
75
75
|
});
|
|
@@ -78,7 +78,7 @@ function addApolloRouting(fastify, apollo) {
|
|
|
78
78
|
}
|
|
79
79
|
function addFastifyRouting(fastify) {
|
|
80
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
81
|
-
log.
|
|
81
|
+
log.trace('Add fastify routes');
|
|
82
82
|
fastify.addHook('onSend', (req, reply) => __awaiter(this, void 0, void 0, function* () {
|
|
83
83
|
log.debug('onSend');
|
|
84
84
|
}));
|
|
@@ -122,7 +122,7 @@ function addFastifySwagger(fastify) {
|
|
|
122
122
|
const { NODE_ENV, SWAGGER, SWAGGER_TITLE, SWAGGER_DESCRIPTION, SWAGGER_VERSION } = process.env;
|
|
123
123
|
const loadSwagger = (0, yn_1.default)(SWAGGER, false);
|
|
124
124
|
if (loadSwagger && NODE_ENV !== 'production') {
|
|
125
|
-
log.
|
|
125
|
+
log.trace('Add swagger plugin');
|
|
126
126
|
yield fastify.register(swagger_1.default, {
|
|
127
127
|
swagger: {
|
|
128
128
|
info: {
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEZ,oDAA2B;AAC3B,gBAAM,CAAC,MAAM,EAAE,CAAA;AAEf,mDAA0B;AAC1B,2DAAkC;AAClC,kDAAmC;AACnC,4DAA6C;AAC7C,8DAA+C;AAE/C,sDAAkD;AAClD,+DAAsC;AACtC,qEAA2C;AAE3C,yDAAgC;AAChC,6DAAoC;AACpC,iEAAwC;AACxC,qEAA2C;AAE3C,2CAA6C;AAC7C,oEAAwG;AACxG,8CAA+D;AAC/D,mEAA0C;AAC1C,mEAAyC;AAEzC,SAAe,YAAY,CAAC,OAAwB;;QAClD,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAA;QAC1C,MAAM,MAAM,GAAG,IAAI,qBAAY,CAAY;YACzC,QAAQ,EAAR,mBAAQ;YACR,SAAS,EAAT,mBAAS;YACT,OAAO,EAAE,CAAC,IAAA,kCAAwB,EAAC,OAAO,CAAC,CAAC;SAC7C,CAAC,CAAA;QAEF,MAAM,MAAM,CAAC,KAAK,EAAE,CAAA;QAEpB,OAAO,MAAM,CAAA;IACf,CAAC;CAAA;AAED,SAAe,gBAAgB,CAAC,OAAwB,EAAE,MAAsC;;QAC9F,IAAI,MAAM,EAAE;YACV,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../lib/index.ts"],"names":[],"mappings":"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"}
|
package/dist/loader/roles.js
CHANGED
|
@@ -1,13 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.load = void 0;
|
|
4
|
-
const
|
|
4
|
+
const glob = require('glob');
|
|
5
|
+
const path = require('path');
|
|
5
6
|
function load() {
|
|
6
7
|
const roles = {};
|
|
7
|
-
|
|
8
|
-
|
|
8
|
+
const patterns = [`${__dirname}/../config/roles.{ts,js}`, `${process.cwd()}/config/roles.{ts,js}`];
|
|
9
|
+
patterns.forEach((pattern) => {
|
|
10
|
+
log.d && log.debug('Looking for ' + pattern);
|
|
11
|
+
glob.sync(pattern).forEach((f) => {
|
|
12
|
+
const { roles: configRoles = [] } = require(f);
|
|
13
|
+
configRoles.forEach((role) => {
|
|
14
|
+
roles[role.code] = role;
|
|
15
|
+
});
|
|
16
|
+
});
|
|
9
17
|
});
|
|
10
|
-
|
|
18
|
+
log.i && log.info('Roles loaded: ' + Object.keys(roles).join(', '));
|
|
19
|
+
return roles;
|
|
11
20
|
}
|
|
12
21
|
exports.load = load;
|
|
13
22
|
//# sourceMappingURL=roles.js.map
|
package/dist/loader/roles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../lib/loader/roles.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../lib/loader/roles.ts"],"names":[],"mappings":";;;AAGA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,SAAgB,IAAI;IAClB,MAAM,KAAK,GAAU,EAAE,CAAA;IAEvB,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,0BAA0B,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAA;IAClG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;QAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;YACvC,MAAM,EAAE,KAAK,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAC9C,WAAW,CAAC,OAAO,CAAC,CAAC,IAAU,EAAE,EAAE;gBACjC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;YACzB,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IACnE,OAAO,KAAK,CAAA;AACd,CAAC;AAfD,oBAeC"}
|
package/dist/loader/router.js
CHANGED
|
@@ -17,20 +17,20 @@ function load() {
|
|
|
17
17
|
const validRoutes = [];
|
|
18
18
|
const patterns = [`${__dirname}/../api/**/routes.{ts,js}`, `${process.cwd()}/src/api/**/routes.{ts,js}`];
|
|
19
19
|
patterns.forEach((pattern) => {
|
|
20
|
-
log.
|
|
20
|
+
log.d && log.debug('Looking for ' + pattern);
|
|
21
21
|
glob.sync(pattern).forEach((f, index, values) => {
|
|
22
22
|
const base = path.dirname(f);
|
|
23
23
|
const dir = path.basename(base);
|
|
24
24
|
const file = path.join(dir, path.basename(f));
|
|
25
25
|
const routesjs = require(f);
|
|
26
|
-
const { routes = [], config: defaultConfig = {} } = routesjs
|
|
26
|
+
const { routes = [], config: defaultConfig = {} } = routesjs || {};
|
|
27
27
|
if (!defaultConfig.enable)
|
|
28
28
|
defaultConfig.enable = true;
|
|
29
29
|
if (defaultConfig.deprecated == null)
|
|
30
30
|
defaultConfig.deprecated = false;
|
|
31
31
|
if (defaultConfig.controller == null)
|
|
32
32
|
defaultConfig.controller = 'controller';
|
|
33
|
-
log.i && log.info(`
|
|
33
|
+
log.i && log.info(`Routes loaded: ${file} with ${routes.length} routes defined`);
|
|
34
34
|
log.d && log.debug(`Valid routes loaded from ${file}`);
|
|
35
35
|
routes.forEach((route, index) => {
|
|
36
36
|
const errors = [];
|
|
@@ -101,24 +101,25 @@ function apply(server, routes) {
|
|
|
101
101
|
log.t && log.trace(`Apply ${routes.length} routes to server with pid ${process.pid}`);
|
|
102
102
|
routes.forEach(({ handler, method, path, middlewares, roles, enable, base, file, func, doc }) => __awaiter(this, void 0, void 0, function* () {
|
|
103
103
|
if (enable) {
|
|
104
|
-
log.t && log.trace(
|
|
105
|
-
const allMiddlewares = (middlewares
|
|
104
|
+
log.t && log.trace(`* Add path ${method} ${path} on handle ${handler}`);
|
|
105
|
+
const allMiddlewares = (middlewares || []).map((m) => require(normalizeMiddlewarePath(base, m)));
|
|
106
106
|
server.route({
|
|
107
107
|
method: method,
|
|
108
108
|
path: path,
|
|
109
109
|
schema: doc,
|
|
110
|
-
|
|
110
|
+
preHandler: allMiddlewares,
|
|
111
|
+
handler: (req, reply) => {
|
|
111
112
|
var _a;
|
|
112
113
|
try {
|
|
113
114
|
if ((roles === null || roles === void 0 ? void 0 : roles.length) > 0) {
|
|
114
|
-
const userRoles = ((_a =
|
|
115
|
+
const userRoles = ((_a = req.user) === null || _a === void 0 ? void 0 : _a.roles) || [];
|
|
115
116
|
const resolvedRole = roles.filter((r) => userRoles.includes(r.code));
|
|
116
117
|
if (!resolvedRole || resolvedRole.length === 0) {
|
|
117
118
|
log.w && log.warn(`Not allowed to call ${method.toUpperCase()} ${path}`);
|
|
118
119
|
return reply.code(403).send();
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
|
-
return require(file)[func](
|
|
122
|
+
return require(file)[func](req, reply);
|
|
122
123
|
}
|
|
123
124
|
catch (err) {
|
|
124
125
|
log.e && log.error(`Cannot find ${file}.js or method ${func}: ${err}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../lib/loader/router.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAA;AAE5E,SAAgB,IAAI;IAClB,MAAM,WAAW,GAAsB,EAAE,CAAA;IACzC,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,2BAA2B,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,4BAA4B,CAAC,CAAA;IAExG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../lib/loader/router.ts"],"names":[],"mappings":"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"}
|
package/index.d.ts
CHANGED
package/lib/api/me/routes.ts
CHANGED
package/lib/config/roles.ts
CHANGED
package/lib/index.ts
CHANGED
|
@@ -39,7 +39,7 @@ async function attachApollo(fastify: FastifyInstance) {
|
|
|
39
39
|
|
|
40
40
|
async function addApolloRouting(fastify: FastifyInstance, apollo: ApolloServer<MyContext> | null) {
|
|
41
41
|
if (apollo) {
|
|
42
|
-
log.
|
|
42
|
+
log.trace('Add graphql routes')
|
|
43
43
|
await fastify.register(fastifyApollo(apollo), {
|
|
44
44
|
context: myContextFunction
|
|
45
45
|
})
|
|
@@ -55,7 +55,7 @@ async function addApolloRouting(fastify: FastifyInstance, apollo: ApolloServer<M
|
|
|
55
55
|
}
|
|
56
56
|
|
|
57
57
|
async function addFastifyRouting(fastify: FastifyInstance) {
|
|
58
|
-
log.
|
|
58
|
+
log.trace('Add fastify routes')
|
|
59
59
|
|
|
60
60
|
fastify.addHook('onSend', async (req, reply) => {
|
|
61
61
|
log.debug('onSend')
|
|
@@ -108,7 +108,7 @@ async function addFastifySwagger(fastify: FastifyInstance) {
|
|
|
108
108
|
const loadSwagger = yn(SWAGGER, false)
|
|
109
109
|
|
|
110
110
|
if (loadSwagger && NODE_ENV !== 'production') {
|
|
111
|
-
log.
|
|
111
|
+
log.trace('Add swagger plugin')
|
|
112
112
|
|
|
113
113
|
await fastify.register(swagger, {
|
|
114
114
|
swagger: {
|
package/lib/loader/roles.ts
CHANGED
|
@@ -1,14 +1,22 @@
|
|
|
1
|
-
import { Role,
|
|
2
|
-
import { roles as configRoles } from '../config/roles'
|
|
1
|
+
import { Role, Roles } from '../../types/global'
|
|
2
|
+
// import { roles as configRoles } from '../config/roles'
|
|
3
|
+
|
|
4
|
+
const glob = require('glob')
|
|
5
|
+
const path = require('path')
|
|
3
6
|
|
|
4
7
|
export function load() {
|
|
5
|
-
const roles: {
|
|
6
|
-
[key in RoleKey]?: Role
|
|
7
|
-
} = {}
|
|
8
|
+
const roles: Roles = {}
|
|
8
9
|
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
const patterns = [`${__dirname}/../config/roles.{ts,js}`, `${process.cwd()}/config/roles.{ts,js}`]
|
|
11
|
+
patterns.forEach((pattern) => {
|
|
12
|
+
log.d && log.debug('Looking for ' + pattern)
|
|
13
|
+
glob.sync(pattern).forEach((f: string) => {
|
|
14
|
+
const { roles: configRoles = [] } = require(f)
|
|
15
|
+
configRoles.forEach((role: Role) => {
|
|
16
|
+
roles[role.code] = role
|
|
17
|
+
})
|
|
18
|
+
})
|
|
11
19
|
})
|
|
12
|
-
|
|
13
|
-
return
|
|
20
|
+
log.i && log.info('Roles loaded: ' + Object.keys(roles).join(', '))
|
|
21
|
+
return roles
|
|
14
22
|
}
|
package/lib/loader/router.ts
CHANGED
|
@@ -10,7 +10,7 @@ export function load(): ConfiguredRoute[] {
|
|
|
10
10
|
const patterns = [`${__dirname}/../api/**/routes.{ts,js}`, `${process.cwd()}/src/api/**/routes.{ts,js}`]
|
|
11
11
|
|
|
12
12
|
patterns.forEach((pattern) => {
|
|
13
|
-
log.
|
|
13
|
+
log.d && log.debug('Looking for ' + pattern)
|
|
14
14
|
glob.sync(pattern).forEach((f: string, index: number, values: string[]) => {
|
|
15
15
|
const base = path.dirname(f)
|
|
16
16
|
const dir = path.basename(base)
|
|
@@ -18,14 +18,14 @@ export function load(): ConfiguredRoute[] {
|
|
|
18
18
|
|
|
19
19
|
// allow array or structure
|
|
20
20
|
const routesjs = require(f)
|
|
21
|
-
const { routes = [], config: defaultConfig = {} } = routesjs
|
|
21
|
+
const { routes = [], config: defaultConfig = {} } = routesjs || {}
|
|
22
22
|
|
|
23
23
|
// adjust default config
|
|
24
24
|
if (!defaultConfig.enable) defaultConfig.enable = true
|
|
25
25
|
if (defaultConfig.deprecated == null) defaultConfig.deprecated = false
|
|
26
26
|
if (defaultConfig.controller == null) defaultConfig.controller = 'controller'
|
|
27
27
|
|
|
28
|
-
log.i && log.info(`
|
|
28
|
+
log.i && log.info(`Routes loaded: ${file} with ${routes.length} routes defined`)
|
|
29
29
|
log.d && log.debug(`Valid routes loaded from ${file}`)
|
|
30
30
|
|
|
31
31
|
routes.forEach((route: Route, index: number) => {
|
|
@@ -125,28 +125,28 @@ export function apply(server: any, routes: ConfiguredRoute[]): void {
|
|
|
125
125
|
|
|
126
126
|
routes.forEach(async ({ handler, method, path, middlewares, roles, enable, base, file, func, doc }) => {
|
|
127
127
|
if (enable) {
|
|
128
|
-
log.t && log.trace(
|
|
128
|
+
log.t && log.trace(`* Add path ${method} ${path} on handle ${handler}`)
|
|
129
129
|
|
|
130
|
-
const allMiddlewares =
|
|
131
|
-
middlewares?.length > 0 ? middlewares.map((m) => require(normalizeMiddlewarePath(base, m))) : []
|
|
130
|
+
const allMiddlewares = (middlewares || []).map((m) => require(normalizeMiddlewarePath(base, m)))
|
|
132
131
|
|
|
133
132
|
server.route({
|
|
134
133
|
method: method,
|
|
135
134
|
path: path,
|
|
136
135
|
schema: doc,
|
|
137
|
-
|
|
138
|
-
handler: (
|
|
136
|
+
preHandler: allMiddlewares,
|
|
137
|
+
handler: (req: FastifyRequest, reply: FastifyReply) => {
|
|
139
138
|
try {
|
|
140
139
|
if (roles?.length > 0) {
|
|
141
|
-
const userRoles =
|
|
140
|
+
const userRoles = req.user?.roles || []
|
|
142
141
|
const resolvedRole = roles.filter((r) => userRoles.includes(r.code))
|
|
142
|
+
|
|
143
143
|
if (!resolvedRole || resolvedRole.length === 0) {
|
|
144
144
|
log.w && log.warn(`Not allowed to call ${method.toUpperCase()} ${path}`)
|
|
145
145
|
return reply.code(403).send()
|
|
146
146
|
}
|
|
147
147
|
}
|
|
148
148
|
|
|
149
|
-
return require(file)[func](
|
|
149
|
+
return require(file)[func](req, reply)
|
|
150
150
|
} catch (err) {
|
|
151
151
|
log.e && log.error(`Cannot find ${file}.js or method ${func}: ${err}`)
|
|
152
152
|
return reply.code(500).send(`Invalid handler ${handler}`)
|
package/package.json
CHANGED
package/types/global.d.ts
CHANGED
|
@@ -12,14 +12,8 @@ export interface Role {
|
|
|
12
12
|
description: string
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export
|
|
16
|
-
|
|
17
|
-
admin = 'admin',
|
|
18
|
-
backoffice = 'backoffice'
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export declare type Roles = {
|
|
22
|
-
[key in RoleKey]: Role
|
|
15
|
+
export interface Roles {
|
|
16
|
+
[option: string]: Role
|
|
23
17
|
}
|
|
24
18
|
|
|
25
19
|
export interface RouteConfig {
|