@tiledesk/tiledesk-server 2.2.2 → 2.2.3

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 2.2.3
+- Email inboud fix (others disabled and inboudDomain variable fix and token query string encode fix)
+
+# 2.2.2
+- log fix
+
+# 2.2.1
+- log fix
 
 # 2.2.0
 - Cache circleci fix

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",

package/pubmodules/emailNotification/requestNotification.js

@@ -261,6 +261,7 @@ sendToUserEmailChannelEmail(projectid, message) {
         jwtid: uuidv4()        
       };
 
+
       var recipient = lead.lead_id;
       winston.debug("recipient:"+ recipient);
 
@@ -291,12 +292,13 @@ sendToUserEmailChannelEmail(projectid, message) {
       winston.debug("sourcePage  "+sourcePage);
 
 
-      var tokenQueryString;
-      if(sourcePage && sourcePage.indexOf('?')>-1) { //controllo superfluo ma lascio per indipendenza
-        tokenQueryString =  "&tiledesk_jwt="+encodeURIComponent("JWT "+token)
+      var tokenQueryString;      
+      if(sourcePage && sourcePage.indexOf('?')>-1) {  //controllo superfluo visto che lo metto prima? ma lascio comunque per indipendenza
+        tokenQueryString =  encodeURIComponent("&tiledesk_jwt=JWT "+token)
       }else {
-        tokenQueryString =  "?tiledesk_jwt="+encodeURIComponent("JWT "+token);
+        tokenQueryString =  encodeURIComponent("?tiledesk_jwt=JWT "+token);
       }
+      winston.debug("tokenQueryString:  "+tokenQueryString);
       
       emailService.sendEmailChannelNotification(message.request.lead.email, message, project, tokenQueryString, sourcePage);
     
@@ -610,11 +612,12 @@ sendUserEmail(projectid, message) {
 
                   var tokenQueryString;
                   if(sourcePage && sourcePage.indexOf('?')>-1) {  //controllo superfluo visto che lo metto prima? ma lascio comunque per indipendenza
-                    tokenQueryString =  "&tiledesk_jwt="+encodeURIComponent("JWT "+token)
+                    tokenQueryString =  encodeURIComponent("&tiledesk_jwt=JWT "+token)
                   }else {
-                    tokenQueryString =  "?tiledesk_jwt="+encodeURIComponent("JWT "+token);
+                    tokenQueryString =  encodeURIComponent("?tiledesk_jwt=JWT "+token);
                   }
-
+                  winston.debug("tokenQueryString:  "+tokenQueryString);
+                  
                   emailService.sendNewMessageNotification(lead.email, message, project, tokenQueryString, sourcePage);
               } 
                 
@@ -775,8 +778,27 @@ sendAgentEmail(projectid, savedRequest) {
                             winston.warn("User not found",  savedRequest.participants[0]);
                           } else {
                             winston.verbose("Sending sendNewAssignedRequestNotification to user with email", user.email);
-                            //  if (user.emailverified) {    enable it?     send anyway to improve engagment for new account                
-                              emailService.sendNewAssignedRequestNotification(user.email, savedRequest, project);
+                            //  if (user.emailverified) {    enable it?     send anyway to improve engagment for new account    
+                            
+                            
+                            // var signOptions = {
+                            //   issuer:  'https://tiledesk.com',
+                            //   subject:  'user',
+                            //   audience:  'https://tiledesk.com',
+                            //   jwtid: uuidv4()        
+                            // };
+          
+                            // let userObject = {_id: user._id, firstname: user.firstname, lastname: user.lastname, email: user.email, attributes: user.attributes};
+                            // winston.debug("userObject  ",userObject);
+          
+                  
+                            // var agentToken = jwt.sign(userObject, configSecret, signOptions);
+                            // winston.debug("agentToken  "+agentToken);
+
+                            
+
+
+                            emailService.sendNewAssignedRequestNotification(user.email, savedRequest, project);
                             //  }
                           }
                         });

package/routes/urls.js

@@ -4,7 +4,7 @@ var winston = require('../config/winston');
 
 
 router.get('/redirect', function (req, res) {
-  winston.debug(req.body);
+  winston.debug("redirect: "+ req.query.path);
   res.redirect(req.query.path);
 });
 

package/services/emailService.js

@@ -74,15 +74,15 @@ class EmailService {
     }
     winston.info('EmailService replyEnabled : '+ this.replyEnabled);
 
-    // unused? is empty why?
+    // this is used as fixed reply to url, but this is unused we always return support-group-dynamic
     this.replyTo = process.env.EMAIL_REPLY_TO || config.replyTo;
     winston.info('EmailService replyTo address: '+ this.replyTo);
 
-    this.inboudDomain = process.env.EMAIL_INBOUND_DOMAIN || config.inboundDomain;
-    winston.info('EmailService inboudDomain : '+ this.inboudDomain);
+    this.inboundDomain = process.env.EMAIL_INBOUND_DOMAIN || config.inboundDomain;         
+    winston.info('EmailService inboundDomain : '+ this.inboundDomain);
     
-    this.inboudDomainWithAt = "@"+this.inboudDomain;
-    winston.verbose('EmailService inboudDomainWithAt : '+ this.inboudDomainWithAt);
+    this.inboundDomainDomainWithAt = "@"+this.inboundDomain;
+    winston.verbose('EmailService inboundDomainDomainWithAt : '+ this.inboundDomainDomainWithAt);
 
     this.pass = process.env.EMAIL_PASSWORD;
 
@@ -346,7 +346,11 @@ class EmailService {
   
     let messageId = "notification" + "@" + MESSAGE_ID_DOMAIN;
 
-    let replyTo = request.request_id + this.inboudDomainWithAt;
+    let replyTo;
+    if (this.replyEnabled) { //fai anche per gli altri
+      replyTo = request.request_id + this.inboundDomainDomainWithAt;
+    }
+
     let headers;
     if (request) { 
       
@@ -356,7 +360,11 @@ class EmailService {
           replyTo = request.attributes.email_replyTo;
         }        
     
-      headers = {"X-TILEDESK-PROJECT-ID": project._id, "X-TILEDESK-REQUEST-ID": request.request_id, "X-TILEDESK-TICKET-ID":request.ticket_id };
+      headers = {
+                  "X-TILEDESK-PROJECT-ID": project._id, 
+                  "X-TILEDESK-REQUEST-ID": request.request_id, 
+                  "X-TILEDESK-TICKET-ID":request.ticket_id,
+                };
 
       winston.verbose("messageId: " + messageId);
       winston.verbose("replyTo: " + replyTo);
@@ -488,7 +496,11 @@ class EmailService {
 
     let messageId = message._id + "@" + MESSAGE_ID_DOMAIN;
 
-    let replyTo = message.request.request_id + this.inboudDomainWithAt;
+    let replyTo;
+    if (this.replyEnabled) {
+      replyTo = message.request.request_id + this.inboundDomainDomainWithAt;
+    }
+
     let headers;
     if (message.request) { 
       
@@ -629,7 +641,11 @@ class EmailService {
     
     let messageId = "notification-pooled" + new Date().getTime() + "@" + MESSAGE_ID_DOMAIN;
 
-    let replyTo = request.request_id + this.inboudDomainWithAt;
+    let replyTo;
+    if (this.replyEnabled) {
+      replyTo = request.request_id + this.inboundDomainDomainWithAt;
+    }
+
     let headers;
     if (request) { 
       
@@ -765,7 +781,11 @@ class EmailService {
 
     let messageId = message._id + "@" + MESSAGE_ID_DOMAIN;
 
-    let replyTo = message.request.request_id + this.inboudDomainWithAt;
+    let replyTo;
+    if (this.replyEnabled) {
+      replyTo = message.request.request_id + this.inboundDomainDomainWithAt;
+    }
+
     let headers;
     if (message.request) { 
       
@@ -904,7 +924,11 @@ class EmailService {
 
     let messageId = message._id + "@" + MESSAGE_ID_DOMAIN;
 
-    let replyTo = message.request.request_id + this.inboudDomainWithAt;
+    let replyTo;
+    if (this.replyEnabled) {
+      replyTo = message.request.request_id + this.inboundDomainDomainWithAt;
+    }
+
     let headers;
     if (message.request) { 
       
@@ -1015,6 +1039,8 @@ class EmailService {
     }
     
     winston.debug("msgText: " + msgText);
+    winston.debug("baseScope: " + JSON.stringify(baseScope));
+    
 
     var replacements = {        
       message: message,
@@ -1033,7 +1059,11 @@ class EmailService {
     
     let messageId = message._id + "@" + MESSAGE_ID_DOMAIN;
 
-    let replyTo = message.request.request_id + this.inboudDomainWithAt;
+    let replyTo;
+    if (this.replyEnabled) {
+      replyTo = message.request.request_id + this.inboundDomainDomainWithAt;
+    }
+
     let headers;
     if (message.request) { 
       

package/template/email/ticket.html

@@ -132,8 +132,7 @@
                 {{#ifEquals this.type "url"}}
                   <li><a href="{{this.link}}" class="dynamic_button">{{this.value}}</a></li>
                 {{else}}
-                  <li><a href="mailto:{{../message.request.request_id}}@{{baseScope.inboundDomain}}?subject=Re:%20{{../message.request.subject}}&body={{this.value}}" class="dynamic_button">{{this.value}}</a></li>   
-                  <!-- <li><a href="https://api.tiledesk.com/v2/{{project.id}}/link?secret_token={{tokenQueryString}}" class="dynamic_button">{{this.value}}</a></li>     -->
+                  <li><a href="mailto:{{../message.request.request_id}}@{{../baseScope.inboundDomain}}?subject=Re:%20{{../message.request.subject}}&body={{this.value}}" class="dynamic_button">{{this.value}}</a></li>   
                 {{/ifEquals}}
             {{/each}}
 
@@ -142,14 +141,14 @@
     {{/if}}
 {{/if}}
 
-{{#if message.attributes.intent_info}}
+<!-- {{#if message.attributes.intent_info}}
   {{#if message.attributes.intent_info.others}}
     Others:
     {{#each message.attributes.intent_info.others}}
       <li><span>{{this.answer}}</span></li>
     {{/each}}
   {{/if}}
-{{/if}}
+{{/if}} -->