@modular-rest/server 1.11.11 → 1.11.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modular-rest/server",
-  "version": "1.11.11",
+  "version": "1.11.13",
   "description": "a nodejs module based on KOAJS for developing Rest-APIs in a modular solution.",
   "main": "src/index.js",
   "scripts": {

package/src/application.js

@@ -18,7 +18,10 @@ const defaultServiceRoot = __dirname + "/services";
  * @typedef {import('./class/cms_trigger.js')} CmsTrigger
  */
 
-const { config, setConfig } = require("./config");
+const {
+  config,
+  setConfig
+} = require("./config");
 
 /**
  * Create a modular REST instance with Koa and MongoDB support.
@@ -147,17 +150,10 @@ async function createRest(options) {
     mongoOption: config.mongo,
   });
 
-  // 3. Setting up default services
-  try {
-    await require("./helper/presetup_services").setup(options);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-
   /**
    * User Services
    *
-   * Plug in routes and database
+   * 3. Plug in routes and database
    */
   if (config.modulesPath) {
     // Plug in user routes
@@ -202,6 +198,13 @@ async function createRest(options) {
     });
   }
 
+  // 4. Setting up default services
+  try {
+    await require("./helper/presetup_services").setup(options);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+
   /**
    * Run the server
    *
@@ -233,4 +236,4 @@ async function createRest(options) {
   });
 }
 
-module.exports = createRest;
+module.exports = createRest;

package/src/middlewares.js

@@ -13,6 +13,7 @@ const userManager = require("./services/user_manager/service");
 /**
  * Authentication middleware
  * It checks if incoming request has a valid token in header.authorization
+ * Then attaches the user object to ctx.state.user
  *
  * @param {Object} ctx - Koa context
  * @param {Function} next - Koa next function

package/src/services/data_provider/service.js

@@ -1,6 +1,9 @@
 let name = "dataProvider";
 const colog = require("colog");
-let { AccessTypes, AccessDefinition } = require("../../class/security");
+let {
+  AccessTypes,
+  AccessDefinition
+} = require("../../class/security");
 
 const Mongoose = require("mongoose");
 Mongoose.set("useCreateIndex", true);
@@ -11,7 +14,9 @@ let permissionDefinitions = {};
 
 let triggers = require("../../class/trigger_operator");
 let TypeCasters = require("./typeCasters");
-const { config } = require("../../config");
+const {
+  config
+} = require("../../config");
 
 /**
  *
@@ -30,13 +35,14 @@ function connectToDatabaseByCollectionDefinitionList(
     // Create db connection
     //
     const fullDbName = (mongoOption.dbPrefix || "") + dbName;
-    const connectionString = mongoOption.mongoBaseAddress + "/" + fullDbName;
+    const connectionString = mongoOption.mongoBaseAddress;
 
-    colog.info(`- Connecting to database ${connectionString}`);
+    colog.info(`- Connecting to database: ${fullDbName}`);
 
     let connection = Mongoose.createConnection(connectionString, {
       useUnifiedTopology: true,
       useNewUrlParser: true,
+      dbName: fullDbName,
     });
 
     // Store connection
@@ -94,7 +100,10 @@ function connectToDatabaseByCollectionDefinitionList(
  * @param {string} option.mongoOption.dbPrefix
  * @param {string} option.mongoOption.mongoBaseAddress
  */
-async function addCollectionDefinitionByList({ list, mongoOption }) {
+async function addCollectionDefinitionByList({
+  list,
+  mongoOption
+}) {
   let clusteredByDBName = {};
 
   // cluster list by their database name.
@@ -250,4 +259,4 @@ module.exports = {
   performAdditionalOptionsToQueryObject,
   triggers,
   TypeCasters,
-};
+};

package/src/services/jwt/router.js

@@ -7,64 +7,76 @@ let verify = new Router();
 
 let service = require('./service').main;
 
-verify.post('/token', async (ctx) => 
-{
+verify.post('/token', async (ctx) => {
 	let body = ctx.request.body;
 
 	// validate result
 	let bodyValidate = validateObject(body, 'token');
 
 	// fields validation
-    if(!bodyValidate.isValid)
-    {	
-    	ctx.status = 412;
-        ctx.body = reply('e', {'e': bodyValidate.requires});
-        return;
-    }
+	if (!bodyValidate.isValid) {
+		ctx.status = 412;
+		ctx.body = reply('e', {
+			'e': bodyValidate.requires
+		});
+		return;
+	}
 
 	await service.verify(body.token)
-    	.then((payload) => ctx.body = reply('s', {'user': payload}))
-    	.catch(err => {
-    		ctx.status = 412;
-        	ctx.body = reply('e', {'e': err});
-    	});
+		.then((payload) => ctx.body = reply('s', {
+			'user': payload
+		}))
+		.catch(err => {
+			ctx.status = 412;
+			ctx.body = reply('e', {
+				'e': err
+			});
+		});
 });
 
-verify.post('/checkAccess', async (ctx) => 
-{
+verify.post('/checkAccess', async (ctx) => {
 	let body = ctx.request.body;
 
 	// validate result
 	let bodyValidate = validateObject(body, 'token permissionField');
 
 	// fields validation
-    if(!bodyValidate.isValid)
-    {	
-    	ctx.status = 412;
-        ctx.body = reply('e', {'e': bodyValidate.requires});
-        return;
+	if (!bodyValidate.isValid) {
+		ctx.status = 412;
+		ctx.body = reply('e', {
+			'e': bodyValidate.requires
+		});
+		return;
 	}
-	
+
 	let payload = await service.verify(body.token)
 		.catch(err => {
-            console.log(err);
-            ctx.throw(412, err.message);
-        });
-    	
-		
+			console.log(err);
+			ctx.throw(412, err.message);
+		});
+
+
 	let userid = payload.id;
-	
+
 	await global.services.userManager.main.getUserById(userid)
-		.then((user) => 
-		{
+		.then((user) => {
 			let key = user.hasPermission(body.permissionField);
-			ctx.body = reply('s', {'access': key});
+			ctx.body = reply('s', {
+				'access': key
+			});
 		})
 		.catch(err => {
 			ctx.status = 412;
-			ctx.body = reply('e', {'e': err});
+			ctx.body = reply('e', {
+				'e': err
+			});
 		});
 });
 
+verify.get('/ready', async (ctx) => {
+	// it's health check, so return success
+	ctx.body = reply('s', {});
+});
+
 module.exports.name = name;
 module.exports.main = verify;

package/types/middlewares.d.ts

@@ -1,6 +1,7 @@
 /**
  * Authentication middleware
  * It checks if incoming request has a valid token in header.authorization
+ * Then attaches the user object to ctx.state.user
  *
  * @param {Object} ctx - Koa context
  * @param {Function} next - Koa next function