@app-connect/core 1.7.24 → 1.7.25

package/connector/developerPortal.js

@@ -12,21 +12,11 @@ async function getPublicConnectorList() {
     }
 }
 
-async function getPrivateConnectorList() {
-    try {
-        const response = await axios.get(`https://appconnect.labs.ringcentral.com/public-api/connectors/internal?accountId=${process.env.RC_ACCOUNT_ID}`);
-        return response.data;
-    } catch (error) {
-        logger.error('Error getting private connector list:', error);
-        return null;
-    }
-}
-
-async function getConnectorManifest({ connectorId, isPrivate = false }) {
+async function getConnectorManifest({ rcAccountId, connectorId, isPrivate = false }) {
     try {
         let response = null;
         if (isPrivate) {
-            response = await axios.get(`https://appconnect.labs.ringcentral.com/public-api/connectors/${connectorId}/manifest?access=internal&type=connector&accountId=${process.env.RC_ACCOUNT_ID}`);
+            response = await axios.get(`https://appconnect.labs.ringcentral.com/public-api/connectors/${connectorId}/manifest?access=internal&type=connector&accountId=${rcAccountId}`);
         }
         else {
             response = await axios.get(`https://appconnect.labs.ringcentral.com/public-api/connectors/${connectorId}/manifest`);
@@ -39,5 +29,4 @@ async function getConnectorManifest({ connectorId, isPrivate = false }) {
 }
 
 exports.getPublicConnectorList = getPublicConnectorList;
-exports.getPrivateConnectorList = getPrivateConnectorList;
 exports.getConnectorManifest = getConnectorManifest;

package/connector/proxy/engine.js

@@ -79,9 +79,10 @@ function buildHeaders({ config, operation, authHeader, context }) {
 async function performRequest({ config, opName, inputs, user, authHeader }) {
   const op = config.operations?.[opName];
   if (!op) return null;
+  const accessToken = user?.accessToken ?? inputs?.apiKey ?? '';
   const context = Object.assign({}, inputs, {
     user: user ? {
-      accessToken: user.accessToken,
+      accessToken,
       id: user.id?.split('-')[0],
       hostname: user.hostname,
       timezoneName: user.timezoneName,
@@ -91,10 +92,10 @@ async function performRequest({ config, opName, inputs, user, authHeader }) {
       refreshToken: user.refreshToken,
       tokenExpiry: user.tokenExpiry,
     } : {
-      accessToken: '',
+      accessToken,
     },
     authHeader,
-    apiKey: user?.accessToken,
+    apiKey: accessToken,
     secretKey: config.secretKey,
   });
   const url = joinUrl(config.requestDefaults?.baseUrl, renderTemplateString(op.url, context));

package/docs/connectors.md

@@ -61,7 +61,6 @@ The proxy connector makes integrations configurable through stored connector met
 Exports:
 
 - `getPublicConnectorList()`
-- `getPrivateConnectorList()`
 - `getConnectorManifest()`
 
 These functions are small fetch helpers and return `null` on failure after logging.

package/handlers/auth.js

@@ -90,7 +90,7 @@ async function onApiKeyLogin({ platform, hostname, apiKey, proxyId, rcAccountId,
     let resolvedApiKey = apiKey;
     let managedFieldDefinitions = [];
     if (rcAccountId) {
-        managedFieldDefinitions = await managedAuthCore.getManagedFieldDefinitions({ platform, connectorId, isPrivate });
+        managedFieldDefinitions = await managedAuthCore.getManagedFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate });
         const shouldFallbackToManualAuth = managedFieldDefinitions.length > 0
             && await managedAuthCore.hasManagedAuthLoginFailure({ rcAccountId, platform, rcExtensionId });
         const managedAuthResult = await managedAuthCore.resolveApiKeyLoginFields({

package/handlers/managedAuth.js

@@ -20,12 +20,12 @@ function isFilled(value) {
     return value !== undefined && value !== null && value !== '';
 }
 
-async function getApiKeyFieldDefinitions({ platform, connectorId, isPrivate = false }) {
+async function getApiKeyFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate = false }) {
     if (!platform) {
         return [];
     }
     if (connectorId) {
-        const manifest = await developerPortal.getConnectorManifest({ connectorId, isPrivate });
+        const manifest = await developerPortal.getConnectorManifest({ rcAccountId, connectorId, isPrivate });
         if (manifest?.platforms?.[platform]?.auth?.apiKey?.page?.content) {
             return manifest.platforms[platform].auth.apiKey.page.content;
         }
@@ -39,8 +39,8 @@ async function getApiKeyFieldDefinitions({ platform, connectorId, isPrivate = fa
     }
 }
 
-async function getManagedFieldDefinitions({ platform, connectorId, isPrivate = false }) {
-    const fieldDefinitions = await getApiKeyFieldDefinitions({ platform, connectorId, isPrivate });
+async function getManagedFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate = false }) {
+    const fieldDefinitions = await getApiKeyFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate });
     return fieldDefinitions.filter(field => field?.managed);
 }
 
@@ -247,7 +247,7 @@ function getStoredFieldValue({ value }) {
 }
 
 async function getManagedAuthAdminSettings({ platform, rcAccountId, connectorId, isPrivate = false }) {
-    const fieldDefinitions = await getManagedFieldDefinitions({ platform, connectorId, isPrivate });
+    const fieldDefinitions = await getManagedFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate });
     const orgFieldDefinitions = fieldDefinitions.filter(field => field.managedScope === 'account');
     const userFieldDefinitions = fieldDefinitions.filter(field => field.managedScope === 'user');
     const orgValues = await getOrgManagedAuthValues({ rcAccountId, platform });
@@ -307,7 +307,7 @@ async function getManagedAuthAdminSettings({ platform, rcAccountId, connectorId,
 }
 
 async function getManagedAuthState({ platform, rcAccountId, rcExtensionId, connectorId, isPrivate = false }) {
-    const fieldDefinitions = await getApiKeyFieldDefinitions({ platform, connectorId, isPrivate });
+    const fieldDefinitions = await getApiKeyFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate });
     const managedFieldDefinitions = fieldDefinitions.filter(field => field?.managed);
     const orgValues = await getOrgManagedAuthValues({ rcAccountId, platform });
     const userValues = await getUserManagedAuthValues({ rcAccountId, platform, rcExtensionId });
@@ -367,7 +367,7 @@ async function getManagedAuthState({ platform, rcAccountId, rcExtensionId, conne
 }
 
 async function resolveApiKeyLoginFields({ platform, rcAccountId, rcExtensionId, connectorId, isPrivate = false, apiKey, additionalInfo = {}, preferSubmittedValuesForManagedFields = false }) {
-    const fieldDefinitions = await getApiKeyFieldDefinitions({ platform, connectorId, isPrivate });
+    const fieldDefinitions = await getApiKeyFieldDefinitions({ rcAccountId, platform, connectorId, isPrivate });
     const resolvedAdditionalInfo = {
         ...(additionalInfo ?? {})
     };

package/index.js

@@ -1178,13 +1178,13 @@ function createCoreRouter() {
                 res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
                 return;
             }
-            if (!rcAccessToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing RingCentral access token') : 'Missing RingCentral access token');
-                return;
+            let rcAccountId = null;
+            let rcExtensionId = null;
+            if (rcAccessToken) {
+                const rcUserTokenResult = await adminCore.validateRcUserToken({ rcAccessToken });
+                rcAccountId = rcUserTokenResult.rcAccountId;
+                rcExtensionId = rcUserTokenResult.rcExtensionId;
             }
-            const rcUserTokenResult = await adminCore.validateRcUserToken({ rcAccessToken });
-            const rcAccountId = rcUserTokenResult.rcAccountId;
-            const rcExtensionId = rcUserTokenResult.rcExtensionId;
             const { userInfo, returnMessage } = await authCore.onApiKeyLogin({
                 platform,
                 hostname,

package/package.json

@@ -1,72 +1,72 @@
-{
-  "name": "@app-connect/core",
-  "version": "1.7.24",
-  "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.26.0",
-    "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.25",
+  "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.26.0",
+    "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,10 +1,18 @@
 {
+    "1.7.25": {
+        "global": [
+            {
+                "type": "Fix",
+                "description": "Click-to-dial render issue"
+            }
+        ]
+    },
     "1.7.24": {
         "global": [
             {
                 "type": "New",
                 "description": "Click-to-dial number matcher selection in User Setting -> General"
-            },  
+            },
             {
                 "type": "Fix",
                 "description": "Error report upload"

package/test/connector/proxy/engine.test.js

@@ -88,6 +88,39 @@ describe('proxy engine utilities', () => {
     // Basic base64('token-123')
     expect(args.headers.Authorization).toMatch(/^Basic /);
   });
+
+  test('performRequest uses submitted apiKey during first login before user is saved', async () => {
+    axios.mockResolvedValue({ data: { ok: true } });
+    const config = {
+      auth: {
+        type: 'apiKey',
+        scheme: 'Basic',
+        credentialTemplate: '{{apiKey}}',
+        encode: 'base64',
+        headerName: 'Authorization'
+      },
+      requestDefaults: {
+        baseUrl: 'https://api.example.com'
+      },
+      operations: {
+        getUserInfo: {
+          method: 'GET',
+          url: '/authentication'
+        }
+      }
+    };
+
+    await performRequest({
+      config,
+      opName: 'getUserInfo',
+      inputs: { apiKey: 'login-key' },
+      user: {},
+      authHeader: undefined
+    });
+
+    const args = axios.mock.calls[0][0];
+    expect(args.headers.Authorization).toBe(`Basic ${Buffer.from('login-key').toString('base64')}`);
+  });
 });
 
 

package/test/handlers/auth.test.js

@@ -24,6 +24,7 @@ const { RingCentral } = require('../../lib/ringcentral');
 const adminCore = require('../../handlers/admin');
 const { AccountDataModel } = require('../../models/accountDataModel');
 const { encode } = require('../../lib/encode');
+const { getHashValue } = require('../../lib/util');
 
 describe('Auth Handler', () => {
   const originalEnv = process.env;
@@ -964,6 +965,8 @@ describe('Auth Handler', () => {
 
     test('should handle successful RingCentral OAuth callback', async () => {
       // Arrange
+      process.env.HASH_KEY = 'test-hash-key';
+      const rcAccountId = 'rc-account-id';
       const mockGenerateToken = jest.fn().mockResolvedValue({
         access_token: 'rc-access-token',
         refresh_token: 'rc-refresh-token',
@@ -977,7 +980,7 @@ describe('Auth Handler', () => {
       // Act
       await authHandler.onRingcentralOAuthCallback({
         code: 'rc-auth-code',
-        rcAccountId: 'hashed-rc-account-id'
+        rcAccountId
       });
 
       // Assert
@@ -989,7 +992,7 @@ describe('Auth Handler', () => {
       });
       expect(mockGenerateToken).toHaveBeenCalledWith({ code: 'rc-auth-code' });
       expect(adminCore.updateAdminRcTokens).toHaveBeenCalledWith({
-        hashedRcAccountId: 'hashed-rc-account-id',
+        hashedRcAccountId: getHashValue(rcAccountId, 'test-hash-key'),
         adminAccessToken: 'rc-access-token',
         adminRefreshToken: 'rc-refresh-token',
         adminTokenExpiry: expect.any(Number)

package/test/handlers/managedAuth.test.js

@@ -180,7 +180,7 @@ describe('Managed Auth Handler', () => {
       rcAccountId: 'acc-3'
     });
 
-    expect(developerPortal.getConnectorManifest).toHaveBeenCalledWith({ connectorId: 'connector-123', isPrivate: false });
+    expect(developerPortal.getConnectorManifest).toHaveBeenCalledWith({ rcAccountId: 'acc-3', connectorId: 'connector-123', isPrivate: false });
     expect(state.hasManagedAuth).toBe(true);
     expect(state.allRequiredFieldsSatisfied).toBe(true);
     expect(state.visibleFieldConsts).toEqual([]);

package/test/mcp/tools/checkAuthStatus.test.js

@@ -41,7 +41,8 @@ describe('MCP Tool: checkAuthStatus', () => {
 
     expect(LlmSessionModel.upsert).toHaveBeenCalledWith({
       id: 'rc-ext-1',
-      jwtToken: 'jwt-token'
+      jwtToken: 'jwt-token',
+      expiry: expect.any(Date)
     });
     expect(result).toEqual({
       data: {

package/test/routes/managedAuthRoutes.test.js

@@ -32,17 +32,6 @@ describe('Managed Auth Routes', () => {
   });
 
   describe('GET /apiKeyManagedAuthState', () => {
-    test('should require rcAccessToken', async () => {
-      const response = await request(app)
-        .get('/apiKeyManagedAuthState')
-        .query({ platform: 'testCRM' });
-
-      expect(response.status).toBe(400);
-      expect(response.text).toContain('Missing RingCentral access token');
-      expect(adminCore.validateRcUserToken).not.toHaveBeenCalled();
-      expect(managedAuthCore.getManagedAuthState).not.toHaveBeenCalled();
-    });
-
     test('should validate rcAccessToken and use validated identity', async () => {
       adminCore.validateRcUserToken.mockResolvedValue({
         rcAccountId: 'validated-account-id',
@@ -75,20 +64,6 @@ describe('Managed Auth Routes', () => {
   });
 
   describe('POST /apiKeyLogin', () => {
-    test('should require rcAccessToken', async () => {
-      const response = await request(app)
-        .post('/apiKeyLogin')
-        .send({
-          platform: 'testCRM',
-          apiKey: 'api-key',
-          hostname: 'test.example.com',
-        });
-
-      expect(response.status).toBe(400);
-      expect(response.text).toContain('Missing RingCentral access token');
-      expect(adminCore.validateRcUserToken).not.toHaveBeenCalled();
-      expect(authCore.onApiKeyLogin).not.toHaveBeenCalled();
-    });
 
     test('should validate rcAccessToken and ignore spoofed rc ids in body', async () => {
       adminCore.validateRcUserToken.mockResolvedValue({