@volcanicminds/backend 0.2.13 → 0.2.15

package/.dockerignore

@@ -1,2 +1,3 @@
-node-modules
-**/node_modules
+.git
+node_modules
+**/node_modules

package/README.md

@@ -33,6 +33,9 @@ NODE_ENV=development
 HOST=0.0.0.0
 PORT=2230
 
+JWT_SECRET=yourSecret
+JWT_EXPIRES_IN=5d
+
 # LOG_LEVEL: trace, debug, info, warn, error, fatal
 LOG_LEVEL=info
 LOG_COLORIZE=true
@@ -42,6 +45,7 @@ LOG_FASTIFY=false
 
 GRAPHQL=false
 SWAGGER=true
+SWAGGER_HOST=myawesome.backend.com
 SWAGGER_TITLE=API Documentation
 SWAGGER_DESCRIPTION=List of available APIs and schemes to use
 SWAGGER_VERSION=0.1.0
@@ -130,6 +134,17 @@ const logTimestamp = yn(LOG_TIMESTAMP, true)
 const logTimestampReadable = yn(LOG_TIMESTAMP_READABLE, true)
 ```
 
+## Bearer token
+
+```ruby
+JWT_SECRET=yourSecret
+JWT_EXPIRES_IN=5d
+```
+
+With `reply.jwtSign(user)` is possible obtain a fresh JWT token. Each authenticated calls must be recalled specifying in the header:
+
+`Authorization: Bearer <generated-token>`
+
 ## Swagger
 
 In the .env file you can change swagger settings in this way:
@@ -234,8 +249,13 @@ export async function user(req: FastifyRequest, reply: FastifyReply) {
 }
 ```
 
-An useful method is `req.data()` to grab **query** or **body** parameters.
-An useful method is `req.pars()` to grab **params** data.
+Useful methods / objects:
+
+- `req.user` to grab **user** data (validated and linked by JWT).
+- `req.data()` to grab **query** or **body** parameters.
+- `req.parameters()` to grab **params** data.
+- `req.roles()` to grab **Roles** (as `string[]`) from `req.user` if compiled.
+- `req.hasRole(role:Role)` to check if the **Role** is appliable for `req.user`.
 
 ## Roles
 

package/dist/lib/api/users/controller/user.js

@@ -12,13 +12,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isAdmin = exports.user = void 0;
 function user(req, reply) {
     return __awaiter(this, void 0, void 0, function* () {
-        reply.send(req.user ? Object.assign(Object.assign({}, req.user), { roles: req.user.getRoles() }) : {});
+        const user = req.user;
+        reply.send(user ? Object.assign(Object.assign({}, user), { roles: req.roles() }) : {});
     });
 }
 exports.user = user;
 function isAdmin(req, reply) {
     return __awaiter(this, void 0, void 0, function* () {
-        reply.send({ isAdmin: req.user && req.user.id && req.user.hasRole(roles.admin) });
+        const user = req.user;
+        reply.send({ isAdmin: (user === null || user === void 0 ? void 0 : user.id) && req.hasRole(roles.admin) });
     });
 }
 exports.isAdmin = isAdmin;

package/dist/lib/api/users/controller/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../lib/api/users/controller/user.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,SAAsB,IAAI,CAAC,GAAmB,EAAE,KAAmB;;QACjE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,iCAAM,GAAG,CAAC,IAAI,KAAE,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAG,CAAC,CAAC,EAAE,CAAC,CAAA;IACzE,CAAC;CAAA;AAFD,oBAEC;AAED,SAAsB,OAAO,CAAC,GAAmB,EAAE,KAAmB;;QACpE,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IACnF,CAAC;CAAA;AAFD,0BAEC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../lib/api/users/controller/user.ts"],"names":[],"mappings":";;;;;;;;;;;;AAGA,SAAsB,IAAI,CAAC,GAAmB,EAAE,KAAmB;;QACjE,MAAM,IAAI,GAAkC,GAAG,CAAC,IAAI,CAAA;QACpD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,iCAAM,IAAI,KAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,IAAG,CAAC,CAAC,EAAE,CAAC,CAAA;IACzD,CAAC;CAAA;AAHD,oBAGC;AAED,SAAsB,OAAO,CAAC,GAAmB,EAAE,KAAmB;;QACpE,MAAM,IAAI,GAAkC,GAAG,CAAC,IAAI,CAAA;QACpD,KAAK,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,KAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC/D,CAAC;CAAA;AAHD,0BAGC"}

package/dist/lib/hooks/onRequest.js

@@ -14,7 +14,9 @@ module.exports = (req, reply) => __awaiter(void 0, void 0, void 0, function* ()
     var _a, _b, _c, _d;
     log.i && (req.startedAt = new Date());
     req.data = () => (0, common_1.getData)(req);
-    req.pars = () => (0, common_1.getParams)(req);
+    req.parameters = () => (0, common_1.getParams)(req);
+    req.roles = () => ((req.user && req.user.roles) || []).map((role) => role === null || role === void 0 ? void 0 : role.code) || [];
+    req.hasRole = (r) => ((req.user && req.user.roles) || []).some((role) => (role === null || role === void 0 ? void 0 : role.code) === (r === null || r === void 0 ? void 0 : r.code));
     const auth = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a.authorization) || '';
     const [prefix, token] = auth.split(' ');
     if (prefix === 'Bearer' && token != null) {
@@ -22,9 +24,9 @@ module.exports = (req, reply) => __awaiter(void 0, void 0, void 0, function* ()
         if (global.npmDebugServerStarted) {
             req.user = {
                 id: userId || 123,
-                name: 'Jerry',
+                name: name,
                 email: 'jerry@george.com',
-                password: 'pippolippo',
+                password: 'seinfeld',
                 roles: [roles.public]
             };
             log.debug('Inject demo user ' + req.user.id);
@@ -32,18 +34,14 @@ module.exports = (req, reply) => __awaiter(void 0, void 0, void 0, function* ()
         if (((_b = req.routeConfig.requiredRoles) === null || _b === void 0 ? void 0 : _b.length) > 0) {
             const { method, url, requiredRoles } = req.routeConfig;
             const userRoles = ((_d = (_c = req.user) === null || _c === void 0 ? void 0 : _c.roles) === null || _d === void 0 ? void 0 : _d.map(({ code }) => code)) || [];
-            const resolvedRole = userRoles.length > 0 ? requiredRoles.filter((r) => userRoles.includes(r.code)) : [];
-            if (!resolvedRole.length) {
+            const resolvedRoles = userRoles.length > 0 ? requiredRoles.filter((r) => userRoles.includes(r.code)) : [];
+            if (!resolvedRoles.length) {
                 log.w && log.warn(`Not allowed to call ${method.toUpperCase()} ${url}`);
                 return reply
                     .code(403)
                     .send({ statusCode: 403, code: 'ROLE_NOT_ALLOWED', message: 'Not allowed to call this route' });
             }
         }
-        if (req.user) {
-            req.user.getRoles = () => (req.user.roles || []).map((role) => role === null || role === void 0 ? void 0 : role.code) || [];
-            req.user.hasRole = (r) => (req.user.roles || []).some((role) => (role === null || role === void 0 ? void 0 : role.code) === (r === null || r === void 0 ? void 0 : r.code));
-        }
     }
 });
 //# sourceMappingURL=onRequest.js.map

package/dist/lib/hooks/onRequest.js.map

@@ -1 +1 @@
-{"version":3,"file":"onRequest.js","sourceRoot":"","sources":["../../../lib/hooks/onRequest.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onRequest.js","sourceRoot":"","sources":["../../../lib/hooks/onRequest.ts"],"names":[],"mappings":"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"}

package/dist/lib/hooks/onResponse.js

@@ -9,10 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 module.exports = (req, reply) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
     let extraMessage = '';
-    if (log.i) {
-        const elapsed = new Date().getTime() - (((_a = req.startedAt) === null || _a === void 0 ? void 0 : _a.getTime()) || 0);
+    if (log.i && req.startedAt) {
+        const elapsed = new Date().getTime() - req.startedAt.getTime();
         extraMessage = `(${elapsed}ms)`;
     }
     if (log.t) {

package/dist/lib/hooks/onResponse.js.map

@@ -1 +1 @@
-{"version":3,"file":"onResponse.js","sourceRoot":"","sources":["../../../lib/hooks/onResponse.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG,CAAO,GAAG,EAAE,KAAK,EAAE,EAAE;;IACpC,IAAI,YAAY,GAAW,EAAE,CAAA;IAC7B,IAAI,GAAG,CAAC,CAAC,EAAE;QACT,MAAM,OAAO,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,CAAC,CAAA,MAAA,GAAG,CAAC,SAAS,0CAAE,OAAO,EAAE,KAAI,CAAC,CAAC,CAAA;QAC9E,YAAY,GAAG,IAAI,OAAO,KAAK,CAAA;KAChC;IACD,IAAI,GAAG,CAAC,CAAC,EAAE;QACT,MAAM,OAAO,GAAW,OAAO,GAAG,CAAC,WAAW,IAAI,CAAC,EAAE,CAAA;QACrD,MAAM,SAAS,GAAW,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAClF,YAAY,IAAI,IAAI,OAAO,GAAG,SAAS,SAAS,CAAA;KACjD;IAED,MAAM,OAAO,GAAW,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,UAAU,IAAI,YAAY,EAAE,CAAA;IACtF,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;AAC9G,CAAC,CAAA,CAAA"}
+{"version":3,"file":"onResponse.js","sourceRoot":"","sources":["../../../lib/hooks/onResponse.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,MAAM,CAAC,OAAO,GAAG,CAAO,GAAG,EAAE,KAAK,EAAE,EAAE;IACpC,IAAI,YAAY,GAAW,EAAE,CAAA;IAC7B,IAAI,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,SAAS,EAAE;QAC1B,MAAM,OAAO,GAAW,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,EAAE,CAAA;QACtE,YAAY,GAAG,IAAI,OAAO,KAAK,CAAA;KAChC;IACD,IAAI,GAAG,CAAC,CAAC,EAAE;QACT,MAAM,OAAO,GAAW,OAAO,GAAG,CAAC,WAAW,IAAI,CAAC,EAAE,CAAA;QACrD,MAAM,SAAS,GAAW,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;QAClF,YAAY,IAAI,IAAI,OAAO,GAAG,SAAS,SAAS,CAAA;KACjD;IAED,MAAM,OAAO,GAAW,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,KAAK,CAAC,UAAU,IAAI,YAAY,EAAE,CAAA;IACtF,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;AAC9G,CAAC,CAAA,CAAA"}

package/dist/lib/middleware/isAdmin.js

@@ -2,13 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const log = global.log;
 module.exports = (req, res, next) => {
-    var _a;
     try {
-        if (req.user && req.user.id && req.user.hasRole(roles.admin)) {
-            log.d && log.trace('isAdmin - user id ' + ((_a = req.user) === null || _a === void 0 ? void 0 : _a.id));
+        if (req.user && req.user.id && req.hasRole(roles.admin)) {
             return next();
         }
-        throw new Error('User not valid');
+        throw new Error('User without this privilege');
     }
     catch (err) {
         log.e && log.error(`Upps, something just happened ${err}`);

package/dist/lib/middleware/isAdmin.js.map

@@ -1 +1 @@
-{"version":3,"file":"isAdmin.js","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":";;AAEA,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;AACtB,MAAM,CAAC,OAAO,GAAG,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS,EAAE,EAAE;;IACrE,IAAI;QACF,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC5D,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,oBAAoB,IAAG,MAAA,GAAG,CAAC,IAAI,0CAAE,EAAE,CAAA,CAAC,CAAA;YACvD,OAAO,IAAI,EAAE,CAAA;SACd;QACD,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAA;KAClC;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KACxB;AACH,CAAC,CAAA"}
+{"version":3,"file":"isAdmin.js","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":";;AAEA,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAA;AACtB,MAAM,CAAC,OAAO,GAAG,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS,EAAE,EAAE;IACrE,IAAI;QACF,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YACvD,OAAO,IAAI,EAAE,CAAA;SACd;QACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;KAC/C;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC1D,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KACxB;AACH,CAAC,CAAA"}

package/lib/api/users/controller/user.ts

@@ -1,9 +1,12 @@
 import { FastifyReply, FastifyRequest } from 'fastify'
+import { AuthenticatedUser } from '../../../../types/global'
 
 export async function user(req: FastifyRequest, reply: FastifyReply) {
-  reply.send(req.user ? { ...req.user, roles: req.user.getRoles() } : {})
+  const user: AuthenticatedUser | undefined = req.user
+  reply.send(user ? { ...user, roles: req.roles() } : {})
 }
 
 export async function isAdmin(req: FastifyRequest, reply: FastifyReply) {
-  reply.send({ isAdmin: req.user && req.user.id && req.user.hasRole(roles.admin) })
+  const user: AuthenticatedUser | undefined = req.user
+  reply.send({ isAdmin: user?.id && req.hasRole(roles.admin) })
 }

package/lib/hooks/onRequest.ts

@@ -1,48 +1,47 @@
 import { getParams, getData } from '../util/common'
-import { Role } from '../../types/global'
+import { AuthenticatedUser, Role } from '../../types/global'
 
 module.exports = async (req, reply) => {
   // request enrichment
   log.i && (req.startedAt = new Date())
   req.data = () => getData(req)
-  req.pars = () => getParams(req)
+  req.parameters = () => getParams(req)
+  req.roles = () => ((req.user && req.user.roles) || []).map((role: Role) => role?.code) || []
+  req.hasRole = (r: Role) => ((req.user && req.user.roles) || []).some((role: Role) => role?.code === r?.code)
 
-  // authorization
+  // authorization check
   const auth = req.headers?.authorization || ''
   const [prefix, token] = auth.split(' ')
   if (prefix === 'Bearer' && token != null) {
     const { sub: userId, name, iat, exp } = reply.server.jwt.verify(token)
 
-    // demo
+    //TODO: demo
     if (global.npmDebugServerStarted) {
       req.user = {
         id: userId || 123,
-        name: 'Jerry',
+        name: name,
         email: 'jerry@george.com',
-        password: 'pippolippo',
+        password: 'seinfeld',
         // roles: [roles.admin, roles.public]
         roles: [roles.public]
-      }
+      } as AuthenticatedUser
+
       log.debug('Inject demo user ' + req.user.id)
     }
 
+    //TODO: recall plugin UserManagement for find user or error
+
     if (req.routeConfig.requiredRoles?.length > 0) {
       const { method, url, requiredRoles } = req.routeConfig
       const userRoles: string[] = req.user?.roles?.map(({ code }) => code) || []
-      const resolvedRole = userRoles.length > 0 ? requiredRoles.filter((r) => userRoles.includes(r.code)) : []
+      const resolvedRoles = userRoles.length > 0 ? requiredRoles.filter((r) => userRoles.includes(r.code)) : []
 
-      if (!resolvedRole.length) {
+      if (!resolvedRoles.length) {
         log.w && log.warn(`Not allowed to call ${method.toUpperCase()} ${url}`)
         return reply
           .code(403)
           .send({ statusCode: 403, code: 'ROLE_NOT_ALLOWED', message: 'Not allowed to call this route' })
       }
     }
-
-    // recall UserManager find / enrichment
-    if (req.user) {
-      req.user.getRoles = () => (req.user.roles || []).map((role: Role) => role?.code) || []
-      req.user.hasRole = (r: Role) => (req.user.roles || []).some((role: Role) => role?.code === r?.code)
-    }
   }
 }

package/lib/hooks/onResponse.ts

@@ -1,7 +1,7 @@
 module.exports = async (req, reply) => {
   let extraMessage: string = ''
-  if (log.i) {
-    const elapsed: number = new Date().getTime() - (req.startedAt?.getTime() || 0)
+  if (log.i && req.startedAt) {
+    const elapsed: number = new Date().getTime() - req.startedAt.getTime()
     extraMessage = `(${elapsed}ms)`
   }
   if (log.t) {

package/lib/middleware/isAdmin.ts

@@ -3,11 +3,10 @@ import { FastifyReply, FastifyRequest } from 'fastify'
 const log = global.log
 module.exports = (req: FastifyRequest, res: FastifyReply, next: any) => {
   try {
-    if (req.user && req.user.id && req.user.hasRole(roles.admin)) {
-      log.d && log.trace('isAdmin - user id ' + req.user?.id)
+    if (req.user && req.user.id && req.hasRole(roles.admin)) {
       return next()
     }
-    throw new Error('User not valid')
+    throw new Error('User without this privilege')
   } catch (err) {
     log.e && log.error(`Upps, something just happened ${err}`)
     res.code(403).send(err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volcanicminds/backend",
-  "version": "0.2.13",
+  "version": "0.2.15",
   "codename": "turin",
   "license": "MIT",
   "description": "The volcanic (minds) backend",
@@ -33,7 +33,7 @@
     "node": ">=16"
   },
   "scripts": {
-    "compile": "tsc",
+    "compile": "rm -rf ./dist && tsc",
     "preprod": "npm run compile",
     "prod": "node ./dist/server.js",
     "start": "ts-node ./server.ts",

package/types/global.d.ts

@@ -2,10 +2,7 @@ import { FastifyRequest, FastifyReply } from 'fastify'
 
 export interface AuthenticatedUser {
   id: number
-  extra: any
   roles: Role[]
-  getRoles(): string[]
-  hasRole(role: Role): boolean
 }
 
 export interface Role {
@@ -68,12 +65,13 @@ export interface ConfiguredRoute {
 }
 
 declare module 'fastify' {
-  import { FastifyRequest } from 'fastify'
   export interface FastifyRequest {
     user?: AuthenticatedUser
-    start?: Date
+    startedAt?: Date
     data(): Data
-    pars(): Data
+    parameters(): Data
+    roles(): string[]
+    hasRole(role: Role): boolean
     payloadSize?: number
   }
   export interface FastifyReply {
@@ -83,9 +81,11 @@ declare module 'fastify' {
 
 export interface FastifyRequest extends FastifyRequest {
   user?: AuthenticatedUser
-  start?: Date
+  startedAt?: Date
   data(): Data
-  pars(): Data
+  parameters(): Data
+  roles(): string[]
+  hasRole(role: Role): boolean
   payloadSize?: number
 }