Merge branch 'master' of ssh://github.com/Tiledesk/tiledesk-server

Tiledesk · Mar 29, 2024 · 67298c1 · 67298c1
2 parents 7f74fdd + 11208b6
commit 67298c1
Show file tree

Hide file tree

Showing 8 changed files with 399 additions and 22 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.7.3
+- Updated project profile call
+- Updated tybot-connector to 0.2.59
+
 # 2.7.2
 - Improved QuoteManager with kbs and chatbots (disabled)
 - Improved QuoteManager with AI multipliers

diff --git a/middleware/has-role.js b/middleware/has-role.js
@@ -184,8 +184,22 @@ class RoleChecker {
                 }
               } else {
 
+                /**
+                 * Updated by Johnny - 29mar2024 - START
+                 */
+                // console.log("req.user: ", req.user);
+                if (req.user.email === process.env.ADMIN_EMAIL) {
+                  req.user.attributes = { isSuperadmin: true };
+                  next();
+                } else {
+                  res.status(403).send({success: false, msg: 'you dont belong to the project.'});
+                }
+                /**
+                 * Updated by Johnny - 29mar2024 - END
+                 */
+
                 // if (req.user) equals super admin next()
-                res.status(403).send({success: false, msg: 'you dont belong to the project.'});
+                //res.status(403).send({success: false, msg: 'you dont belong to the project.'});
               }
 
           });

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.7.2",
+  "version": "2.7.3",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -48,7 +48,7 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.10",
     "@tiledesk/tiledesk-train-jobworker": "^0.0.7",
-    "@tiledesk/tiledesk-tybot-connector": "^0.2.57",
+    "@tiledesk/tiledesk-tybot-connector": "^0.2.59",
     "@tiledesk/tiledesk-whatsapp-connector": "^0.1.64",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.7",
     "amqplib": "^0.5.5",

diff --git a/routes/auth.js b/routes/auth.js
@@ -72,14 +72,29 @@ router.post('/signup',
   } else {    
     return userService.signup(req.body.email, req.body.password, req.body.firstname, req.body.lastname, false)
       .then(function (savedUser) {
-
-
+
         winston.debug('-- >> -- >> savedUser ', savedUser.toObject());
 
+        // let skipVerificationEmail = false;
+        // if (req.headers.authorization) {
+
+        //   let token = req.headers.authorization.split(" ")[1];
+        //   let decode = jwt.verify(token, configSecret)
+        //   if (decode && (decode.email === process.env.ADMIN_EMAIL)) {
+        //     skipVerificationEmail = true;
+        //     winston.verbose("skip sending verification email")
+        //   }
+        // }
+
+        // if (!req.body.disableEmail){
+        //   if (!skipVerificationEmail) {
+        //     emailService.sendVerifyEmailAddress(savedUser.email, savedUser);
+        //   }
+        // }
+
         if (!req.body.disableEmail){
-          emailService.sendVerifyEmailAddress(savedUser.email, savedUser);
+            emailService.sendVerifyEmailAddress(savedUser.email, savedUser);
         }
-
 
 
         /*