@app-connect/core 1.7.19 → 1.7.21

package/handlers/auth.js

@@ -7,7 +7,7 @@ const adminCore = require('./admin');
 const { Connector } = require('../models/dynamo/connectorSchema');
 const { handleDatabaseError } = require('../lib/errorHandler');
 
-async function onOAuthCallback({ platform, hostname, tokenUrl, query, isFromMCP = false }) {
+async function onOAuthCallback({ platform, hostname, tokenUrl, query, hashedRcExtensionId, isFromMCP = false }) {
     const callbackUri = query.callbackUri;
     const apiUrl = query.apiUrl;
     const username = query.username;
@@ -54,6 +54,7 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, isFromMCP
                 refreshToken,
                 tokenExpiry: isNaN(expires) ? null : expires,
                 rcAccountId: query?.rcAccountId,
+                hashedRcExtensionId,
                 proxyId
             });
         }
@@ -76,7 +77,7 @@ async function onOAuthCallback({ platform, hostname, tokenUrl, query, isFromMCP
     }
 }
 
-async function onApiKeyLogin({ platform, hostname, apiKey, proxyId, additionalInfo }) {
+async function onApiKeyLogin({ platform, hostname, apiKey, proxyId, rcAccountId, hashedRcExtensionId, additionalInfo }) {
     const platformModule = connectorRegistry.getConnector(platform);
     const basicAuth = platformModule.getBasicAuth({ apiKey });
     const { successful, platformUserInfo, returnMessage } = await platformModule.getUserInfo({ authHeader: `Basic ${basicAuth}`, hostname, platform, additionalInfo, apiKey, proxyId });
@@ -88,6 +89,8 @@ async function onApiKeyLogin({ platform, hostname, apiKey, proxyId, additionalIn
                 platform,
                 hostname,
                 proxyId,
+                hashedRcExtensionId,
+                rcAccountId,
                 accessToken: platformUserInfo.overridingApiKey ?? apiKey
             });
         }
@@ -110,7 +113,7 @@ async function onApiKeyLogin({ platform, hostname, apiKey, proxyId, additionalIn
     }
 }
 
-async function saveUserInfo({ platformUserInfo, platform, hostname, accessToken, refreshToken, tokenExpiry, rcAccountId, proxyId }) {
+async function saveUserInfo({ platformUserInfo, platform, hostname, accessToken, refreshToken, tokenExpiry, rcAccountId, hashedRcExtensionId, proxyId }) {
     const id = platformUserInfo.id;
     const name = platformUserInfo.name;
     const existingUser = await UserModel.findByPk(id);
@@ -130,6 +133,7 @@ async function saveUserInfo({ platformUserInfo, platform, hostname, accessToken,
                     refreshToken,
                     tokenExpiry,
                     rcAccountId,
+                    hashedRcExtensionId,
                     platformAdditionalInfo: {
                         ...existingUser.platformAdditionalInfo, // keep existing platformAdditionalInfo
                         ...platformAdditionalInfo,
@@ -143,57 +147,20 @@ async function saveUserInfo({ platformUserInfo, platform, hostname, accessToken,
     }
     else {
         try {
-            // TEMP: replace user with old ID
-            if (id.endsWith(`-${platform}`)) {
-                const oldID = id.split('-');
-                const userWithOldID = await UserModel.findByPk(oldID[0]);
-                if (userWithOldID) {
-                    await UserModel.create({
-                        id,
-                        hostname,
-                        timezoneName,
-                        timezoneOffset,
-                        platform,
-                        accessToken,
-                        refreshToken,
-                        tokenExpiry,
-                        rcAccountId,
-                        platformAdditionalInfo,
-                        userSettings: userWithOldID.userSettings
-                    });
-                    await userWithOldID.destroy();
-                }
-                else {
-                    await UserModel.create({
-                        id,
-                        hostname,
-                        timezoneName,
-                        timezoneOffset,
-                        platform,
-                        accessToken,
-                        refreshToken,
-                        tokenExpiry,
-                        rcAccountId,
-                        platformAdditionalInfo,
-                        userSettings: {}
-                    });
-                }
-            }
-            else {
-                await UserModel.create({
-                    id,
-                    hostname,
-                    timezoneName,
-                    timezoneOffset,
-                    platform,
-                    accessToken,
-                    refreshToken,
-                    tokenExpiry,
-                    rcAccountId,
-                    platformAdditionalInfo,
-                    userSettings: {}
-                });
-            }
+            await UserModel.create({
+                id,
+                hostname,
+                timezoneName,
+                timezoneOffset,
+                platform,
+                accessToken,
+                refreshToken,
+                tokenExpiry,
+                rcAccountId,
+                hashedRcExtensionId,
+                platformAdditionalInfo,
+                userSettings: {}
+            });
         }
         catch (error) {
             return handleDatabaseError(error, 'Error saving user info');
@@ -206,8 +173,16 @@ async function saveUserInfo({ platformUserInfo, platform, hostname, accessToken,
 }
 
 async function getLicenseStatus({ userId, platform }) {
+    const user = await UserModel.findByPk(userId);
+    if (!user) {
+        return {
+            isLicenseValid: false,
+            licenseStatus: 'Invalid (User not found)',
+            licenseStatusDescription: ''
+        }
+    }
     const platformModule = connectorRegistry.getConnector(platform);
-    const licenseStatus = await platformModule.getLicenseStatus({ userId, platform });
+    const licenseStatus = await platformModule.getLicenseStatus({ userId, platform, user });
     return licenseStatus;
 }
 

package/handlers/contact.js

@@ -80,7 +80,8 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
         const { successful, matchedContactInfo, returnMessage, extraDataTracking } = await platformModule.findContact({ user, authHeader, phoneNumber, overridingFormat, isExtension, proxyConfig, tracer, isForceRefreshAccountData });
         tracer?.trace('handler.findContact:platformFindResult', { successful, matchedContactInfo });
 
-        if (matchedContactInfo != null && matchedContactInfo?.filter(c => !c.isNewContact)?.length > 0) {
+        const matchedNonNewContacts = matchedContactInfo?.filter(c => !c.isNewContact) ?? [];
+        if (matchedContactInfo != null && matchedNonNewContacts.length > 0) {
             tracer?.trace('handler.findContact:contactsFound', { count: matchedContactInfo.length });
             // save in org data
             // Danger: it does NOT support one RC account mapping to multiple CRM platforms, because contacts will be shared
@@ -104,6 +105,10 @@ async function findContact({ platform, userId, phoneNumber, overridingFormat, is
         }
         else {
             tracer?.trace('handler.findContact:noContactsMatched', { matchedContactInfo });
+            if (isForceRefreshAccountData && existingMatchedContactInfo) {
+                await existingMatchedContactInfo.destroy();
+                tracer?.trace('handler.findContact:staleCacheRemoved', { phoneNumber });
+            }
             if (returnMessage) {
                 return {
                     successful,
@@ -272,4 +277,4 @@ async function findContactWithName({ platform, userId, name }) {
 
 exports.findContact = findContact;
 exports.createContact = createContact;
-exports.findContactWithName = findContactWithName;
+exports.findContactWithName = findContactWithName;

package/handlers/log.js

@@ -129,11 +129,11 @@ async function createCallLog({ jwtToken, platform, userId, incomingData, hashedA
             let pluginDataResponse = null;
             switch (pluginSetting.value.access) {
                 case 'public':
-                    pluginDataResponse = await axios.get(`${process.env.DEV_PORTAL_URL}/public-api/connectors/${pluginId}/manifest?type=plugin`);
+                    pluginDataResponse = await axios.get(`https://appconnect.labs.ringcentral.com/public-api/connectors/${pluginId}/manifest?type=plugin`);
                     break;
                 case 'private':
                 case 'shared':
-                    pluginDataResponse = await axios.get(`${process.env.DEV_PORTAL_URL}/public-api/connectors/${pluginId}/manifest?access=internal&type=connector&accountId=${user.rcAccountId}`);
+                    pluginDataResponse = await axios.get(`https://appconnect.labs.ringcentral.com/public-api/connectors/${pluginId}/manifest?access=internal&type=connector&accountId=${user.rcAccountId}`);
                     break;
                 default:
                     throw new Error('Invalid plugin access');
@@ -174,6 +174,7 @@ async function createCallLog({ jwtToken, platform, userId, incomingData, hashedA
                 });
                 // eslint-disable-next-line no-param-reassign
                 incomingData = processedResultResponse.data;
+                note = incomingData.note;
             }
         }
 

package/index.js

@@ -3,6 +3,7 @@ const cors = require('cors')
 const bodyParser = require('body-parser');
 require('body-parser-xml')(bodyParser);
 const dynamoose = require('dynamoose');
+const Sequelize = require('sequelize');
 const { DynamoDB } = require('@aws-sdk/client-dynamodb');
 const axios = require('axios');
 const { UserModel } = require('./models/userModel');
@@ -40,7 +41,7 @@ try {
     packageJson = require('./package.json');
 }
 catch (e) {
-    logger.error('Error loading package.json', { stack: e.stack }); 
+    logger.error('Error loading package.json', { stack: e.stack });
     packageJson = require('../package.json');
 }
 
@@ -73,6 +74,20 @@ async function initDB() {
         await CacheModel.sync();
         await CallDownListModel.sync();
         await AccountDataModel.sync();
+
+        // if UserModel doesn't have hashedRcExtensionId column, add it
+        const queryInterface = UserModel.sequelize.getQueryInterface();
+        const userTableName = UserModel.getTableName();
+        const userTableSchema = await queryInterface.describeTable(userTableName);
+        if (!userTableSchema.hashedRcExtensionId) {
+            logger.info('adding hashedRcExtensionId column to users table...');
+            await queryInterface.addColumn(userTableName, 'hashedRcExtensionId', {
+                type: Sequelize.STRING,
+                allowNull: true,
+            });
+            await UserModel.sync();
+            logger.info('hashedRcExtensionId column added to users table');
+        }
     }
 }
 
@@ -870,6 +885,7 @@ function createCoreRouter() {
                 tokenUrl,
                 query: req.query,
                 proxyId: req.query.proxyId,
+                hashedRcExtensionId: hashedExtensionId,
                 isFromMCP
             });
             if (userInfo) {
@@ -951,12 +967,7 @@ function createCoreRouter() {
                 res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
                 return;
             }
-            if (!apiKey) {
-                tracer?.trace('apiKeyLogin:missingApiKey', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing api key') : 'Missing api key');
-                return;
-            }
-            const { userInfo, returnMessage } = await authCore.onApiKeyLogin({ platform, hostname, apiKey, proxyId, additionalInfo });
+            const { userInfo, returnMessage } = await authCore.onApiKeyLogin({ platform, hostname, apiKey, proxyId, rcAccountId: req.body.rcAccountId, hashedRcExtensionId: hashedExtensionId, additionalInfo });
             if (userInfo) {
                 const jwtToken = jwt.generateJwt({
                     id: userInfo.id.toString(),
@@ -1341,7 +1352,7 @@ function createCoreRouter() {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, logId, returnMessage, pluginAsyncTaskIds }) : { successful, logId, returnMessage, pluginAsyncTaskIds });
+                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, logId, returnMessage, pluginAsyncTaskIds }) : { successful, logId, returnMessage, pluginAsyncTaskIds });
                     success = true;
                 }
             }

package/mcp/README.md

@@ -60,7 +60,7 @@ A stateless, hand-rolled JSON-RPC handler — no `@modelcontextprotocol/sdk`, no
 - Defines `inputSchema` (JSON Schema) for every tool that takes parameters — required so ChatGPT forwards arguments
 - Injects `rcAccessToken`, `openaiSessionId`, and `rcExtensionId` into every `tools/call` request
 - Verifies the RC access token against the RC API and caches `rcExtensionId` in `CacheModel` keyed by `openaiSessionId` (24h TTL) — subsequent requests hit the cache instead of the RC API
-- Automatically looks up and injects `jwtToken` from `LlmSessionModel` using `rcExtensionId` (or `openaiSessionId` as a fallback)
+- Automatically looks up and injects `jwtToken` from `LlmSessionModel` using `rcExtensionId` (or `openaiSessionId` as a fallback), only when the linked `User` row still has a CRM `accessToken`
 - Stamps `WIDGET_URI` into `getPublicConnectors`'s `_meta['openai/outputTemplate']` at response time
 - Serves the widget HTML via `resources/read`
 - Exposes `handleWidgetToolCall` which searches both `tools.tools` and `tools.widgetTools`
@@ -116,7 +116,9 @@ Tools are split into two registries in `tools/index.js`:
 | `rcExtensionId` | RC API (`/extension/~`), verified once and cached in `sessionContext` | Cryptographically verified RC identity; used as `LlmSessionModel` key |
 | `jwtToken` | `LlmSessionModel.findByPk(rcExtensionId)` (fallback: `findByPk(openaiSessionId)`) | CRM auth token (after OAuth) |
 
-Tools do **not** need ChatGPT to pass `jwtToken` explicitly — it is resolved from the session automatically. The `rcExtensionId` is verified via the RC API on the **first tool call** of each session and cached for all subsequent calls within the same conversation (0 additional API calls after that).
+Tools do **not** need ChatGPT to pass `jwtToken` explicitly — it is resolved from the session automatically. The `rcExtensionId` is verified via the RC API on the **first tool call** of each session and cached for all subsequent calls within the same conversation (0 additional API calls after that). If the user has logged out or the CRM token was cleared, `jwtToken` is not injected even when a stale row exists in `LlmSessionModel`.
+
+New or refreshed LLM session JWTs are written only when the user record has an `accessToken`, so disconnected users are not issued a new tool JWT.
 
 Note: `widgetTools` are called via `POST /mcp/widget-tool-call` which bypasses the MCP session layer entirely. No server-side injection occurs for widget tool calls — all required values must be passed explicitly by the widget in the request body.
 
@@ -149,6 +151,7 @@ Logs out user from the CRM platform.
 | Destructive | Yes |
 | Parameters | `jwtToken` (optional — injected from session if not passed) |
 | Action | Clears user credentials |
+| Note | Local session cleanup always runs. Failures from the connector `unAuthorize` call are logged; the tool still returns success so the client can clear context. |
 
 #### Contact & Call Log Tools
 

package/mcp/mcpHandler.js

@@ -10,6 +10,9 @@ const axios = require('axios');
 const tools = require('./tools');
 const { LlmSessionModel } = require('../models/llmSessionModel');
 const { CacheModel } = require('../models/cacheModel');
+const { UserModel } = require('../models/userModel');
+const { getHashValue } = require('../lib/util');
+const jwt = require('../lib/jwt');
 const logger = require('../lib/logger');
 const fs = require('fs');
 const path = require('path');
@@ -18,7 +21,7 @@ const path = require('path');
  * Increment this to bust ChatGPT's widget resource cache after every UI build.
  * This is the single source of truth — injected into getPublicConnectors _meta at response time.
  */
-const WIDGET_VERSION = 6;
+const WIDGET_VERSION = 10;
 const WIDGET_URI = `ui://widget/ConnectorList-v${WIDGET_VERSION}.html`;
 
 const JSON_RPC_INTERNAL_ERROR = -32603;
@@ -206,8 +209,30 @@ async function handleMcpRequest(req, res) {
                                 await LlmSessionModel.upsert({ id: rcExtensionId, jwtToken: fallback.jwtToken });
                                 llmSession = fallback;
                             }
+                            else {
+                                const hashedRcExtensionId = getHashValue(rcExtensionId, process.env.HASH_KEY);
+                                const user = await UserModel.findOne({ where: { hashedRcExtensionId } });
+                                if (user?.accessToken) {
+                                    await LlmSessionModel.upsert({
+                                        id: rcExtensionId,
+                                        jwtToken: jwt.generateJwt({
+                                            id: user.id.toString(),
+                                            platform: user.platform
+                                        }),
+                                    });
+                                    llmSession = await LlmSessionModel.findByPk(rcExtensionId);
+                                }
+                            }
+                        }
+                        if (llmSession?.jwtToken) {
+                            const { id: userId } = jwt.decodeJwt(llmSession.jwtToken);
+                            if (userId) {
+                                const user = await UserModel.findByPk(userId);
+                                if (user?.accessToken) {
+                                    toolArgs.jwtToken = llmSession.jwtToken;
+                                }
+                            }
                         }
-                        if (llmSession?.jwtToken) toolArgs.jwtToken = llmSession.jwtToken;
                     }
                 }
 

package/mcp/tools/checkAuthStatus.js

@@ -9,7 +9,7 @@ const { LlmSessionModel } = require('../../models/llmSessionModel');
 
 const toolDefinition = {
     name: 'checkAuthStatus',
-    description: 'Auth flow step.5. Check the status of an ongoing OAuth authentication session. Poll this after user clicks the auth link.',
+    description: 'Check the status of an ongoing OAuth authentication session. Poll this after user clicks the auth link.',
     inputSchema: {
         type: 'object',
         properties: {

package/mcp/tools/getPublicConnectors.js

@@ -1,4 +1,6 @@
 const axios = require('axios');
+const { UserModel } = require('../../models/userModel');
+const { getHashValue } = require('../../lib/util');
 
 /**
  * MCP Tool: Get Public Connectors
@@ -52,14 +54,30 @@ async function execute({ rcAccessToken, openaiSessionId } = {}) {
         }
     }
 
-    return {
-        structuredContent: {
-            serverUrl: process.env.APP_SERVER || 'https://localhost:6066',
-            rcExtensionId,
-            rcAccountId,
-            openaiSessionId: openaiSessionId ?? null,
+    // Check if user session already exists from Chrome extension
+    const hashedRcExtensionId = getHashValue(rcExtensionId, process.env.HASH_KEY);
+    const user = await UserModel.findOne({ where: { hashedRcExtensionId } });
+    // Case: user exists, return user info in plain message
+    if (user?.accessToken) {
+        return {
+            structuredContent: {
+                error: true,
+                errorMessage: `You are already connected to ${user.platform}. It's controlled from App Connect Chrome extension.`
+            }
         }
-    };
+    }
+    else {
+        // Case: user doesn't exist, return structured content for widget
+        return {
+            structuredContent: {
+                serverUrl: process.env.APP_SERVER || 'https://localhost:6066',
+                rcExtensionId,
+                rcAccountId,
+                openaiSessionId: openaiSessionId ?? null,
+            }
+        };
+    }
+
 }
 
 exports.definition = toolDefinition;

package/mcp/tools/logout.js

@@ -1,5 +1,6 @@
 const jwt = require('../../lib/jwt');
 const { UserModel } = require('../../models/userModel');
+const { LlmSessionModel } = require('../../models/llmSessionModel');
 const connectorRegistry = require('../../connector/registry');
 
 /**
@@ -22,6 +23,13 @@ const toolDefinition = {
     }
 };
 
+function isMissingSessionTableError(error) {
+    const message = error?.message || '';
+    return message.includes('no such table: llmSessions')
+        || message.includes('relation "llmSessions" does not exist')
+        || message.includes("relation 'llmSessions' does not exist");
+}
+
 /**
  * Execute the logout tool
  * @param {Object} args - The tool arguments
@@ -31,8 +39,19 @@ const toolDefinition = {
 async function execute(args) {
     try {
         const { jwtToken } = args;
-        const { platform, id } = jwt.decodeJwt(jwtToken);
-
+        const session = jwt.decodeJwt(jwtToken);
+        if (!session?.platform || !session?.id) {
+            throw new Error('Invalid JWT token');
+        }
+        const { platform, id } = session;
+        try {
+            await LlmSessionModel.destroy({ where: { id } });
+        }
+        catch (error) {
+            if (!isMissingSessionTableError(error)) {
+                throw error;
+            }
+        }
         const userToLogout = await UserModel.findByPk(id);
         if (!userToLogout) {
             return {
@@ -42,7 +61,12 @@ async function execute(args) {
             };
         }
         const platformModule = connectorRegistry.getConnector(platform);
-        await platformModule.unAuthorize({ user: userToLogout });
+        try {
+            await platformModule.unAuthorize({ user: userToLogout });
+        }
+        catch (error) {
+            console.log(error);
+        }
         return {
             success: true,
             data: {
@@ -60,4 +84,4 @@ async function execute(args) {
 }
 
 exports.definition = toolDefinition;
-exports.execute = execute;
+exports.execute = execute;

package/mcp/ui/App/App.tsx

@@ -6,7 +6,6 @@ import { AuthSuccess } from './components/AuthSuccess'
 import { setServerUrl } from './lib/callTool'
 import { fetchConnectors, fetchManifest } from './lib/developerPortal'
 import { dbg } from './lib/debugLog'
-import { DebugPanel } from './components/DebugPanel'
 
 // Initial structuredContent from getPublicConnectors — serverUrl, rcAccountId, rcExtensionId, openaiSessionId
 interface ToolOutput {
@@ -267,10 +266,9 @@ export function App() {
   if (data.error) {
     return (
       <div className="p-4">
-        <div className="rounded-lg border border-red-200 bg-red-50 p-4">
-          <p className="text-red-700">{data.errorMessage || 'An error occurred'}</p>
+        <div className="rounded-lg border border-yellow-200 bg-yellow-50 p-4">
+          <p className="text-yellow-800">{data.errorMessage || 'An error occurred'}</p>
         </div>
-        <DebugPanel />
       </div>
     )
   }
@@ -353,7 +351,6 @@ export function App() {
           >
             &larr; Back to connector list
           </button>
-          <DebugPanel />
         </div>
       )}
     </div>