@app-connect/core 1.7.8 → 1.7.10

package/lib/oauth.js

@@ -117,8 +117,6 @@ async function checkAndRefreshAccessToken(oauthApp, user, tokenLockTimeout = 20)
             }
             catch (e) {
                 console.log('token refreshing failed', e.stack)
-            }
-            finally {
                 if (newLock) {
                     await newLock.delete();
                 }

package/models/accountDataModel.js

@@ -0,0 +1,34 @@
+const Sequelize = require('sequelize');
+const { sequelize } = require('./sequelize');
+
+// Model for account data with composite primary key
+exports.AccountDataModel = sequelize.define('accountData', {
+    rcAccountId: {
+        type: Sequelize.STRING,
+        primaryKey: true,
+    },
+    platformName: {
+        type: Sequelize.STRING,
+        primaryKey: true,
+    },
+    dataKey: {
+        type: Sequelize.STRING,
+        primaryKey: true,
+    },
+    data: {
+        type: Sequelize.JSON,
+    }
+});
+
+exports.getOrRefreshAccountData = async function getOrRefreshAccountData({ rcAccountId, platformName, dataKey, forceRefresh, fetchFn }) {
+    const existing = await exports.AccountDataModel.findOne({ where: { rcAccountId, platformName, dataKey } });
+    if (existing && !forceRefresh) return existing.data;
+
+    const fresh = await fetchFn();
+    if (existing) {
+        await existing.update({ data: fresh });
+    } else {
+        await exports.AccountDataModel.create({ rcAccountId, platformName, dataKey, data: fresh });
+    }
+    return fresh;
+}

package/package.json

@@ -1,69 +1,70 @@
-{
-  "name": "@app-connect/core",
-  "version": "1.7.8",
-  "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.21.2",
-    "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",
-    "body-parser": "^1.20.3",
-    "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.21.2",
-    "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.10",
+  "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",
+    "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,28 @@
 {
+    "1.7.10": {
+        "global": [
+            {
+                "type": "Fix",
+                "description": "Upon completing warm transfer, it opens contact page for a second time"
+            },
+            {
+                "type": "New",
+                "description": "RingCX RingSense call logging event support for Server-side logging"
+            }
+        ]
+    },
+    "1.7.9": {
+        "global": [
+            {
+                "type": "Better",
+                "description": "Contact match speed optimized"
+            },
+            {
+                "type": "Better",
+                "description": "Minor improvements on calldown list"
+            }
+        ]
+    },
     "1.7.8": {
         "global": [
             {

package/test/connector/registry.test.js

@@ -268,4 +268,149 @@ describe('ConnectorRegistry Interface Registration with Composition', () => {
     expect(composedConnector.getAuthType).toBeDefined();
     expect(await composedConnector.getAuthType()).toBe('apiKey');
   });
+
+  test('should set and get default manifest', () => {
+    const defaultManifest = {
+      name: 'Default CRM',
+      version: '1.0.0',
+      features: ['call_logging', 'contact_sync']
+    };
+
+    connectorRegistry.setDefaultManifest(defaultManifest);
+
+    // Get manifest with fallback should return default
+    const manifest = connectorRegistry.getManifest('nonExistentPlatform', true);
+    expect(manifest).toEqual(defaultManifest);
+  });
+
+  test('should throw error when getting manifest without fallback and platform not found', () => {
+    expect(() => {
+      connectorRegistry.getManifest('nonExistentPlatform', false);
+    }).toThrow('Manifest not found for platform: nonExistentPlatform');
+  });
+
+  test('should throw error when getting manifest with fallback but no default set', () => {
+    connectorRegistry.manifests.clear();
+    expect(() => {
+      connectorRegistry.getManifest('nonExistentPlatform', true);
+    }).toThrow('Manifest not found for platform: nonExistentPlatform');
+  });
+
+  test('should register connector with manifest', () => {
+    const mockConnector = {
+      getAuthType: () => 'apiKey',
+      createCallLog: jest.fn(),
+      updateCallLog: jest.fn()
+    };
+    const manifest = {
+      name: 'Test CRM',
+      version: '2.0.0',
+      authType: 'oauth'
+    };
+
+    connectorRegistry.registerConnector('testPlatformWithManifest', mockConnector, manifest);
+
+    const retrievedManifest = connectorRegistry.getManifest('testPlatformWithManifest');
+    expect(retrievedManifest).toEqual(manifest);
+  });
+
+  test('should set and get release notes', () => {
+    const releaseNotes = {
+      version: '1.5.0',
+      date: '2024-01-15',
+      changes: ['Bug fixes', 'New features']
+    };
+
+    connectorRegistry.setReleaseNotes(releaseNotes);
+
+    // getReleaseNotes currently returns the same object regardless of platform
+    const notes = connectorRegistry.getReleaseNotes('anyPlatform');
+    expect(notes).toEqual(releaseNotes);
+  });
+
+  test('should get registered platforms', () => {
+    const connector1 = {
+      getAuthType: () => 'apiKey',
+      createCallLog: jest.fn(),
+      updateCallLog: jest.fn()
+    };
+    const connector2 = {
+      getAuthType: () => 'oauth',
+      createCallLog: jest.fn(),
+      updateCallLog: jest.fn()
+    };
+
+    connectorRegistry.registerConnector('platform1', connector1);
+    connectorRegistry.registerConnector('platform2', connector2);
+
+    const platforms = connectorRegistry.getRegisteredPlatforms();
+    expect(platforms).toContain('platform1');
+    expect(platforms).toContain('platform2');
+    expect(platforms).toHaveLength(2);
+  });
+
+  test('should check if platform is registered', () => {
+    const mockConnector = {
+      getAuthType: () => 'apiKey',
+      createCallLog: jest.fn(),
+      updateCallLog: jest.fn()
+    };
+
+    connectorRegistry.registerConnector('registeredPlatform', mockConnector);
+
+    expect(connectorRegistry.isRegistered('registeredPlatform')).toBe(true);
+    expect(connectorRegistry.isRegistered('unregisteredPlatform')).toBe(false);
+  });
+
+  test('should throw error for original connector when not found', () => {
+    expect(() => {
+      connectorRegistry.getOriginalConnector('nonExistentPlatform');
+    }).toThrow('Connector not found for platform: nonExistentPlatform');
+  });
+
+  test('should validate connector interface with missing required methods', () => {
+    const incompleteConnector = {
+      getAuthType: () => 'apiKey',
+      createCallLog: jest.fn()
+      // Missing updateCallLog
+    };
+
+    expect(() => {
+      connectorRegistry.registerConnector('incompletePlatform', incompleteConnector);
+    }).toThrow('Connector incompletePlatform missing required method: updateCallLog');
+  });
+
+  test('should return proxy connector when platform not found but proxy exists', () => {
+    const proxyConnector = {
+      getAuthType: () => 'proxy',
+      createCallLog: jest.fn(),
+      updateCallLog: jest.fn(),
+      proxy: true
+    };
+
+    connectorRegistry.registerConnector('proxy', proxyConnector);
+
+    const connector = connectorRegistry.getConnector('unknownPlatformWithProxy');
+    expect(connector).toBe(proxyConnector);
+    expect(connector.proxy).toBe(true);
+  });
+
+  test('should handle getAuthType error in getConnectorCapabilities', async () => {
+    const mockConnector = {
+      getAuthType: jest.fn().mockRejectedValue(new Error('Auth type error')),
+      createCallLog: jest.fn(),
+      updateCallLog: jest.fn()
+    };
+
+    connectorRegistry.registerConnector('errorPlatform', mockConnector);
+
+    const capabilities = await connectorRegistry.getConnectorCapabilities('errorPlatform');
+    expect(capabilities.authType).toBe('unknown');
+  });
+
+  test('should handle unregistering non-existent interface gracefully', () => {
+    // This should not throw
+    connectorRegistry.unregisterConnectorInterface('nonExistentPlatform', 'nonExistentInterface');
+    expect(connectorRegistry.hasPlatformInterface('nonExistentPlatform', 'nonExistentInterface')).toBe(false);
+  });
 });