@volcanicminds/backend 0.2.28 → 0.2.29

package/dist/lib/loader/router.js

@@ -8,14 +8,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.apply = exports.load = void 0;
+const yn_1 = __importDefault(require("../util/yn"));
 const glob = require('glob');
 const path = require('path');
 const methods = ['GET', 'POST', 'PUT', 'DELETE', 'HEAD', 'PATCH', 'OPTIONS'];
 function load() {
     const validRoutes = [];
     const patterns = [`${__dirname}/../api/**/routes.{ts,js}`, `${process.cwd()}/src/api/**/routes.{ts,js}`];
+    const authMiddlewares = ['global.isAuthenticated', 'global.isAdmin'];
     patterns.forEach((pattern) => {
         log.t && log.trace('Looking for ' + pattern);
         glob.sync(pattern).forEach((f, index, values) => {
@@ -24,22 +29,17 @@ function load() {
             const file = path.join(dir, path.basename(f));
             const routesjs = require(f);
             const { routes = [], config: defaultConfig = {} } = routesjs || {};
-            if (!defaultConfig.enable)
-                defaultConfig.enable = true;
-            if (defaultConfig.deprecated == null)
-                defaultConfig.deprecated = false;
-            if (defaultConfig.controller == null)
-                defaultConfig.controller = 'controller';
             log.t && log.trace(`* Add ${routes.length} routes from ${file}`);
             routes.forEach((route, index) => {
                 const errors = [];
-                const { method: methodCase, path: pathName = '/', handler, config = {}, middlewares = [], roles: requiredRole = [] } = route;
-                if (!(config === null || config === void 0 ? void 0 : config.security) &&
-                    (requiredRole.some((r) => r.code !== roles.public.code) ||
-                        middlewares.some((m) => m === 'global.isAuthenticated'))) {
+                const { method: methodCase, path: pathName = '/', handler, config = {}, middlewares = [], roles: rs = [] } = route;
+                const requiredRoles = !rs.length ? [roles.public] : rs;
+                const reqAuth = middlewares.some((m) => authMiddlewares.includes(m)) ||
+                    requiredRoles.every((r) => r.code !== roles.public.code);
+                if (!(config === null || config === void 0 ? void 0 : config.security) && reqAuth) {
                     config.security = 'bearer';
                 }
-                const { title = '', description = '', enable = defaultConfig.enable || true, deprecated = defaultConfig.deprecated || false, tags = defaultConfig.tags || false, version = defaultConfig.version || '', security = defaultConfig.security || undefined, query, params, body, response } = config || {};
+                const { title = '', description = '', enable = (0, yn_1.default)(defaultConfig.enable, true), deprecated = (0, yn_1.default)(defaultConfig.deprecated, false), tags = defaultConfig.tags, version = defaultConfig.version || '', security = defaultConfig.security, query, params, body, response } = config || {};
                 const endpoint = `${dir}${pathName.replace(/\/+$/, '')}`;
                 const method = methodCase.toUpperCase();
                 const num = index + 1;
@@ -62,20 +62,21 @@ function load() {
                         log.e && errors.forEach((error) => log.error(error));
                     }
                 }
-                if (errors.length == 0) {
-                    enable
-                        ? log.t &&
-                            log.trace(`* Method [${method}] path ${endpoint} handler ${handler} enabled with ${(middlewares === null || middlewares === void 0 ? void 0 : middlewares.length) || 0} middlewares`)
-                        : log.w && log.warn(`* Method [${method}] path ${endpoint} handler ${handler} disabled. Skip.`);
+                const toAdd = enable && errors.length === 0;
+                toAdd
+                    ? log.t &&
+                        log.trace(`* Method [${method}] path ${endpoint} handler ${handler} enabled with ${(middlewares === null || middlewares === void 0 ? void 0 : middlewares.length) || 0} middlewares`)
+                    : log.w && log.warn(`* Method [${method}] path ${endpoint} handler ${handler} disabled. Skip.`);
+                toAdd &&
                     validRoutes.push({
                         handler,
                         method,
                         path: '/' + endpoint,
                         middlewares,
-                        roles: requiredRole,
+                        roles: requiredRoles,
                         enable,
                         base,
-                        file: path.join(base, defaultConfig.controller, handlerParts[0]),
+                        file: path.join(base, defaultConfig.controller || 'controller', handlerParts[0]),
                         func: handlerParts[1],
                         doc: {
                             summary: title,
@@ -90,7 +91,6 @@ function load() {
                             response
                         }
                     });
-                }
             });
         });
     });
@@ -98,27 +98,59 @@ function load() {
     return validRoutes;
 }
 exports.load = load;
-function normalizeMiddlewarePath(base, middleware = '') {
-    const key = 'global.';
-    const idx = middleware.indexOf(key);
-    return idx == 0
-        ? path.resolve(__dirname + '/../middleware/' + middleware.substring(key.length))
-        : path.resolve(base + '/middleware/' + middleware);
+function tryToLoadFile(fileName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve, reject) => {
+            try {
+                const required = fileName ? require(fileName) : null;
+                resolve(required);
+            }
+            catch (err) {
+                reject(err);
+            }
+        });
+    });
+}
+function loadMiddleware(base, middleware = '') {
+    return __awaiter(this, void 0, void 0, function* () {
+        const key = 'global.';
+        const isGlobal = middleware.indexOf(key) > -1;
+        let required = null;
+        if (isGlobal) {
+            const name = middleware.substring(key.length);
+            required = yield tryToLoadFile(path.resolve(process.cwd() + '/src/middleware/' + name)).catch(() => __awaiter(this, void 0, void 0, function* () {
+                return yield tryToLoadFile(path.resolve(__dirname + '/../middleware/' + name));
+            }));
+        }
+        else {
+            required = yield tryToLoadFile(path.resolve(base + '/middleware/' + middleware));
+        }
+        if (!required) {
+            log.error(`Middleware ${middleware} not loaded`);
+            throw new Error(`Middleware ${middleware} not loaded`);
+        }
+        return required;
+    });
+}
+function loadMiddlewares(base, middlewares = []) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const midds = {};
+        yield Promise.all(middlewares.map((m) => __awaiter(this, void 0, void 0, function* () {
+            const middleware = yield loadMiddleware(base, m);
+            Object.keys(middleware).map((name) => (midds[name] = [...(midds[name] || []), middleware[name]]));
+        })));
+        return midds;
+    });
 }
 function apply(server, routes) {
     log.t && log.trace(`Apply ${routes.length} routes to server with pid ${process.pid}`);
     routes.forEach(({ handler, method, path, middlewares, roles, enable, base, file, func, doc }) => __awaiter(this, void 0, void 0, function* () {
         if (enable) {
             log.t && log.trace(`* Add path ${method} ${path} on handle ${handler}`);
-            server.route({
-                method: method,
-                path: path,
-                schema: doc,
-                preHandler: (middlewares || []).map((m) => require(normalizeMiddlewarePath(base, m))),
-                config: {
+            const midds = yield loadMiddlewares(base, middlewares);
+            server.route(Object.assign(Object.assign({ method: method, path: path, schema: doc }, midds), { config: {
                     requiredRoles: roles || []
-                },
-                handler: function (req, reply) {
+                }, handler: function (req, reply) {
                     try {
                         return require(file)[func](req, reply);
                     }
@@ -126,8 +158,7 @@ function apply(server, routes) {
                         log.e && log.error(`Cannot find ${file} or method ${func}: ${err}`);
                         return reply.code(500).send(`Invalid handler ${handler}`);
                     }
-                }
-            });
+                } }));
         }
     }));
 }

package/dist/lib/loader/router.js.map

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

package/dist/lib/loader/schemas.js

@@ -15,9 +15,14 @@ function apply(server) {
             schemaNames.map((name) => {
                 const schema = schemaClass[name];
                 if (schema != null) {
-                    log.trace(`* Schema [${schema.$id}] loaded from ${schemaFileName}`);
-                    server.addSchema(schema);
-                    schemaCount++;
+                    if (schema === null || schema === void 0 ? void 0 : schema.$id) {
+                        log.trace(`* Schema [${schema.$id}] loaded from ${schemaFileName}`);
+                        server.addSchema(schema);
+                        schemaCount++;
+                    }
+                    else {
+                        log.warn(`* Schema [${schema.$id}] not loaded from ${schemaFileName}`);
+                    }
                 }
             });
         });

package/dist/lib/loader/schemas.js.map

@@ -1 +1 @@
-{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../lib/loader/schemas.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,SAAgB,KAAK,CAAC,MAAW;IAC/B,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;IAEhG,IAAI,WAAW,GAAG,CAAC,CAAA;IACnB,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,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YACvC,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAE5C,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;gBAChC,IAAI,MAAM,IAAI,IAAI,EAAE;oBAClB,GAAG,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,GAAG,iBAAiB,cAAc,EAAE,CAAC,CAAA;oBACnE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;oBACxB,WAAW,EAAE,CAAA;iBACd;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,mBAAmB,WAAW,wBAAwB,CAAC,CAAA;AAC5E,CAAC;AAvBD,sBAuBC"}
+{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../lib/loader/schemas.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAC5B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;AAE5B,SAAgB,KAAK,CAAC,MAAW;IAC/B,MAAM,QAAQ,GAAG,CAAC,GAAG,SAAS,uBAAuB,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,wBAAwB,CAAC,CAAA;IAEhG,IAAI,WAAW,GAAG,CAAC,CAAA;IACnB,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,cAAc,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;YACvC,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YAC9B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAE5C,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gBACvB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAA;gBAChC,IAAI,MAAM,IAAI,IAAI,EAAE;oBAClB,IAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,GAAG,EAAE;wBACf,GAAG,CAAC,KAAK,CAAC,aAAa,MAAM,CAAC,GAAG,iBAAiB,cAAc,EAAE,CAAC,CAAA;wBACnE,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;wBACxB,WAAW,EAAE,CAAA;qBACd;yBAAM;wBACL,GAAG,CAAC,IAAI,CAAC,aAAa,MAAM,CAAC,GAAG,qBAAqB,cAAc,EAAE,CAAC,CAAA;qBACvE;iBACF;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,mBAAmB,WAAW,wBAAwB,CAAC,CAAA;AAC5E,CAAC;AA3BD,sBA2BC"}

package/dist/lib/middleware/isAdmin.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const log = global.log;
-module.exports = (req, res, next) => {
+exports.preHandler = void 0;
+function preHandler(req, res, done) {
     try {
         if (req.user && req.user.id && req.hasRole(roles.admin)) {
-            return next();
+            return done();
         }
         throw new Error('User without this privilege');
     }
@@ -12,5 +12,6 @@ module.exports = (req, res, next) => {
         log.e && log.error(`Upps, something just happened ${err}`);
         res.code(403).send(err);
     }
-};
+}
+exports.preHandler = preHandler;
 //# sourceMappingURL=isAdmin.js.map

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,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"}
+{"version":3,"file":"isAdmin.js","sourceRoot":"","sources":["../../../lib/middleware/isAdmin.ts"],"names":[],"mappings":";;;AAEA,SAAgB,UAAU,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS;IAC1E,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;QAED,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;AAXD,gCAWC"}

package/dist/lib/middleware/isAuthenticated.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const log = global.log;
-module.exports = (req, res, next) => {
+exports.preHandler = void 0;
+function preHandler(req, res, done) {
     var _a;
     try {
         if (!!((_a = req.user) === null || _a === void 0 ? void 0 : _a.id)) {
-            return next();
+            return done();
         }
-        throw new Error('User not authenticated');
+        throw new Error('Unauthorized');
     }
     catch (err) {
         log.e && log.error(`Upps, something just happened ${err}`);
-        res.code(403).send(err);
+        return res.code(401).send(err);
     }
-};
+}
+exports.preHandler = preHandler;
 //# sourceMappingURL=isAuthenticated.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"isAuthenticated.js","sourceRoot":"","sources":["../../../lib/middleware/isAuthenticated.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,CAAC,CAAC,CAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,EAAE,CAAA,EAAE;YAClB,OAAO,IAAI,EAAE,CAAA;SACd;QACD,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;KAC1C;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":"isAuthenticated.js","sourceRoot":"","sources":["../../../lib/middleware/isAuthenticated.ts"],"names":[],"mappings":";;;AAEA,SAAgB,UAAU,CAAC,GAAmB,EAAE,GAAiB,EAAE,IAAS;;IAC1E,IAAI;QACF,IAAI,CAAC,CAAC,CAAA,MAAA,GAAG,CAAC,IAAI,0CAAE,EAAE,CAAA,EAAE;YAClB,OAAO,IAAI,EAAE,CAAA;SACd;QAED,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAA;KAChC;IAAC,OAAO,GAAG,EAAE;QACZ,GAAG,CAAC,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,EAAE,CAAC,CAAA;QAC1D,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;KAC/B;AACH,CAAC;AAXD,gCAWC"}

package/dist/lib/middleware/postAuth.js

@@ -0,0 +1,19 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preSerialization = void 0;
+function preSerialization(req, res, payload) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return payload;
+    });
+}
+exports.preSerialization = preSerialization;
+//# sourceMappingURL=postAuth.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"postAuth.js","sourceRoot":"","sources":["../../../lib/middleware/postAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,SAAsB,gBAAgB,CAAC,GAAmB,EAAE,GAAiB,EAAE,OAAO;;QACpF,OAAO,OAAO,CAAA;IAChB,CAAC;CAAA;AAFD,4CAEC"}

package/dist/lib/middleware/preAuth.js

@@ -0,0 +1,17 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preHandler = void 0;
+function preHandler(req, res) {
+    return __awaiter(this, void 0, void 0, function* () { });
+}
+exports.preHandler = preHandler;
+//# sourceMappingURL=preAuth.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"preAuth.js","sourceRoot":"","sources":["../../../lib/middleware/preAuth.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,SAAsB,UAAU,CAAC,GAAmB,EAAE,GAAiB;0DAAG,CAAC;CAAA;AAA3E,gCAA2E"}

package/dist/lib/util/generate.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newAuthCode = void 0;
+const { customAlphabet } = require('nanoid');
+const nanoid = customAlphabet('AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz0123456789');
+function newAuthCode() {
+    return nanoid(Number(process.env.AUTH_CODE_SIZE) || 10);
+}
+exports.newAuthCode = newAuthCode;
+//# sourceMappingURL=generate.js.map

package/dist/lib/util/generate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../lib/util/generate.ts"],"names":[],"mappings":";;;AAAA,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;AAC5C,MAAM,MAAM,GAAG,cAAc,CAAC,gEAAgE,CAAC,CAAA;AAE/F,SAAgB,WAAW;IACzB,OAAO,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAA;AACzD,CAAC;AAFD,kCAEC"}

package/dist/lib/util/regexp.js

@@ -1,15 +1,15 @@
 "use strict";
-module.exports = {
-    username: /(?=^.{3,33}$)^[a-z][a-z0-9]*[._-]?[a-z0-9]+$/gi,
-    emailAlt: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-    email: /^\w+([\.+-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/,
-    password: /^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d\s:])([^\s]){8,64}$/gi,
-    zipCode: /(^\d{5}$)|(^\d{5}-\d{4}$)/,
-    taxCodePersona: /^[a-zA-Z]{6}[0-9]{2}[abcdehlmprstABCDEHLMPRST]{1}[0-9]{2}([a-zA-Z]{1}[0-9]{3})[a-zA-Z]{1}$/,
-    taxCodeCompany: /^([A-Z]{2}|)[0-9]{11}$/,
-    iban: /^[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}$/,
-    mobilePhone: /^((00|\+)39)?3[0-9]{8,9}$/,
-    landLinePhone: /^(((00|\+)39))?[\s]?(0{1}[1-9]{1,3})[\s]?(\d{4,6})$/,
-    tollFreePhone: /^((00|\+)39)?(800|803|167)\d{3,6}$/
-};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tollFreePhone = exports.landLinePhone = exports.mobilePhone = exports.iban = exports.taxCodeCompany = exports.taxCodePersona = exports.zipCode = exports.password = exports.email = exports.emailAlt = exports.username = void 0;
+exports.username = /(?=^.{3,33}$)^[a-z][a-z0-9]*[._-]?[a-z0-9]+$/gi;
+exports.emailAlt = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+exports.email = /^\w+([\.+-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/;
+exports.password = /^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d\s:])([^\s]){8,16}$/;
+exports.zipCode = /(^\d{5}$)|(^\d{5}-\d{4}$)/;
+exports.taxCodePersona = /^[a-zA-Z]{6}[0-9]{2}[abcdehlmprstABCDEHLMPRST]{1}[0-9]{2}([a-zA-Z]{1}[0-9]{3})[a-zA-Z]{1}$/;
+exports.taxCodeCompany = /^([A-Z]{2}|)[0-9]{11}$/;
+exports.iban = /^[a-zA-Z]{2}[0-9]{2}[a-zA-Z0-9]{4}[0-9]{7}([a-zA-Z0-9]?){0,16}$/;
+exports.mobilePhone = /^((00|\+)39)?3[0-9]{8,9}$/;
+exports.landLinePhone = /^(((00|\+)39))?[\s]?(0{1}[1-9]{1,3})[\s]?(\d{4,6})$/;
+exports.tollFreePhone = /^((00|\+)39)?(800|803|167)\d{3,6}$/;
 //# sourceMappingURL=regexp.js.map

package/dist/lib/util/regexp.js.map

@@ -1 +1 @@
-{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../../lib/util/regexp.ts"],"names":[],"mappings":";AAAA,MAAM,CAAC,OAAO,GAAG;IAKf,QAAQ,EAAE,gDAAgD;IAC1D,QAAQ,EACN,yJAAyJ;IAK3J,KAAK,EAAE,gDAAgD;IAQvD,QAAQ,EAAE,iEAAiE;IAC3E,OAAO,EAAE,2BAA2B;IACpC,cAAc,EAAE,4FAA4F;IAI5G,cAAc,EAAE,wBAAwB;IACxC,IAAI,EAAE,iEAAiE;IACvE,WAAW,EAAE,2BAA2B;IACxC,aAAa,EAAE,qDAAqD;IACpE,aAAa,EAAE,oCAAoC;CACpD,CAAA"}
+{"version":3,"file":"regexp.js","sourceRoot":"","sources":["../../../lib/util/regexp.ts"],"names":[],"mappings":";;;AAIa,QAAA,QAAQ,GAAG,gDAAgD,CAAA;AAC3D,QAAA,QAAQ,GACnB,yJAAyJ,CAAA;AAM9I,QAAA,KAAK,GAAG,gDAAgD,CAAA;AASxD,QAAA,QAAQ,GAAG,+DAA+D,CAAA;AAC1E,QAAA,OAAO,GAAG,2BAA2B,CAAA;AACrC,QAAA,cAAc,GACzB,4FAA4F,CAAA;AAKjF,QAAA,cAAc,GAAG,wBAAwB,CAAA;AACzC,QAAA,IAAI,GAAG,iEAAiE,CAAA;AACxE,QAAA,WAAW,GAAG,2BAA2B,CAAA;AACzC,QAAA,aAAa,GAAG,qDAAqD,CAAA;AACrE,QAAA,aAAa,GAAG,oCAAoC,CAAA"}

package/index.d.ts

@@ -8,5 +8,6 @@ export {
   Roles,
   Route,
   RouteConfig,
-  ConfiguredRoute
+  ConfiguredRoute,
+  UserManagement
 } from './types/global'

package/index.ts

@@ -27,6 +27,7 @@ import fastifyApollo, { fastifyApolloDrainPlugin } from '@as-integrations/fastif
 import { myContextFunction, MyContext } from './lib/apollo/context'
 import resolvers from './lib/apollo/resolvers'
 import typeDefs from './lib/apollo/type-defs'
+import { UserManagement } from './types/global'
 
 global.log = logger
 
@@ -132,7 +133,7 @@ async function addFastifySwagger(fastify: FastifyInstance) {
   }
 }
 
-const start = async () => {
+const start = async (decorators) => {
   const begin = new Date().getTime()
   mark.print(logger)
   global.roles = loaderRoles.load()
@@ -164,6 +165,52 @@ const start = async () => {
   await addApolloRouting(fastify, apollo)
   await addFastifyRouting(fastify)
 
+  // defaults
+  decorators = {
+    userManager: {
+      createUser(data: any) {
+        throw Error('Not implemented')
+      },
+      resetExternalId(data: any) {
+        throw Error('Not implemented')
+      },
+      updateUserById(id: string, user: any) {
+        throw Error('Not implemented')
+      },
+      retrieveUserById(id: string) {
+        throw Error('Not implemented')
+      },
+      retrieveUserByEmail(email: string) {
+        throw Error('Not implemented')
+      },
+      retrieveUserByExternalId(externalId: string) {
+        throw Error('Not implemented')
+      },
+      retrieveUserByPassword(email: string, password: string) {
+        throw Error('Not implemented')
+      },
+      changePassword(email: string, password: string, oldPassword: string) {
+        throw Error('Not implemented')
+      },
+      enableUserById(id: string) {
+        throw Error('Not implemented')
+      },
+      disableUserById(id: string) {
+        throw Error('Not implemented')
+      },
+      isValidUser(data: any) {
+        throw Error('Not implemented')
+      }
+    } as UserManagement,
+    ...decorators
+  }
+
+  await Promise.all(
+    Object.keys(decorators || {}).map(async (key) => {
+      await fastify.decorate(key, decorators[key])
+    })
+  )
+
   await fastify
     .listen({
       port: Number(port),
@@ -192,7 +239,8 @@ export {
   Roles,
   Route,
   RouteConfig,
-  ConfiguredRoute
+  ConfiguredRoute,
+  UserManagement
 } from './types/global'
 
 /**

package/lib/api/auth/controller/auth.ts

@@ -1,31 +1,126 @@
 import { FastifyReply, FastifyRequest } from 'fastify'
-import { AuthenticatedUser } from '../../../../types/global'
+import * as regExp from '../../../util/regexp'
+
+export async function register(req: FastifyRequest, reply: FastifyReply) {
+  const { password1: password, password2, ...data } = req.data()
+
+  if (!data.username) {
+    return reply.status(404).send(Error('Username not valid'))
+  }
+  if (!data.email || !regExp.email.test(data.email)) {
+    return reply.status(404).send(Error('Email not valid'))
+  }
+  if (!password || !regExp.password.test(password)) {
+    return reply.status(404).send(Error('Password not valid'))
+  }
+  if (!password2 || password2 !== password) {
+    return reply.status(404).send(Error('Repeated password not match'))
+  }
+
+  // public is the default
+  const publicRole = global.roles?.public?.code || 'public'
+  data.roles = (data.requiredRoles || []).map((r) => global.roles[r]?.code).filter((r) => !!r)
+  if (!data.roles.includes(publicRole)) {
+    data.roles.push(publicRole)
+  }
+
+  const user = await req.server['userManager'].createUser({ ...data, password: password })
+  if (!user) {
+    return reply.status(400).send(Error('User not registered'))
+  }
+
+  return user
+}
+
+export async function unregister(req: FastifyRequest, reply: FastifyReply) {
+  const { email, password } = req.data()
+
+  let user = await req.server['userManager'].retrieveUserByPassword(email, password)
+  let isValid = await req.server['userManager'].isValidUser(user)
+
+  if (!isValid) {
+    return reply.status(403).send(Error('Wrong credentials'))
+  }
+
+  if (!user.enabled) {
+    return reply.status(403).send(Error('User not enabled'))
+  }
+
+  user = await req.server['userManager'].disableUserById(user?.id)
+  isValid = await req.server['userManager'].isValidUser(user)
+
+  if (!isValid) {
+    return reply.status(400).send(Error('User not valid'))
+  }
+
+  return { ok: true }
+}
+
+export async function changePassword(req: FastifyRequest, reply: FastifyReply) {
+  const { email, oldPassword, newPassword1, newPassword2 } = req.data()
+
+  if (!newPassword1 || !regExp.password.test(newPassword1)) {
+    return reply.status(404).send(Error('New password not valid'))
+  }
+
+  if (!newPassword2 || newPassword2 !== newPassword1) {
+    return reply.status(404).send(Error('Repeated new password not match'))
+  }
+
+  let user = await req.server['userManager'].retrieveUserByPassword(email, oldPassword)
+  let isValid = await req.server['userManager'].isValidUser(user)
+
+  if (!isValid) {
+    return reply.status(403).send(Error('Wrong credentials'))
+  }
+
+  if (!user.enabled) {
+    return reply.status(403).send(Error('User not enabled'))
+  }
+
+  user = await req.server['userManager'].changePassword(email, newPassword1, oldPassword)
+  isValid = await req.server['userManager'].isValidUser(user)
+  return { ok: isValid }
+}
 
 export async function login(req: FastifyRequest, reply: FastifyReply) {
-  const { email = '', password = '' } = req.data()
-
-  // TODO: use UserManagement.find and check password
-  // demo code here
-  const username = email.substr(0, email.indexOf('@')) || 'jerry'
-  const roleList = [username === 'admin' ? roles.admin : username === 'vminds' ? roles.backoffice : roles.public]
-  const user =
-    username !== null
-      ? ({
-          id: 306, // user id
-          name: username, // optional
-          email: email,
-          roles: roleList
-        } as AuthenticatedUser)
-      : null
-
-  // TODO: review if email is important to include in token (for a security purpose)
+  const { email, password } = req.data()
+
+  if (!email || !regExp.email.test(email)) {
+    return reply.status(404).send(Error('Email not valid'))
+  }
+  if (!password || !regExp.password.test(password)) {
+    return reply.status(404).send(Error('Password not valid'))
+  }
+
+  const user = await req.server['userManager'].retrieveUserByPassword(email, password)
+  const isValid = await req.server['userManager'].isValidUser(user)
+
+  if (!isValid) {
+    return reply.status(403).send(Error('Wrong credentials'))
+  }
+
+  if (!user.enabled) {
+    return reply.status(403).send(Error('User not enabled'))
+  }
+
+  // log.trace('User: ' + JSON.stringify(user) + ' ' + roles)
   // https://www.iana.org/assignments/jwt/jwt.xhtml
-  const token = user !== null ? await reply.jwtSign({ sub: user.id, name: user.name, email: user.email }) : null
-  reply.send({ ...user, token: token || null, roles: roleList.map((r) => r.code) })
+  const token = user !== null ? await reply.jwtSign({ sub: user.externalId }) : null
+  return {
+    ...user,
+    token: token || null,
+    roles: (user.roles || [global.role?.public?.code || 'public']).map((r) => r?.code || r)
+  }
 }
 
-export async function demo(req: FastifyRequest, reply: FastifyReply) {
-  // JSON.stringify(req.user)
+export async function invalidateTokens(req: FastifyRequest, reply: FastifyReply) {
+  let isValid = await req.server['userManager'].isValidUser(req.user)
+  if (!isValid) {
+    return reply.status(403).send(Error('User not linked'))
+  }
 
-  reply.send({ ok: req.user })
+  const user = await req.server['userManager'].resetExternalId(req.user?.id)
+  isValid = await req.server['userManager'].isValidUser(user)
+  return { ok: isValid }
 }