Merge pull request #241 from CloudBoost/staging

Staging

Author: shubhamqweasd

.dockerignore

@@ -1,5 +1,5 @@
 .git/
-#node_modules/
+node_modules/
 config/cloudboost.json
 .vscode/
 *.suo

.travis.yml

@@ -28,6 +28,7 @@ install:
   fi
 - docker run --name cloudboost -e  MAIL_PROVIDER=$MAIL_PROVIDER -e  MAIL_PROVIDER_API_KEY=$MAIL_PROVIDER_API_KEY -e  DOMAIN=$DOMAIN -e  FROM_EMAIL=$FROM_EMAIL -e  FROM_NAME=$FROM_NAME -p 4730:4730 -it --link redis:redis --link mongo:mongo -d cloudboost/cloudboost:2.0.$TRAVIS_BUILD_NUMBER
 - sleep 30s
+- docker logs cloudboost
 - git clone https://github.com/cloudboost/javascriptsdk
 - cd javascriptsdk
 - npm install

Dockerfile

@@ -2,7 +2,7 @@
 # CloudBoost Dockerfile
 #
 # Pull base image nodejs image.
-FROM node:7.5.0
+FROM node:8.2.1
 
 #Maintainer.
 MAINTAINER Nawaz Dhandala <[email protected]>

database-connect/realTime.js

@@ -153,8 +153,7 @@ module.exports = function(io) {
 
     });
 
-    g.sendObjectNotification = function(appId, document, eventType, isMasterKey) {
-        //pass masterkey to access events as default ACL for event R/W is set to false
+    g.sendObjectNotification = function(appId, document, eventType) {
         try {
             //event type can be created, updated, deleted.
             if (document && document._tableName) {
@@ -172,13 +171,13 @@ module.exports = function(io) {
                 if (typeof sockets === "object") {
                     for (var key in sockets) {
                         if (sockets[key]) {
-                            promises.push(_sendNotification(appId, document, sockets[key], eventType, isMasterKey));
+                            promises.push(_sendNotification(appId, document, sockets[key], eventType));
                         }
                     }
                 } else {
                     for (var i = 0; i < sockets.length; i++) {
                         var socket = sockets[i];
-                        promises.push(_sendNotification(appId, document, socket, eventType, isMasterKey));
+                        promises.push(_sendNotification(appId, document, socket, eventType));
                     }
                 }
 
@@ -203,15 +202,14 @@ module.exports = function(io) {
 /**
  */
 
-function _sendNotification(appId, document, socket, eventType, isMasterKey) {
-    //pass masterkey to access events as default ACL for event R/W is set to false
+function _sendNotification(appId, document, socket, eventType) {
     var deferred = global.q.defer();
     try {
         global.socketSessionHelper.getSession(socket.id, function(err, session) {
             if (err) {
                 deferred.reject();
             }
-            if (!session || global.aclHelper.isAllowedReadAccess(session.userId, session.roles, document.ACL) || isMasterKey) {
+            if (!session || global.aclHelper.isAllowedReadAccess(session.userId, session.roles, document.ACL)) {
                 global.socketQueryHelper.getData(socket.id, eventType, function(err, socketData) {
                     var socketQueryValidate = true;
                     if (socketData && socketData.query)

databases/mongo.js

@@ -582,8 +582,21 @@ module.exports = function() {
                 query = _sanitizeQuery(query);
 
                 var keys = {};
+                var indexForDot = onKey.indexOf('.');
+
+                // if DOT in onKey
+                //  keys = { beforeDot: { afterDot : "$beforeDot.afterDot"} }
+                // else
+                //  keys = { onKey : "$"+onKey }
+                if (indexForDot !== -1) {
+
+                    //not using computed properties as it may not be available in server's nodejs version
+                    keys[ onKey.slice(0, indexForDot) ] = { };
+                    keys[ onKey.slice(0, indexForDot) ][ onKey.slice(indexForDot + 1) ] = "$" + onKey;
+                }
+                else
+                    keys[onKey] = "$" + onKey;
 
-                keys[onKey] = "$" + onKey;
                 if (!sort || Object.keys(sort).length === 0) {
                     sort = {
                         "createdAt": 1