@tiledesk/tiledesk-server 2.11.9 → 2.11.11

package/CHANGELOG.md

@@ -5,6 +5,16 @@
 🚀        IN PRODUCTION                        🚀
 (https://www.npmjs.com/package/@tiledesk/tiledesk-server/v/2.3.77) 
 
+# 2.11.10
+- Updated: whatsapp module listener
+- Updated: whatsapp-connector to 0.1.86
+
+# 2.11.10
+- Updated: whatsapp module listener
+- Updated: whatsapp-connector to 0.1.85
+- Updated: tybot-connector to 2.0.26
+- Updated: vxml-connector to 0.1.77
+
 # 2.11.9
 - Changed: oauth2 endpoints in auth route
 - Updated: improved project users management (soft delete)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tiledesk/tiledesk-server",
   "description": "The Tiledesk server module",
-  "version": "2.11.9",
+  "version": "2.11.11",
   "scripts": {
     "start": "node ./bin/www",
     "pretest": "mongodb-runner start",
@@ -49,10 +49,10 @@
     "@tiledesk/tiledesk-rasa-connector": "^1.0.10",
     "@tiledesk/tiledesk-sms-connector": "^0.1.11",
     "@tiledesk/tiledesk-telegram-connector": "^0.1.14",
-    "@tiledesk/tiledesk-tybot-connector": "^2.0.23",
+    "@tiledesk/tiledesk-tybot-connector": "^2.0.26",
     "@tiledesk/tiledesk-voice-twilio-connector": "^0.1.22",
-    "@tiledesk/tiledesk-vxml-connector": "^0.1.76",
-    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.84",
+    "@tiledesk/tiledesk-vxml-connector": "^0.1.77",
+    "@tiledesk/tiledesk-whatsapp-connector": "^0.1.86",
     "@tiledesk/tiledesk-whatsapp-jobworker": "^0.0.12",
     "amqplib": "^0.5.5",
     "app-root-path": "^3.0.0",

package/pubmodules/whatsapp/listener.js

@@ -28,6 +28,12 @@ class Listener {
         let graph_url = process.env.META_GRAPH_URL || config.graphUrl || "https://graph.facebook.com/v14.0/"
         winston.debug("Whatsapp graph_url: "+ password);
 
+        let fb_app_id = process.env.FB_APP_ID;
+        winston.debug("Whatsapp fb_app_id: "+ fb_app_id);
+
+        let configuration_id = process.env.CONFIGURATION_ID;
+        winston.debug("Whatsapp configuration_id: "+ configuration_id);
+
         let baseFileUrl = process.env.BASE_FILE_URL || apiUrl || "http://localhost:3000"
 
         let job_topic = process.env.JOB_TOPIC_EXCHANGE;
@@ -50,6 +56,8 @@ class Listener {
             API_URL: apiUrl,
             BASE_FILE_URL: baseFileUrl,
             GRAPH_URL: graph_url,
+            FB_APP_ID: fb_app_id,
+            CONFIGURATION_ID: configuration_id,
             BASE_URL: apiUrl + "/modules/whatsapp",                     
             APPS_API_URL: apiUrl + "/modules/apps",
             REDIS_HOST: host,

package/routes/auth.js

@@ -822,17 +822,18 @@ router.get('/oauth2/callback', passport.authenticate('oauth2', { session: false
   winston.debug("(/oauth2/callback) Google Redirect dashboard_base_url: ", dashboard_base_url);
 
   let homeurl = "/#/";
-
+    
+  const separator = homeurl.includes('?') ? '&' : '?';
+  var url = dashboard_base_url+homeurl+ separator + "token=JWT "+token;
+  
   if (req.session.redirect_url) {
-    homeurl = req.session.redirect_url;
+    const separator = req.session.redirect_url.includes('?') ? '&' : '?';
+    url = req.session.redirect_url+ separator + "token=JWT "+token;
   }
 
-  const separator = homeurl.includes('?') ? '&' : '?';
-  var url = dashboard_base_url + homeurl + separator + "token=JWT " + token;
-
   if (req.session.forced_redirect_url) {
     const separator = req.session.forced_redirect_url.includes('?') ? '&' : '?';
-    url = req.session.forced_redirect_url + separator + "jwt=JWT " + token;  //attention we use jwt= (ionic) instead token=(dashboard) for ionic 
+    url = req.session.forced_redirect_url+ separator + "jwt=JWT "+token;  //attention we use jwt= (ionic) instead token=(dashboard) for ionic 
   }
 
   winston.debug("(/oauth2/callback) Google Redirect: " + url);