[feature/crudcontext] review changes.

Author: frknbasaran

api/utils/requestProcessor.js

@@ -537,7 +537,7 @@ const processRequest = (params) => {
 
                 switch (paths[3]) {
                 case 'create':
-                    validateUserForGlobalAdmin(params, countlyApi.mgmt.apps.createApp);
+                    validateCreate(params, 'global_applications', countlyApi.mgmt.apps.createApp);
                     break;
                 case 'update':
                     if (paths[4] === 'plugins') {

bin/upgrade/dev/scripts/member_permission_generator.js

@@ -1,52 +1,53 @@
 var pluginManager = require('../../../plugins/pluginManager.js'),
-    async = require('async'),
-    countlyDb = pluginManager.dbConnection();
-
-countlyDb.collection('members').find({global_admin: {$ne: true}}).toArray(function(err, members) {
-    if (!members && err) {
-        console.log(err);
-        countlyDb.close();
-        return;
-    }
-
-    function upgrade(member, done) {
-        if (!member.admin_of || !member.user_of) {
-            done();
+    async = require('async');
+
+pluginManager.dbConnection().then((countlyDb) => {
+    countlyDb.collection('members').find({global_admin: {$ne: true}}).toArray(function(err, members) {
+        if (!members && err) {
+            console.log(err);
+            countlyDb.close();
             return;
         }
 
-        var writeAccess = member.admin_of;
-        var readAccess = member.user_of;
-
-        var memberPermission = {
-            "c": {},
-            "r": {},
-            "u": {},
-            "d": {}
-        };
-
-        writeAccess.forEach(app => {
-            memberPermission.c[app] = {all: true};
-            memberPermission.r[app] = {all: true};
-            memberPermission.u[app] = {all: true};
-            memberPermission.d[app] = {all: true};
-        });
+        function upgrade(member, done) {
+            if (!member.admin_of || !member.user_of) {
+                done();
+                return;
+            }
 
-        readAccess.forEach(app => {
-            memberPermission.r[app] = {all: true};
-        });
+            var writeAccess = member.admin_of;
+            var readAccess = member.user_of;
+
+            var memberPermission = {
+                "c": {},
+                "r": {},
+                "u": {},
+                "d": {}
+            };
+
+            writeAccess.forEach(app => {
+                memberPermission.c[app] = {all: true};
+                memberPermission.r[app] = {all: true};
+                memberPermission.u[app] = {all: true};
+                memberPermission.d[app] = {all: true};
+            });
+
+            readAccess.forEach(app => {
+                memberPermission.r[app] = {all: true};
+            });
+
+            countlyDb.collection('members').findAndModify({"_id": member._id}, {}, {$set: {permission: memberPermission}}, function(err, member) {
+                if (err || !member) {
+                    console.log("Member not found.");
+                }
+                done();
+                return;
+            });
+        }
 
-        countlyDb.collection('members').findAndModify({"_id": member._id}, {}, {$set: {permission: memberPermission}}, function(err, member) {
-            if (err || !member) {
-                console.log("Member not found.");
-            }
-            done();
-            return;
+        async.forEach(members, upgrade, function() {
+            console.log("Finished upgrading member permissions.");
+            countlyDb.close();
         });
-    }
-
-    async.forEach(members, upgrade, function() {
-        console.log("Finished upgrading member permissions.");
-        countlyDb.close();
     });
-});
+});

extend/.gitignore

@@ -3,4 +3,5 @@
 # Except this file
 !.gitignore
 !aws_ses.example.js
-!mail.debug.example.js
+!mail.debug.example.js
+!mail.example.js

extend/mail.example.js

@@ -0,0 +1,85 @@
+//file should be placed in countly/extend
+//edit this script and put it in countly/extend/mail.js to overwrite existing email templates and settings
+var nodemailer = require('nodemailer');
+var smtpTransport = require('nodemailer-smtp-transport');
+
+//rename company
+var company = "Company";
+var email = "[email protected]";
+
+module.exports = function(mail) {
+    //define this if you need to send email from some third party service
+    mail.smtpTransport = nodemailer.createTransport(smtpTransport({
+        host: "myhost",
+        secureConnection: true,
+        port: 2525,
+        auth: {
+            user: "username",
+            pass: "password"
+        }
+    }));
+
+    mail.sendMail = function(message, callback) {
+        message.from = company + " <" + email + ">";
+        mail.smtpTransport.sendMail(message, function(error) {
+            if (error) {
+                console.log('Error sending email');
+                console.log(error.message);
+            }
+            if (callback) {
+                callback(error);
+            }
+        });
+    };
+
+    mail.sendMessage = function(to, subject, message, callback) {
+        mail.sendMail({
+            to: to,
+            from: company + " <" + email + ">",
+            subject: subject || "",
+            html: message || ""
+        }, callback);
+    };
+
+    mail.sendToNewMember = function(member, memberPassword) {
+        const password = mail.escapedHTMLString(memberPassword);
+
+        mail.lookup(function(err, host) {
+            mail.sendMessage(member.email, "Your " + company + " Account",
+                "Hi " + mail.getUserFirstName(member) + ",<br/><br/>\n" +
+                "Your " + company + " account on <a href='" + host + "'>" + host + "</a> is created with the following details;<br/><br/>\n" +
+                "Username: " + member.username + "<br/>Password: " + password + "<br/><br/>\n" +
+                "Enjoy,<br/>A fellow " + company + " Admin");
+        });
+    };
+
+    mail.sendToUpdatedMember = function(member, memberPassword) {
+        const password = mail.escapedHTMLString(memberPassword);
+
+        mail.lookup(function(err, host) {
+            mail.sendMessage(member.email, "" + company + " Account - Password Change", "Hi " + mail.getUserFirstName(member) + ",<br/><br/>\n" +
+            "Your password for your " + company + " account on <a href='" + host + "'>" + host + "</a> has been changed. Below you can find your updated account details;<br/><br/>\n" +
+            "Username: " + member.username + "<br/>Password: " + password + "<br/><br/>\n" +
+            "Best,<br/>A fellow " + company + " Admin");
+        });
+    };
+
+    mail.sendPasswordResetInfo = function(member, prid) {
+        mail.lookup(function(err, host) {
+            mail.sendMessage(member.email, "" + company + " Account - Password Reset", "Hi " + mail.getUserFirstName(member) + ",<br/><br/>\n" +
+            "You can reset your " + company + " account password by following <a href='" + host + "/reset/" + prid + "'>this link</a>.<br/><br/>\n" +
+            "If you did not request to reset your password ignore this email.<br/><br/>\n" +
+            "Best,<br/>A fellow " + company + " Admin");
+        });
+    };
+
+    mail.sendAutomatedMessageError = function(member, link) {
+        mail.lookup(function(err, host) {
+            link = host + '/' + link;
+            mail.sendMessage(member.email, company + " Automated Push Problem", "Hi " + mail.getUserFirstName(member) + ",,<br/><br/>\n" +
+            "Your <a href=\"" + link + "\">automated message</a> cannot be sent due to a repeating error.\n" +
+            "Please review message status and reactivate the message once the problem is resolved.<br/><br/>\n" +
+            "Best,<br/>A fellow " + company + " Admin");
+        });
+    };
+};