@tiledesk/tiledesk-server 2.1.4-0.3 → 2.1.4-0.31

package/.circleci/config.yml

@@ -0,0 +1,44 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine. 
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+orbs:
+  # The Node.js orb contains a set of prepackaged CircleCI configuration you can utilize
+  # Orbs reduce the amount of configuration required for common tasks. 
+  # See the orb documentation here: https://circleci.com/developer/orbs/orb/circleci/node
+  node: circleci/node@4.1
+
+
+jobs:
+  # Below is the definition of your job to build and test your app, you can rename and customize it as you want.
+  build-and-test:  
+    # These next lines define a Docker executor: https://circleci.com/docs/2.0/executor-types/
+    # You can specify an image from Dockerhub or use one of our Convenience Images from CircleCI's Developer Hub.
+    # A list of available CircleCI Docker Convenience Images are available here: https://circleci.com/developer/images/image/cimg/node
+    docker:
+      - image: cimg/node:15.1
+    # Then run your tests!
+    # CircleCI will report the results back to your VCS provider.
+    steps:
+      # Checkout the code as the first step.
+      - checkout
+      # Next, the node orb's install-packages step will install the dependencies from a package.json.
+      # The orb install-packages step will also automatically cache them for faster future runs.
+      - node/install-packages
+      # If you are using yarn instead npm, remove the line above and uncomment the two lines below.
+      # - node/install-packages:
+      #     pkg-manager: yarn 
+      - run:
+          name: Run tests
+          command: npm test
+
+workflows:
+  # Below is the definition of your workflow.
+  # Inside the workflow, you provide the jobs you want to run, e.g this workflow runs the build-and-test job above.
+  # CircleCI will run this workflow on every commit.
+  # For more details on extending your workflow, see the configuration docs: https://circleci.com/docs/2.0/configuration-reference/#workflows
+  sample: 
+    jobs:
+      - build-and-test
+      # For running simple node tests, you could optionally use the node/test job from the orb to replicate and replace the job above in fewer lines.
+      # - node/test

package/.github/workflows/docker-community-push-latest.yml

@@ -0,0 +1,22 @@
+name: Docker Image Community latest CI
+
+on:	
+  push:	 
+    branches: [ master ]
+  pull_request:	
+    branches: [ master ]	
+
+jobs:
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2	     
+      name: Check out the repo
+    - uses: docker/build-push-action@v1
+      with:	    
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        repository: tiledesk/tiledesk-server
+        tags: latest

package/.github/workflows/{docker-image-push.yml → docker-image-en-tag-push.yml}

@@ -1,4 +1,4 @@
-name: Publish Docker image
+name: Publish Docker Enterprise Tag image
 
 on:
   push:

package/.github/workflows/docker-image-tag-community-tag-push.yml

@@ -0,0 +1,21 @@
+name: Publish Docker Community image tags
+
+on:
+  push:
+    tags:
+      - '**'           # Push events to every tag including hierarchical tags like
+jobs:
+
+  push_to_registry:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    steps:
+     - name: Check out the repo
+       uses: actions/checkout@v2
+     - name: Push to Docker Hub
+       uses: docker/build-push-action@v1
+       with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
+        repository: tiledesk/tiledesk-server
+        tag_with_ref: true

package/.github/workflows/{docker-push-latest.yml → docker-push-en-push-latest.yml}

@@ -1,4 +1,4 @@
-name: Docker Image CI
+name: Docker Enterprise Latest Image CI
 
 on:	
   push:	 

package/CHANGELOG.md

@@ -1,4 +1,7 @@
 
+# 2.1.40.4
+- BugFix messageConstants
+ 
 # 2.1.40.3
 - Bugfix first message with an image fix and touchText limited to 30 character or subject
 - Removed answer field from the fulltext search of the faqs

package/Dockerfile

@@ -18,7 +18,7 @@ RUN if [ "$NPM_TOKEN" ]; \
 # where available (npm@5+)
 COPY package*.json ./
 
-RUN npm install
+RUN npm install --production
 
 RUN rm -f .npmrc
 

package/Dockerfile-en

@@ -13,7 +13,7 @@ COPY .npmrc_ .npmrc
 # where available (npm@5+)
 COPY package*.json ./
 
-RUN npm install
+RUN npm install --production
 
 RUN rm -f .npmrc
 

package/app.js

@@ -99,6 +99,8 @@ var cacheUtil = require("./utils/cacheUtil");
 var images = require('./routes/images');
 var files = require('./routes/files');
 var campaigns = require('./routes/campaigns');
+var requestUtilRoot = require('./routes/requestUtilRoot');
+
 
 var bootDataLoader = require('./services/bootDataLoader');
 var settingDataLoader = require('./services/settingDataLoader');
@@ -133,6 +135,11 @@ try {
 }
 
 
+//enterprise modules can modify pubmodule
+modulesManager.start();
+
+pubModulesManager.start();
+
 
 settingDataLoader.save();
 schemaMigrationService.checkSchemaMigration();
@@ -282,6 +289,8 @@ app.use('/widgets', widgetsLoader);
 app.use('/images', images);
 app.use('/files', files);
 app.use('/users', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], users);
+app.use('/requests_util', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], requestUtilRoot);
+
 
 // TODO security issues
 if (process.env.DISABLE_TRANSCRIPT_VIEW_PAGE ) {
@@ -310,7 +319,6 @@ app.use('/:projectid/', [projectIdSetter, projectSetter]);
 app.use('/:projectid/authtestWithRoleCheck', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken], authtestWithRoleCheck);
 
 app.use('/:projectid/leads', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])], lead);
-                                                                                                                                                              //  guest perche nn c'è guest???? no???
 app.use('/:projectid/requests/:request_id/messages', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes(null, ['bot','subscription'])] , message);
 
 app.use('/:projectid/messages', [passport.authenticate(['basic', 'jwt'], { session: false }), validtoken, roleChecker.hasRoleOrTypes('agent', ['bot','subscription'])] , messagesRootRoute);

package/channels/chat21/chat21Handler.js

@@ -189,7 +189,7 @@ class Chat21Handler {
             setImmediate(() => {
                 winston.debug("Chat21Handler on lead.update ",  lead);
 
-                // AGGIORNA SOLO SE PASSA DA GUEST A ALTRO??
+                //  TODO AGGIORNA SOLO SE PASSA DA GUEST A ALTRO??
                 Request.find({lead: lead._id, id_project: lead.id_project}, function(err, requests) {
 
                     if (err) {
@@ -364,10 +364,10 @@ class Chat21Handler {
                             // winston.warn("Chat21Sender this is a direct message. Unimplemented method", message);
 
                             chat21.auth.setAdminToken(adminToken);
-                            
+
                             // send: function(sender_fullname, recipient_id, recipient_fullname, text, sender_id, attributes, type, metadata){
                            return  chat21.messages.send(message.senderFullname,     message.recipient, 
-                            "recipient_fullname", message.text, message.sender, message.attributes, message.type, message.metadata)
+                            message.recipientFullname, message.text, message.sender, message.attributes, message.type, message.metadata)
                                     .then(function(data){
                                         winston.verbose("Chat21Sender send sent: "+ JSON.stringify(data));
                                 
@@ -383,13 +383,54 @@ class Chat21Handler {
                                             });
 
                             }).catch(function(err) {
-                                winston.error("Chat21 sendToGroup err", err);
+                                winston.error("Chat21 send direct err", err);
                                 chat21Event.emit('message.sent.error', err);
                             });
 
                             
 
-                    } else {
+                    } 
+                    
+                    else if (message &&
+                        message.status === MessageConstants.CHAT_MESSAGE_STATUS.SENDING && 
+                        message.channel_type ==  MessageConstants.CHANNEL_TYPE.GROUP &&
+                        message.channel.name == ChannelConstants.CHAT21) {
+                       
+                           // winston.warn("Chat21Sender this is a group message. Unimplemented method", message);
+
+                           chat21.auth.setAdminToken(adminToken);
+
+                           var timestamp = Date.now();
+                           // var timestamp = undefined;
+                           if (message.attributes && message.attributes.clienttimestamp) {
+                               timestamp = message.attributes.clienttimestamp;
+                           }
+
+
+                           return  chat21.messages.sendToGroup(message.senderFullname,     message.recipient, 
+                            message.recipientFullname, message.text, message.sender, message.attributes, message.type, message.metadata, timestamp)                         
+                                   .then(function(data){
+                                       winston.verbose("Chat21Sender send sent: "+ JSON.stringify(data));
+                               
+
+                                       // chat21.conversations.stopTyping(message.recipient,message.sender);
+
+                                       chat21Event.emit('message.sent', data);
+
+                                           messageService.changeStatus(message._id, MessageConstants.CHAT_MESSAGE_STATUS.DELIVERED) .then(function(upMessage){
+                                               winston.debug("Chat21 message sent ", upMessage.toObject());                                        
+                                           }).catch(function(err) {
+                                               winston.error("Error Chat21 message sent with id: "+message._id, err);                                        
+                                           });
+
+                           }).catch(function(err) {
+                               winston.error("Chat21 sendToGroup err", err);
+                               chat21Event.emit('message.sent.error', err);
+                           });
+
+                           
+
+                   } else {
                         winston.error("Chat21Sender this is not a group o direct message", message);
                         return;
                     }
@@ -815,6 +856,8 @@ class Chat21Handler {
 
                     return chat21.groups.create(group.name, groupMembers, undefined, group_id).then(function(data) {
                         winston.verbose("Chat21 group created: " + JSON.stringify(data));      
+                        // TODO ritorna success anche se 
+                        // verbose: Chat21 group created: {"success":false,"err":{"message":"Channel closed","stack":"IllegalOperationError: Channel closed\n    at ConfirmChannel.<anonymous> (/usr/src/app/node_modules/amqplib/lib/channel.js:160:11)\n    at ConfirmChannel.Channel.publish (/usr/src/app/node_modules/amqplib/lib/callback_model.js:171:17)\n    at ConfirmChannel.publish (/usr/src/app/node_modules/amqplib/lib/callback_model.js:301:36)\n    at Chat21Api.publish (/usr/src/app/chat21Api/index.js:1028:29)\n    at Chat21Api.sendMessageRaw (/usr/src/app/chat21Api/index.js:762:14)\n    at Chat21Api.sendGroupWelcomeMessage (/usr/src/app/chat21Api/index.js:205:14)\n    at /usr/src/app/chat21Api/index.js:99:22\n    at /usr/src/app/chat21Api/index.js:234:17\n    at /usr/src/app/chatdb/index.js:77:9\n    at executeCallback (/usr/src/app/node_modules/mongodb/lib/operations/execute_operation.js:70:5)\n    at updateCallback (/usr/src/app/node_modules/mongodb/lib/operations/update_one.js:41:3)\n    at /usr/src/app/node_modules/mongodb/lib/operations/update_one.js:24:64\n    at handleCallback (/usr/src/app/node_modules/mongodb/lib/utils.js:128:55)\n    at /usr/src/app/node_modules/mongodb/lib/operations/common_functions.js:378:5\n    at handler (/usr/src/app/node_modules/mongodb/lib/core/sdam/topology.js:913:24)","stackAtStateChange":"Stack capture: Socket error\n    at Connection.C.onSocketError (/usr/src/app/node_modules/amqplib/lib/connection.js:354:13)\n    at Connection.emit (events.js:314:20)\n    at Socket.go (/usr/src/app/node_modules/amqplib/lib/connection.js:481:12)\n    at Socket.emit (events.js:314:20)\n    at emitReadable_ (_stream_readable.js:557:12)\n    at processTicksAndRejections (internal/process/task_queues.js:83:21)"}}
                         chat21Event.emit('group.create', data);                                          
                     }).catch(function(err) {
                         winston.error("Error creating chat21 group ", err);