@modular-rest/server 1.4.2 → 1.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-rest/server",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "description": "a nodejs module based on KOAJS for developing Rest-APIs in a modular solution.",
   "main": "src/index.js",
   "scripts": {
@@ -26,8 +26,8 @@
     "@koa/cors": "^3.1.0",
     "colog": "^1.0.4",
     "file-system": "^2.2.2",
-    "generate-rsa-keypair": "^0.2.1",
     "jsonwebtoken": "^8.5.1",
+    "keypair": "^1.0.4",
     "koa": "^2.5.3",
     "koa-body": "^4.2.0",
     "koa-router": "^7.4.0",

package/src/helper/presetup_services.js

@@ -1,34 +1,32 @@
-let DataInsertion = require('./data_insertion');
-let JWT = require('../services/jwt/service');
-let FileService = require('../services/file/service');
+let DataInsertion = require("./data_insertion");
+let JWT = require("../services/jwt/service");
+let FileService = require("../services/file/service");
 
 module.exports.setup = async ({ keypair, adminUser, uploadDirectory }) => {
+  /**
+   * Json web Token
+   *
+   * Setup private and public keys for JWT module
+   */
+  if (!keypair) {
+    // generate new keypair
+    const generateKeypair = require("keypair");
+    keypair = generateKeypair();
+  }
 
-    /**
-     * Json web Token
-     * 
-     * Setup private and public keys for JWT module 
-     */
-    if (!keypair) {
-        // generate new keypair
-        var generateRSAKeypair = require('generate-rsa-keypair')
-        keypair = generateRSAKeypair()
-    }
+  JWT.main.setKies(keypair.private, keypair.public);
 
-    JWT.main.setKies(keypair.private, keypair.public);
+  /**
+   * Data Insertion
+   *
+   * Insert permissions and admin user
+   * for the first time
+   */
+  await DataInsertion.createPermissions();
+  await DataInsertion.createAdminUser(adminUser);
 
-    /**
-     * Data Insertion
-     * 
-     * Insert permissions and admin user
-     * for the first time
-     */
-    await DataInsertion.createPermissions();
-    await DataInsertion.createAdminUser(adminUser)
-
-    /**
-     * File Service
-     */
-    FileService.setUploadDirectory(uploadDirectory);
-
-}
+  /**
+   * File Service
+   */
+  FileService.setUploadDirectory(uploadDirectory);
+};

package/src/index.js

@@ -1,57 +1,57 @@
 // Application
-const createRest = require('./application');
-const Schema = require('mongoose').Schema;
+const createRest = require("./application");
+const Schema = require("mongoose").Schema;
 
 // Utilities
-const paginator = require('./class/paginator');
-const reply = require('./class/reply');
-const validator = require('./class/validator');
-const {
-    getCollection
-} = require('./services/data_provider/service');
-const TypeCasters = require('./services/data_provider/typeCasters');
+const paginator = require("./class/paginator");
+const reply = require("./class/reply");
+const validator = require("./class/validator");
+const { getCollection } = require("./services/data_provider/service");
+const TypeCasters = require("./services/data_provider/typeCasters");
 
 // Base class
-const CollectionDefinition = require('./class/collection_definition');
-const Schemas = require('./class/db_schemas');
-const DatabaseTrigger = require('./class/database_trigger');
-const SecurityClass = require('./class/security');
+const CollectionDefinition = require("./class/collection_definition");
+const Schemas = require("./class/db_schemas");
+const DatabaseTrigger = require("./class/database_trigger");
+const SecurityClass = require("./class/security");
 
-const middleware = require('./middlewares');
+const middleware = require("./middlewares");
 
 module.exports = {
-    createRest,
-
-    //
-    // Utilities
-    //
-    reply,
-    TypeCasters,
-
-    /**
-     * @type {import('./class/paginator').create}
-     */
-    paginator,
-
-    /**
-     * @type {import('./class/validator')}
-     */
-    validator,
-
-    /** 
-     * @type {import('./services/data_provider/service').getCollection}
-     * @return {import('mongoose').Model} Mongoose model https://mongoosejs.com/docs/api/model.html
-     */
-    getCollection,
-
-    //
-    // Base class
-    //
-    CollectionDefinition,
-    Schemas,
-    Schema,
-    DatabaseTrigger,
-
-    ...SecurityClass,
-    middleware
-}
+  createRest,
+
+  //
+  // Utilities
+  //
+  reply,
+  TypeCasters,
+
+  /**
+   * @type {import('./class/paginator').create}
+   */
+  paginator,
+
+  /**
+   * @type {import('./class/validator')}
+   */
+  validator,
+
+  /**
+   * @type {import('./services/data_provider/service').getCollection}
+   * @return {import('mongoose').Model} Mongoose model https://mongoosejs.com/docs/api/model.html
+   */
+  getCollection,
+
+  //
+  // Base class
+  //
+  CollectionDefinition,
+  Schemas,
+  Schema,
+  DatabaseTrigger,
+
+  ...SecurityClass,
+
+  // Middlewares
+  middleware,
+};

package/src/middlewares.js

@@ -1,24 +1,30 @@
-let validateObject = require('./class/validator');
-const userManager = require('./services/user_manager/service');
+let validateObject = require("./class/validator");
+const userManager = require("./services/user_manager/service");
 
-module.exports.auth = async (ctx, next) => 
-{
-    let headers = ctx.header;
-    let headersValidated = validateObject(headers, 'authorization');
+/**
+ * Authentication middleware
+ * It checks if incoming request has a valid token in header.authorization
+ *
+ * @param {Object} ctx - Koa context
+ * @param {Function} next - Koa next function
+ * @returns {Promise<void>}
+ */
+module.exports.auth = async (ctx, next) => {
+  let headers = ctx.header;
+  let headersValidated = validateObject(headers, "authorization");
 
-    if(!headersValidated.isValid)
-        ctx.throw(401 , 'authentication is required');
-        
-    let token = headers.authorization;
-    
-    await userManager.main.getUserByToken(token)
-        .then(async user => 
-        {
-            ctx.state.user = user;
-            await next();
-        })
-        .catch(err => {
-            console.log(err);
-            ctx.throw(err.status || 412, err.message);
-        });
-}
+  if (!headersValidated.isValid) ctx.throw(401, "authentication is required");
+
+  let token = headers.authorization;
+
+  await userManager.main
+    .getUserByToken(token)
+    .then(async (user) => {
+      ctx.state.user = user;
+      await next();
+    })
+    .catch((err) => {
+      console.log(err);
+      ctx.throw(err.status || 412, err.message);
+    });
+};