@modular-rest/server 1.2.4 → 1.3.1

package/package.json

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

package/src/application.js

@@ -22,9 +22,11 @@ let defaultServiceRoot = __dirname + '/services';
  * @param {number} options.port server port
  * @param {boolean} options.dontListen server will not being run if it was true and just return koa app object.
  * 
+ * 
  * @param {string} options.mongo mongodb options.
  * @param {string} options.mongo.dbPrefix a prefix for your database name.
  * @param {string} options.mongo.mongoBaseAddress the address of your mongo server without any database specification on it.
+ * @param {string} options.mongo.addressMap specific address for each database
  * 
  * @param {object} options.keypair RSA keypair for authentication module
  * @param {string} options.keypair.private
@@ -43,6 +45,7 @@ async function createRest(options) {
         port: 3000,
         dontListen: false,
         mongo: {
+            atlas: false,
             mongoBaseAddress: 'mongodb://localhost:27017',
             dbPrefix: 'mrest_',
         },

package/src/services/data_provider/service.js

@@ -1,6 +1,9 @@
 let name = 'dataProvider';
-var colog = require('colog');
-let { AccessTypes, AccessDefinition } = require('../../class/security');
+const colog = require('colog');
+let {
+    AccessTypes,
+    AccessDefinition
+} = require('../../class/security');
 
 const Mongoose = require('mongoose');
 Mongoose.set('useCreateIndex', true);
@@ -23,10 +26,20 @@ let TypeCasters = require('./typeCasters');
 function connectToDatabaseByCollectionDefinitionList(dbName, collectionDefinitionList = [], mongoOption) {
 
     return new Promise((done, reject) => {
-        // create db connection
-        let connectionString = mongoOption.mongoBaseAddress + `/${mongoOption.dbPrefix + dbName}`;
-        let connection = Mongoose.createConnection(connectionString, { useUnifiedTopology: true, useNewUrlParser: true, });
-        // store connection
+        // Create db connection
+        //
+        const fullDbName = (mongoOption.dbPrefix || '') + dbName
+        const connectionString = mongoOption.mongoBaseAddress + '/' + fullDbName;
+
+        colog.info(`- Connecting to database ${connectionString}`)
+
+        let connection = Mongoose.createConnection(connectionString, {
+            ...mongoOption,
+            useUnifiedTopology: true,
+            useNewUrlParser: true,
+        });
+
+        // Store connection
         connections[dbName] = connection;
 
         // add db models from schemas
@@ -62,7 +75,7 @@ function connectToDatabaseByCollectionDefinitionList(dbName, collectionDefinitio
         })
 
         connection.on('connected', () => {
-            colog.success(`- ${mongoOption.dbPrefix + dbName} database has been connected`)
+            colog.success(`- ${fullDbName} database has been connected`)
             done()
         });
     })
@@ -76,7 +89,10 @@ function connectToDatabaseByCollectionDefinitionList(dbName, collectionDefinitio
  * @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.
@@ -118,14 +134,10 @@ function _getPermissionList(db, collection, operationType) {
     permissionDefinition.permissionList.forEach(permission => {
         if (permission.onlyOwnData == true) {
             permissionList.push(permission);
-        }
-
-        else if (operationType == AccessTypes.read &&
+        } else if (operationType == AccessTypes.read &&
             permission.read == true) {
             permissionList.push(permission);
-        }
-
-        else if (operationType == AccessTypes.write &&
+        } else if (operationType == AccessTypes.write &&
             permission.write == true) {
             permissionList.push(permission);
         }
@@ -151,15 +163,11 @@ function checkAccess(db, collection, operationType, queryOrDoc, user) {
             } catch (error) {
                 key = false;
             }
-        }
-
-        else if (operationType == AccessTypes.read) {
+        } else if (operationType == AccessTypes.read) {
             if (permission.read &&
                 user.permission[permissionType] == true)
                 key = true;
-        }
-
-        else if (operationType == AccessTypes.write) {
+        } else if (operationType == AccessTypes.write) {
 
             if (permission.write &&
                 user.permission[permissionType] == true)
@@ -213,11 +221,13 @@ function performAdditionalOptionsToQueryObject(queryObj, options) {
 
 
 module.exports = {
-    name, addCollectionDefinitionByList, getCollection,
-    checkAccess, getAsID,
+    name,
+    addCollectionDefinitionByList,
+    getCollection,
+    checkAccess,
+    getAsID,
     performPopulateToQueryObject,
     performAdditionalOptionsToQueryObject,
     triggers,
     TypeCasters,
-}
-
+}