@app-connect/core 1.7.16 → 1.7.18

package/lib/oauth.js

@@ -101,41 +101,48 @@ async function checkAndRefreshAccessToken(oauthApp, user, tokenLockTimeout = 20)
             try {
                 const startRefreshTime = moment();
                 const token = oauthApp.createToken(user.accessToken, user.refreshToken);
-            logger.info('token refreshing...')
+                logger.info('token refreshing...')
                 const { accessToken, refreshToken, expires } = await token.refresh();
                 user.accessToken = accessToken;
                 user.refreshToken = refreshToken;
                 user.tokenExpiry = expires;
-            try {
-                await user.save();
-            }
-            catch (error) {
-                return handleDatabaseError(error, 'Error saving user');
-            }
+                try {
+                    await user.save();
+                }
+                catch (error) {
+                    return handleDatabaseError(error, 'Error saving user');
+                }
                 if (newLock) {
                     const deletionStartTime = moment();
                     await newLock.delete();
                     const deletionEndTime = moment();
-                logger.info(`lock deleted in ${deletionEndTime.diff(deletionStartTime)}ms`)
+                    logger.info(`lock deleted in ${deletionEndTime.diff(deletionStartTime)}ms`)
                 }
                 const endRefreshTime = moment();
-            logger.info(`token refreshing finished in ${endRefreshTime.diff(startRefreshTime)}ms`)
+                logger.info(`token refreshing finished in ${endRefreshTime.diff(startRefreshTime)}ms`)
             }
             catch (e) {
                 console.log('token refreshing failed', e.stack)
                 if (newLock) {
                     await newLock.delete();
                 }
+                return null;
             }
         }
         // case: run withou token refresh lock
         else {
-            logger.info('token refreshing...')
-            const token = oauthApp.createToken(user.accessToken, user.refreshToken);
-            const { accessToken, refreshToken, expires } = await token.refresh();
-            user.accessToken = accessToken;
-            user.refreshToken = refreshToken;
-            user.tokenExpiry = expires;
+            try {
+                logger.info('token refreshing...')
+                const token = oauthApp.createToken(user.accessToken, user.refreshToken);
+                const { accessToken, refreshToken, expires } = await token.refresh();
+                user.accessToken = accessToken;
+                user.refreshToken = refreshToken;
+                user.tokenExpiry = expires;
+            }
+            catch (e) {
+                console.log('token refreshing failed', e.stack)
+                return null;
+            }
             try {
                 await user.save();
             }

package/package.json

@@ -1,72 +1,72 @@
-{
-  "name": "@app-connect/core",
-  "version": "1.7.16",
-  "description": "RingCentral App Connect Core",
-  "main": "index.js",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/ringcentral/rc-unified-crm-extension.git"
-  },
-  "keywords": [
-    "RingCentral",
-    "App Connect"
-  ],
-  "author": "RingCentral Labs",
-  "license": "MIT",
-  "peerDependencies": {
-    "axios": "^1.12.2",
-    "express": "^4.22.1",
-    "moment": "^2.29.4",
-    "moment-timezone": "^0.5.39",
-    "pg": "^8.8.0",
-    "sequelize": "^6.29.0"
-  },
-  "dependencies": {
-    "@aws-sdk/client-dynamodb": "^3.751.0",
-    "@aws-sdk/client-s3": "^3.947.0",
-    "@aws-sdk/s3-request-presigner": "^3.947.0",
-    "@modelcontextprotocol/sdk": "^1.21.1",
-    "awesome-phonenumber": "^5.6.0",
-    "body-parser": "^1.20.4",
-    "body-parser-xml": "^2.0.5",
-    "client-oauth2": "^4.3.3",
-    "cors": "^2.8.5",
-    "country-state-city": "^3.2.1",
-    "dotenv": "^16.0.3",
-    "dynamoose": "^4.0.3",
-    "jsonwebtoken": "^9.0.0",
-    "mixpanel": "^0.18.0",
-    "shortid": "^2.2.17",
-    "tz-lookup": "^6.1.25",
-    "ua-parser-js": "^1.0.38"
-  },
-  "scripts": {
-    "test": "jest",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage",
-    "test:ci": "jest --ci --coverage --watchAll=false"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.22.0",
-    "@octokit/rest": "^19.0.5",
-    "axios": "^1.12.2",
-    "eslint": "^9.22.0",
-    "express": "^4.22.1",
-    "globals": "^16.0.0",
-    "jest": "^29.3.1",
-    "moment": "^2.29.4",
-    "moment-timezone": "^0.5.39",
-    "nock": "^13.2.9",
-    "pg": "^8.8.0",
-    "sequelize": "^6.29.0",
-    "sqlite3": "^5.1.2",
-    "supertest": "^6.3.1"
-  },
-  "overrides": {
-    "js-object-utilities": "2.2.1"
-  },
-  "bugs": {
-    "url": "https://github.com/ringcentral/rc-unified-crm-extension/issues"
-  },
-  "homepage": "https://github.com/ringcentral/rc-unified-crm-extension#readme"
-}
+{
+  "name": "@app-connect/core",
+  "version": "1.7.18",
+  "description": "RingCentral App Connect Core",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ringcentral/rc-unified-crm-extension.git"
+  },
+  "keywords": [
+    "RingCentral",
+    "App Connect"
+  ],
+  "author": "RingCentral Labs",
+  "license": "MIT",
+  "peerDependencies": {
+    "axios": "^1.12.2",
+    "express": "^4.22.1",
+    "moment": "^2.29.4",
+    "moment-timezone": "^0.5.39",
+    "pg": "^8.8.0",
+    "sequelize": "^6.29.0"
+  },
+  "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.751.0",
+    "@aws-sdk/client-s3": "^3.947.0",
+    "@aws-sdk/s3-request-presigner": "^3.947.0",
+    "@modelcontextprotocol/sdk": "^1.21.1",
+    "awesome-phonenumber": "^5.6.0",
+    "body-parser": "^1.20.4",
+    "body-parser-xml": "^2.0.5",
+    "client-oauth2": "^4.3.3",
+    "cors": "^2.8.5",
+    "country-state-city": "^3.2.1",
+    "dotenv": "^16.0.3",
+    "dynamoose": "^4.0.3",
+    "jsonwebtoken": "^9.0.0",
+    "mixpanel": "^0.18.0",
+    "shortid": "^2.2.17",
+    "tz-lookup": "^6.1.25",
+    "ua-parser-js": "^1.0.38"
+  },
+  "scripts": {
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage",
+    "test:ci": "jest --ci --coverage --watchAll=false"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.22.0",
+    "@octokit/rest": "^19.0.5",
+    "axios": "^1.12.2",
+    "eslint": "^9.22.0",
+    "express": "^4.22.1",
+    "globals": "^16.0.0",
+    "jest": "^29.3.1",
+    "moment": "^2.29.4",
+    "moment-timezone": "^0.5.39",
+    "nock": "^13.2.9",
+    "pg": "^8.8.0",
+    "sequelize": "^6.29.0",
+    "sqlite3": "^5.1.2",
+    "supertest": "^6.3.1"
+  },
+  "overrides": {
+    "js-object-utilities": "2.2.1"
+  },
+  "bugs": {
+    "url": "https://github.com/ringcentral/rc-unified-crm-extension/issues"
+  },
+  "homepage": "https://github.com/ringcentral/rc-unified-crm-extension#readme"
+}

package/releaseNotes.json

@@ -1,4 +1,20 @@
 {
+    "1.7.18": {
+        "global": [
+            {
+                "type": "New",
+                "description": "Support for Group SMS logging"
+            },
+            {
+                "type": "Better",
+                "description": "User session will log be revoked is token refresh fails"
+            },
+            {
+                "type": "Fix",
+                "description": "Contact call pop issue"
+            }
+        ]
+    },
     "1.7.16": {
         "global": [
             {

package/test/handlers/log.test.js

@@ -29,6 +29,7 @@ const logHandler = require('../../handlers/log');
 const { CallLogModel } = require('../../models/callLogModel');
 const { MessageLogModel } = require('../../models/messageLogModel');
 const { UserModel } = require('../../models/userModel');
+const { AccountDataModel } = require('../../models/accountDataModel');
 const connectorRegistry = require('../../connector/registry');
 const oauth = require('../../lib/oauth');
 const { composeCallLog } = require('../../lib/callLogComposer');
@@ -40,12 +41,14 @@ describe('Log Handler', () => {
     await CallLogModel.sync({ force: true });
     await MessageLogModel.sync({ force: true });
     await UserModel.sync({ force: true });
+    await AccountDataModel.sync({ force: true });
   });
 
   afterEach(async () => {
     await CallLogModel.destroy({ where: {} });
     await MessageLogModel.destroy({ where: {} });
     await UserModel.destroy({ where: {} });
+    await AccountDataModel.destroy({ where: {} });
     jest.clearAllMocks();
   });
 
@@ -742,6 +745,228 @@ describe('Log Handler', () => {
       expect(mockConnector.createMessageLog).toHaveBeenCalledTimes(0);
       expect(mockConnector.updateMessageLog).toHaveBeenCalledTimes(1);
     });
+
+    test('should handle group SMS with contactId suffix for message IDs', async () => {
+      // Arrange - group SMS has multiple correspondents
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-group-123',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-group-1', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-group-123',
+          conversationLogId: 'conv-log-group-123'
+        },
+        contactId: 'contact-456',
+        contactType: 'Contact',
+        contactName: 'Primary Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      const result = await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert
+      expect(result.successful).toBe(true);
+      expect(result.logIds).toContain('msg-group-1-contact-456');
+      const savedLog = await MessageLogModel.findOne({ where: { id: 'msg-group-1-contact-456' } });
+      expect(savedLog).not.toBeNull();
+      expect(savedLog.thirdPartyLogId).toBe('msg-log-group-123');
+    });
+
+    test('should pass correspondents to createMessageLog when group SMS has different contact names', async () => {
+      // Arrange - correspondent in cache with different name
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      await AccountDataModel.create({
+        rcAccountId: 'rc-account-123',
+        platformName: 'testCRM',
+        dataKey: 'contact-+0987654321',
+        data: [{ name: 'Other Contact', id: 'contact-789' }]
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-correspondents',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-correspondents', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-correspondents',
+          conversationLogId: 'conv-log-correspondents'
+        },
+        contactId: 'contact-456',
+        contactType: 'Contact',
+        contactName: 'Primary Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert - createMessageLog should receive correspondents with different name
+      expect(mockConnector.createMessageLog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          correspondents: [[{ name: 'Other Contact', id: 'contact-789' }]]
+        })
+      );
+    });
+
+    test('should not add correspondent when name matches contactName in group SMS', async () => {
+      // Arrange - correspondent in cache with same name as contactName
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      await AccountDataModel.create({
+        rcAccountId: 'rc-account-123',
+        platformName: 'testCRM',
+        dataKey: 'contact-+0987654321',
+        data: [{ name: 'Primary Contact', id: 'contact-789' }]
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-same-name',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-same-name', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-same-name',
+          conversationLogId: 'conv-log-same-name'
+        },
+        contactId: 'contact-456',
+        contactType: 'Contact',
+        contactName: 'Primary Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert - correspondents should be empty when names match
+      expect(mockConnector.createMessageLog).toHaveBeenCalledWith(
+        expect.objectContaining({
+          correspondents: []
+        })
+      );
+    });
+
+    test('should use suffixed conversationLogId and conversationId for group SMS', async () => {
+      // Arrange
+      await UserModel.create({
+        id: 'test-user-id',
+        platform: 'testCRM',
+        accessToken: 'test-token',
+        rcAccountId: 'rc-account-123',
+        platformAdditionalInfo: {}
+      });
+
+      const mockConnector = {
+        getAuthType: jest.fn().mockResolvedValue('apiKey'),
+        getBasicAuth: jest.fn().mockReturnValue('base64-encoded'),
+        createMessageLog: jest.fn().mockResolvedValue({
+          logId: 'msg-log-suffix',
+          returnMessage: { message: 'Message logged', messageType: 'success', ttl: 2000 }
+        }),
+        updateMessageLog: jest.fn()
+      };
+      connectorRegistry.getConnector.mockReturnValue(mockConnector);
+
+      const incomingData = {
+        logInfo: {
+          messages: [{ id: 'msg-suffix', subject: 'Group SMS', direction: 'Outbound', creationTime: new Date() }],
+          correspondents: [
+            { phoneNumber: '+1234567890' },
+            { phoneNumber: '+0987654321' }
+          ],
+          conversationId: 'conv-original',
+          conversationLogId: 'conv-log-original'
+        },
+        contactId: 'contact-999',
+        contactType: 'Contact',
+        contactName: 'Test Contact',
+        additionalSubmission: {}
+      };
+
+      // Act
+      const result = await logHandler.createMessageLog({
+        platform: 'testCRM',
+        userId: 'test-user-id',
+        incomingData
+      });
+
+      // Assert - message log saved with suffixed conversationLogId
+      expect(result.successful).toBe(true);
+      const savedLog = await MessageLogModel.findOne({ where: { id: 'msg-suffix-contact-999' } });
+      expect(savedLog).not.toBeNull();
+      expect(savedLog.conversationLogId).toBe('conv-log-original-contact-999');
+      expect(savedLog.conversationId).toBe('conv-original-contact-999');
+    });
   });
 
   describe('saveNoteCache', () => {