@app-connect/core 1.7.37 → 1.7.38

package/{index.js → dist/index.js}

@@ -1,54 +1,58 @@
-const express = require('express');
-const cors = require('cors')
-const bodyParser = require('body-parser');
+"use strict";
+// @ts-check
+Object.defineProperty(exports, "__esModule", { value: true });
+const express = /** @type {any} */ (require('express'));
+const cors = /** @type {any} */ (require('cors'));
+const bodyParser = /** @type {any} */ (require('body-parser'));
 require('body-parser-xml')(bodyParser);
-const dynamoose = require('dynamoose');
-const { DynamoDB } = require('@aws-sdk/client-dynamodb');
-const axios = require('axios');
-const { UserModel } = require('./models/userModel');
-const { LlmSessionModel } = require('./models/llmSessionModel');
-const { CallDownListModel } = require('./models/callDownListModel');
-const { CallLogModel } = require('./models/callLogModel');
-const { MessageLogModel } = require('./models/messageLogModel');
-const { AdminConfigModel } = require('./models/adminConfigModel');
-const { CacheModel } = require('./models/cacheModel');
-const { AccountDataModel } = require('./models/accountDataModel');
-const jwt = require('./lib/jwt');
-const logCore = require('./handlers/log');
-const contactCore = require('./handlers/contact');
-const appointmentCore = require('./handlers/appointment');
-const authCore = require('./handlers/auth');
-const adminCore = require('./handlers/admin');
-const userCore = require('./handlers/user');
-const dispositionCore = require('./handlers/disposition');
-const mock = require('./connector/mock');
-const proxyConnector = require('./connector/proxy');
+const dynamoose = /** @type {any} */ (require('dynamoose'));
+const { DynamoDB } = /** @type {any} */ (require('@aws-sdk/client-dynamodb'));
+const axios = /** @type {any} */ (require('axios'));
+const { UserModel } = /** @type {any} */ (require('./models/userModel'));
+const { LlmSessionModel } = /** @type {any} */ (require('./models/llmSessionModel'));
+const { CallDownListModel } = /** @type {any} */ (require('./models/callDownListModel'));
+const { CallLogModel } = /** @type {any} */ (require('./models/callLogModel'));
+const { MessageLogModel } = /** @type {any} */ (require('./models/messageLogModel'));
+const { AdminConfigModel } = /** @type {any} */ (require('./models/adminConfigModel'));
+const { CacheModel } = /** @type {any} */ (require('./models/cacheModel'));
+const { AccountDataModel } = /** @type {any} */ (require('./models/accountDataModel'));
+const jwt = /** @type {any} */ (require('./lib/jwt'));
+const logCore = /** @type {any} */ (require('./handlers/log'));
+const contactCore = /** @type {any} */ (require('./handlers/contact'));
+const appointmentCore = /** @type {any} */ (require('./handlers/appointment'));
+const authCore = /** @type {any} */ (require('./handlers/auth'));
+const adminCore = /** @type {any} */ (require('./handlers/admin'));
+const userCore = /** @type {any} */ (require('./handlers/user'));
+const dispositionCore = /** @type {any} */ (require('./handlers/disposition'));
+const mock = /** @type {any} */ (require('./connector/mock'));
+const proxyConnector = /** @type {any} */ (require('./connector/proxy'));
 const releaseNotes = require('./releaseNotes.json');
-const analytics = require('./lib/analytics');
-const util = require('./lib/util');
-const connectorRegistry = require('./connector/registry');
-const calldown = require('./handlers/calldown');
-const mcpHandler = require('./mcp/mcpHandler');
-const logger = require('./lib/logger');
-const { DebugTracer } = require('./lib/debugTracer');
-const s3ErrorLogReport = require('./lib/s3ErrorLogReport');
-const pluginCore = require('./handlers/plugin');
-const { sequelize } = require('./models/sequelize');
-const { runCallLogsSchemaMigration } = require('./lib/migrateCallLogsSchema');
-const { handleDatabaseError } = require('./lib/errorHandler');
-const { updateAuthSession } = require('./lib/authSession');
-const managedAuthCore = require('./handlers/managedAuth');
-const managedOAuthCore = require('./handlers/managedOAuth');
-
+const analytics = /** @type {any} */ (require('./lib/analytics'));
+const util = /** @type {any} */ (require('./lib/util'));
+const connectorRegistry = /** @type {any} */ (require('./connector/registry'));
+const calldown = /** @type {any} */ (require('./handlers/calldown'));
+const mcpHandler = /** @type {any} */ (require('./mcp/mcpHandler'));
+const logger = /** @type {any} */ (require('./lib/logger'));
+const { DebugTracer } = /** @type {any} */ (require('./lib/debugTracer'));
+const s3ErrorLogReport = /** @type {any} */ (require('./lib/s3ErrorLogReport'));
+const pluginCore = /** @type {any} */ (require('./handlers/plugin'));
+const { sequelize } = /** @type {any} */ (require('./models/sequelize'));
+const { runCallLogsSchemaMigration } = /** @type {any} */ (require('./lib/migrateCallLogsSchema'));
+const { handleDatabaseError } = /** @type {any} */ (require('./lib/errorHandler'));
+const { updateAuthSession } = /** @type {any} */ (require('./lib/authSession'));
+const managedAuthCore = /** @type {any} */ (require('./handlers/managedAuth'));
+const managedOAuthCore = /** @type {any} */ (require('./handlers/managedOAuth'));
+const { MCP_OAUTH_REQUIRED_MESSAGE, MCP_OAUTH_STALE_CLIENT_MESSAGE, getMcpOAuthChallengeHeader, buildMcpOAuthError, } = /** @type {any} */ (require('./mcp/lib/oauthError'));
+/** @type {any} */
 let packageJson = null;
 try {
     packageJson = require('./package.json');
 }
 catch (e) {
     logger.error('Error loading package.json', { stack: e.stack });
-    packageJson = require('../package.json');
+    const fallbackPackageJsonPath = '../package.json';
+    packageJson = require(fallbackPackageJsonPath);
 }
-
 // For using dynamodb in local env
 // AWS SDK v3 requires a region even for local; ddb.local() omits it, so set manually.
 if (process.env.DYNAMODB_LOCALHOST) {
@@ -66,7 +70,6 @@ if (process.env.IS_PROD === 'false') {
     });
 }
 axios.defaults.headers.common['Unified-CRM-Extension-Version'] = packageJson.version;
-
 async function initDB() {
     if (!process.env.DISABLE_SYNC_DB_TABLE) {
         logger.info('creating db tables if not exist...');
@@ -80,7 +83,6 @@ async function initDB() {
         await AccountDataModel.sync();
     }
 }
-
 function getAnalyticsVariablesInReqHeaders({ headers }) {
     const hashedExtensionId = headers['rc-extension-id'];
     const hashedAccountId = headers['rc-account-id'];
@@ -95,12 +97,10 @@ function getAnalyticsVariablesInReqHeaders({ headers }) {
         userAgent,
         author,
         eventAddedVia
-    }
+    };
 }
-
 const JWT_REFRESH_THRESHOLD_SECONDS = 7 * 24 * 60 * 60; // 1 week
 const JWT_LEGACY_LONG_LIVED_THRESHOLD_SECONDS = 365 * 24 * 60 * 60; // 1 year
-
 function getBearerTokenFromRequest(req) {
     const authHeader = req.headers?.authorization || req.headers?.Authorization;
     if (!authHeader || typeof authHeader !== 'string') {
@@ -112,7 +112,49 @@ function getBearerTokenFromRequest(req) {
     }
     return token;
 }
-
+function normalizeTokenValue(value) {
+    const token = Array.isArray(value) ? value[0] : value;
+    if (typeof token !== 'string') {
+        return token || null;
+    }
+    const trimmedToken = token.trim();
+    return trimmedToken.toLowerCase().startsWith('bearer ')
+        ? trimmedToken.slice('bearer '.length).trim()
+        : trimmedToken;
+}
+function wrapDebugResponse(tracer, payload) {
+    if (tracer) {
+        return tracer.wrapResponse(payload);
+    }
+    return payload;
+}
+function getErrorResponse(e) {
+    if (e && e.message) {
+        return e.message;
+    }
+    return e;
+}
+function getRcAccessTokenFromRequest(req) {
+    return normalizeTokenValue(req.get?.('X-RC-Access-Token')
+        || req.headers?.['x-rc-access-token']
+        || req.body?.rcAccessToken
+        || req.query?.rcAccessToken);
+}
+function getFirstQueryValue(value) {
+    if (Array.isArray(value)) {
+        return value[0];
+    }
+    if (value === undefined || value === null) {
+        return undefined;
+    }
+    return value.toString();
+}
+function appendOAuthQueryParam(params, name, value) {
+    const normalizedValue = getFirstQueryValue(value);
+    if (normalizedValue) {
+        params.set(name, normalizedValue);
+    }
+}
 function normalizeJwtFromRequest(req, res, next) {
     if (req.path?.startsWith('/mcp')) {
         return next();
@@ -121,19 +163,15 @@ function normalizeJwtFromRequest(req, res, next) {
     const queryToken = req.query?.jwtToken;
     let bearerToken = originalBearerToken;
     const isQueryAuth = !originalBearerToken && !!queryToken;
-
     // Backward compatibility: promote query jwtToken to Authorization Bearer.
     if (isQueryAuth) {
         req.headers.authorization = `Bearer ${queryToken}`;
         bearerToken = queryToken;
     }
-
     const token = bearerToken;
-
     if (!token) {
         return next();
     }
-
     const decodedToken = jwt.decodeJwt(token);
     if (!decodedToken?.id) {
         req.invalidJwtToken = true;
@@ -142,10 +180,8 @@ function normalizeJwtFromRequest(req, res, next) {
         }
         return next();
     }
-
     req.jwtToken = token;
     req.jwtAuth = decodedToken;
-
     if (typeof decodedToken.exp === 'number') {
         const now = Math.floor(Date.now() / 1000);
         const timeLeft = decodedToken.exp - now;
@@ -166,12 +202,10 @@ function normalizeJwtFromRequest(req, res, next) {
     }
     return next();
 }
-
 // Create a router with all core routes
 function createCoreRouter() {
     const router = express.Router();
     router.use(normalizeJwtFromRequest);
-
     // Move all app.get, app.post, etc. to router.get, router.post, etc.
     router.get('/releaseNotes', async function (req, res) {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -186,7 +220,7 @@ function createCoreRouter() {
                 ...connectorReleaseNotes[version] ?? {}
             };
         }
-        res.json(tracer ? tracer.wrapResponse(mergedReleaseNotes ?? {}) : (mergedReleaseNotes ?? {}));
+        res.json(wrapDebugResponse(tracer, mergedReleaseNotes ?? {}));
     });
     // Obsolete
     router.get('/crmManifest', (req, res) => {
@@ -264,17 +298,17 @@ function createCoreRouter() {
                 result.getLogFormatType = !!platformModule.getLogFormatType;
                 result.refreshUserInfo = !!platformModule.refreshUserInfo;
                 result.cacheCallNote = !!process.env.USE_CACHE;
-                res.status(200).send(tracer ? tracer.wrapResponse(result) : result);
+                res.status(200).send(wrapDebugResponse(tracer, result));
             }
             else {
                 tracer?.trace('implementedInterfaces:noPlatform', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please provide platform.') : 'Please provide platform.');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please provide platform.'));
                 return;
             }
         }
         catch (e) {
             tracer?.traceError('implementedInterfaces:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.get('/licenseStatus', async (req, res) => {
@@ -284,14 +318,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('licenseStatus:invalidJwtToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Invalid JWT token') : 'Invalid JWT token');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Invalid JWT token'));
                     success = false;
                     return;
                 }
@@ -299,36 +333,28 @@ function createCoreRouter() {
                 platformName = platform;
                 if (!userId) {
                     tracer?.trace('licenseStatus:noUserId', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('No user ID') : 'No user ID');
+                    res.status(400).send(wrapDebugResponse(tracer, 'No user ID'));
                     success = true;
                 }
                 const licenseStatus = await authCore.getLicenseStatus({ userId, platform });
-                res.status(200).send(tracer ? tracer.wrapResponse(licenseStatus) : licenseStatus);
+                res.status(200).send(wrapDebugResponse(tracer, licenseStatus));
                 success = true;
             }
             else {
-                res.status(200).send(tracer ? tracer.wrapResponse({
-                    isLicenseValid: false,
-                    licenseStatus: 'Invalid (Invalid user session)',
-                    licenseStatusDescription: ''
-                }) : {
+                res.status(200).send(wrapDebugResponse(tracer, {
                     isLicenseValid: false,
                     licenseStatus: 'Invalid (Invalid user session)',
                     licenseStatusDescription: ''
-                });
+                }));
                 success = true;
             }
         }
         catch (e) {
-            res.status(200).send(tracer ? tracer.wrapResponse({
+            res.status(200).send(wrapDebugResponse(tracer, {
                 isLicenseValid: false,
                 licenseStatus: 'Invalid (Connect to get license status)',
                 licenseStatusDescription: ''
-            }) : {
-                isLicenseValid: false,
-                licenseStatus: 'Invalid (Connect to get license status)',
-                licenseStatusDescription: ''
-            });
+            }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -358,14 +384,14 @@ function createCoreRouter() {
         let validationPass = false;
         let reason = '';
         let statusCode = 200;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('authValidation:invalidJwtToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Invalid JWT token') : 'Invalid JWT token');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Invalid JWT token'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -375,11 +401,11 @@ function createCoreRouter() {
                 validationPass = successful;
                 reason = failReason;
                 statusCode = status;
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage }));
             }
             else {
                 tracer?.trace('authValidation:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -387,7 +413,7 @@ function createCoreRouter() {
             logger.error('Auth validation failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('authValidation:error', e);
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -415,13 +441,13 @@ function createCoreRouter() {
         tracer?.trace('apiKeyManagedAuthState:start', { query: req.query });
         try {
             const platform = req.query.platform;
-            const rcAccessToken = req.query.rcAccessToken;
+            const rcAccessToken = getRcAccessTokenFromRequest(req);
             if (!platform) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing platform name'));
                 return;
             }
             if (!rcAccessToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing RingCentral access token') : 'Missing RingCentral access token');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing RingCentral access token'));
                 return;
             }
             const { rcAccountId, rcExtensionId } = await adminCore.validateRcUserToken({ rcAccessToken });
@@ -432,12 +458,12 @@ function createCoreRouter() {
                 connectorId: req.query.connectorId,
                 isPrivate: req.query.isPrivate === 'true'
             });
-            res.status(200).send(tracer ? tracer.wrapResponse(managedAuthState) : managedAuthState);
+            res.status(200).send(wrapDebugResponse(tracer, managedAuthState));
         }
         catch (e) {
             logger.error('Get API key managed auth state failed', { stack: e.stack });
             tracer?.traceError('apiKeyManagedAuthState:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.get('/oauthManagedAuthState', async function (req, res) {
@@ -445,13 +471,13 @@ function createCoreRouter() {
         tracer?.trace('oauthManagedAuthState:start', { query: req.query });
         try {
             const platform = req.query.platform;
-            const rcAccessToken = req.query.rcAccessToken;
+            const rcAccessToken = getRcAccessTokenFromRequest(req);
             if (!platform) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing platform name'));
                 return;
             }
             if (!rcAccessToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing RingCentral access token') : 'Missing RingCentral access token');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing RingCentral access token'));
                 return;
             }
             const { rcAccountId } = await adminCore.validateRcUserToken({ rcAccessToken });
@@ -461,12 +487,12 @@ function createCoreRouter() {
                 rcAccountId,
                 isAdmin: !!adminValidation.isValidated
             });
-            res.status(200).send(tracer ? tracer.wrapResponse(state) : state);
+            res.status(200).send(wrapDebugResponse(tracer, state));
         }
         catch (e) {
             logger.error('Get managed OAuth state failed', { stack: e.stack });
             tracer?.traceError('oauthManagedAuthState:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     // Obsolete
@@ -479,25 +505,25 @@ function createCoreRouter() {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('setAdminSettings:start', { body: req.body });
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
             const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
             if (isValidated) {
                 await adminCore.upsertAdminSettings({ hashedRcAccountId, adminSettings: req.body.adminSettings });
-                res.status(200).send(tracer ? tracer.wrapResponse('Admin settings updated') : 'Admin settings updated');
+                res.status(200).send(wrapDebugResponse(tracer, 'Admin settings updated'));
                 success = true;
             }
             else {
                 tracer?.trace('setAdminSettings:adminValidationFailed', {});
-                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Set admin settings failed', { stack: e.stack });
             tracer?.traceError('setAdminSettings:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -520,7 +546,7 @@ function createCoreRouter() {
         tracer?.trace('getAdminSettings:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -529,43 +555,40 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getAdminSettings:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
-                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
                 const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
                 if (isValidated) {
                     const adminSettings = await adminCore.getAdminSettings({ hashedRcAccountId });
                     if (adminSettings) {
-                        res.status(200).send(tracer ? tracer.wrapResponse(adminSettings) : adminSettings);
+                        res.status(200).send(wrapDebugResponse(tracer, adminSettings));
                     }
                     else {
-                        res.status(200).send(tracer ? tracer.wrapResponse({
+                        res.status(200).send(wrapDebugResponse(tracer, {
                             customConnector: null,
                             userSettings: {}
-                        }) : {
-                            customConnector: null,
-                            userSettings: {}
-                        });
+                        }));
                     }
                     success = true;
                 }
                 else {
                     tracer?.trace('getAdminSettings:adminValidationFailed', {});
-                    res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('getAdminSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             console.log(`${e.stack}`);
             tracer?.traceError('getAdminSettings:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -588,18 +611,18 @@ function createCoreRouter() {
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (!jwtToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             const unAuthData = jwt.decodeJwt(jwtToken);
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
-                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                 return;
             }
-            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                 return;
             }
             const managedAuthSettings = await managedAuthCore.getManagedAuthAdminSettings({
@@ -608,12 +631,12 @@ function createCoreRouter() {
                 connectorId: req.query.connectorId,
                 isPrivate: req.query.isPrivate === 'true'
             });
-            res.status(200).send(tracer ? tracer.wrapResponse(managedAuthSettings) : managedAuthSettings);
+            res.status(200).send(wrapDebugResponse(tracer, managedAuthSettings));
         }
         catch (e) {
             logger.error('Get managed auth settings failed', { stack: e.stack });
             tracer?.traceError('getAdminManagedAuth:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.post('/admin/managedAuth', async function (req, res) {
@@ -622,18 +645,18 @@ function createCoreRouter() {
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (!jwtToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             const unAuthData = jwt.decodeJwt(jwtToken);
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
-                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                 return;
             }
-            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                 return;
             }
             if (req.body?.scope === 'user') {
@@ -654,12 +677,12 @@ function createCoreRouter() {
                     fieldsToRemove: req.body?.fieldsToRemove ?? []
                 });
             }
-            res.status(200).send(tracer ? tracer.wrapResponse('Shared authentication updated') : 'Shared authentication updated');
+            res.status(200).send(wrapDebugResponse(tracer, 'Shared authentication updated'));
         }
         catch (e) {
             logger.error('Set managed auth settings failed', { stack: e.stack });
             tracer?.traceError('setAdminManagedAuth:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.post('/admin/managedOAuth/cache', async function (req, res) {
@@ -671,64 +694,64 @@ function createCoreRouter() {
             }
         });
         try {
-            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                 return;
             }
             await managedOAuthCore.upsertPendingManagedOAuth({
                 rcAccountId: rcAccountId?.toString(),
                 values: req.body?.values ?? {}
             });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
         }
         catch (e) {
             logger.error('Set managed OAuth pending cache failed', { stack: e.stack });
             tracer?.traceError('setAdminManagedOAuthCache:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.delete('/admin/managedOAuth/cache', async function (req, res) {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('deleteAdminManagedOAuthCache:start', {});
         try {
-            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                 return;
             }
             await managedOAuthCore.clearPendingManagedOAuth({ rcAccountId: rcAccountId?.toString() });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
         }
         catch (e) {
             logger.error('Delete managed OAuth pending cache failed', { stack: e.stack });
             tracer?.traceError('deleteAdminManagedOAuthCache:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.delete('/admin/managedOAuth/account', async function (req, res) {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('deleteAdminManagedOAuthAccount:start', { query: req.query });
         try {
-            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+            const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                 return;
             }
             if (!req.query.platform) {
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing platform name'));
                 return;
             }
             await managedOAuthCore.resetManagedOAuth({
                 rcAccountId: rcAccountId?.toString(),
                 platform: req.query.platform
             });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
         }
         catch (e) {
             logger.error('Delete managed OAuth account failed', { stack: e.stack });
             tracer?.traceError('deleteAdminManagedOAuthAccount:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
     });
     router.post('/admin/userMapping', async function (req, res) {
@@ -737,7 +760,7 @@ function createCoreRouter() {
         tracer?.trace('getUserMapping:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -746,38 +769,38 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserMapping:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
-                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
                 const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
                 if (isValidated) {
                     const userMapping = await adminCore.getUserMapping({ user, hashedRcAccountId, rcExtensionList: req.body.rcExtensionList });
                     if (userMapping?.isRevokeUserSession) {
-                        res.status(401).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        res.status(401).send(wrapDebugResponse(tracer, userMapping));
                         success = false;
                     }
                     else {
-                        res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        res.status(200).send(wrapDebugResponse(tracer, userMapping));
                         success = true;
                     }
                 }
                 else {
                     tracer?.trace('getUserMapping:adminValidationFailed', {});
-                    res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('getUserMapping:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Get user mapping failed', { stack: e.stack });
             tracer?.traceError('getUserMapping:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -800,7 +823,7 @@ function createCoreRouter() {
         tracer?.trace('reinitializeUserMapping:start', { body: req.body });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -809,38 +832,38 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('reinitializeUserMapping:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
-                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
+                const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: getRcAccessTokenFromRequest(req) });
                 const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
                 if (isValidated) {
                     const userMapping = await adminCore.reinitializeUserMapping({ user, hashedRcAccountId, rcExtensionList: req.body.rcExtensionList });
                     if (userMapping?.isRevokeUserSession) {
-                        res.status(401).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        res.status(401).send(wrapDebugResponse(tracer, userMapping));
                         success = false;
                     }
                     else {
-                        res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
+                        res.status(200).send(wrapDebugResponse(tracer, userMapping));
                         success = true;
                     }
                 }
                 else {
                     tracer?.trace('reinitializeUserMapping:adminValidationFailed', {});
-                    res.status(403).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
+                    res.status(403).send(wrapDebugResponse(tracer, 'Admin validation failed'));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('reinitializeUserMapping:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Reinitialize user mapping failed', { stack: e.stack });
             tracer?.traceError('reinitializeUserMapping:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -866,32 +889,32 @@ function createCoreRouter() {
         const jwtToken = req.jwtToken || req.query.jwtToken;
         if (!jwtToken) {
             tracer?.trace('getServerLoggingSettings:noToken', {});
-            res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+            res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
             return;
         }
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const unAuthData = jwt.decodeJwt(jwtToken);
             if (!unAuthData?.id) {
                 tracer?.trace('getServerLoggingSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             platformName = unAuthData?.platform ?? 'Unknown';
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
                 tracer?.trace('getServerLoggingSettings:userNotFound', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                 return;
             }
             const serverLoggingSettings = await adminCore.getServerLoggingSettings({ user });
-            res.status(200).send(tracer ? tracer.wrapResponse(serverLoggingSettings) : serverLoggingSettings);
+            res.status(200).send(wrapDebugResponse(tracer, serverLoggingSettings));
             success = true;
         }
         catch (e) {
             logger.error('Get server logging settings failed', { stack: e.stack });
             tracer?.traceError('getServerLoggingSettings:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -917,37 +940,37 @@ function createCoreRouter() {
         const jwtToken = req.jwtToken || req.query.jwtToken;
         if (!jwtToken) {
             tracer?.trace('setServerLoggingSettings:noToken', {});
-            res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+            res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
             return;
         }
         if (!req.body.additionalFieldValues) {
             tracer?.trace('setServerLoggingSettings:missingAdditionalFieldValues', {});
-            res.status(400).send(tracer ? tracer.wrapResponse('Missing additionalFieldValues') : 'Missing additionalFieldValues');
+            res.status(400).send(wrapDebugResponse(tracer, 'Missing additionalFieldValues'));
             return;
         }
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const unAuthData = jwt.decodeJwt(jwtToken);
             if (!unAuthData?.id) {
                 tracer?.trace('setServerLoggingSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             platformName = unAuthData?.platform ?? 'Unknown';
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
                 tracer?.trace('setServerLoggingSettings:userNotFound', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                 return;
             }
             const { successful, returnMessage } = await adminCore.updateServerLoggingSettings({ user, additionalFieldValues: req.body.additionalFieldValues });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+            res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage }));
             success = true;
         }
         catch (e) {
             logger.error('Set server logging settings failed', { stack: e.stack });
             tracer?.traceError('setServerLoggingSettings:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: { messageType: 'warning', message: 'Server logging settings update failed', ttl: 5000 } }) : { successful: false, returnMessage: { messageType: 'warning', message: 'Server logging settings update failed', ttl: 5000 } });
+            res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: { messageType: 'warning', message: 'Server logging settings update failed', ttl: 5000 } }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -964,36 +987,35 @@ function createCoreRouter() {
             author,
             eventAddedVia
         });
-    })
+    });
     router.get('/user/preloadSettings', async function (req, res) {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('getUserSettingsByAdmin:start', { query: req.query });
         try {
-            const rcAccessToken = req.query.rcAccessToken;
+            const rcAccessToken = getRcAccessTokenFromRequest(req);
             const rcAccountId = req.query.rcAccountId;
             if (rcAccessToken || rcAccountId) {
                 const userSettings = await userCore.getUserSettingsByAdmin({ rcAccessToken, rcAccountId });
-                res.status(200).send(tracer ? tracer.wrapResponse(userSettings) : userSettings);
+                res.status(200).send(wrapDebugResponse(tracer, userSettings));
             }
             else {
                 tracer?.trace('getUserSettingsByAdmin:noRcAccessTokenOrRcAccountId', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Cannot find rc user login') : 'Cannot find rc user login');
+                res.status(400).send(wrapDebugResponse(tracer, 'Cannot find rc user login'));
             }
         }
         catch (e) {
             logger.error('Get user preload settings failed', { stack: e.stack });
             tracer?.traceError('getUserSettingsByAdmin:error', e);
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
-    }
-    );
+    });
     router.post('/user/refreshInfo', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('refreshUserInfo:start', { body: req.body });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -1001,19 +1023,19 @@ function createCoreRouter() {
                 platformName = unAuthData?.platform ?? 'Unknown';
                 const userId = unAuthData?.id;
                 const { successful, returnMessage } = await userCore.refreshUserInfo({ platform: platformName, userId, tracer });
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                 success = true;
             }
             else {
                 tracer?.trace('refreshUserInfo:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Refresh user info failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('refreshUserInfo:error', e, { platform: platformName });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -1029,14 +1051,14 @@ function createCoreRouter() {
             author,
             eventAddedVia
         });
-    })
+    });
     router.get('/user/settings', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('getUserSettings:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -1044,33 +1066,33 @@ function createCoreRouter() {
                 platformName = unAuthData?.platform ?? 'Unknown';
                 if (!unAuthData || !unAuthData?.id) {
                     tracer?.trace('getUserSettings:noToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserSettings:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
                 else {
-                    const rcAccessToken = req.query.rcAccessToken;
+                    const rcAccessToken = getRcAccessTokenFromRequest(req);
                     const rcAccountId = req.query.rcAccountId;
                     const userSettings = await userCore.getUserSettings({ user, rcAccessToken, rcAccountId });
                     success = true;
-                    res.status(200).send(tracer ? tracer.wrapResponse(userSettings) : userSettings);
+                    res.status(200).send(wrapDebugResponse(tracer, userSettings));
                 }
             }
             else {
                 success = false;
                 tracer?.trace('getUserSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
             }
         }
         catch (e) {
             logger.error('Get user settings failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('getUserSettings:error', e, { platform: platformName });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -1093,7 +1115,7 @@ function createCoreRouter() {
         tracer?.trace('setUserSettings:start', { body: req.body });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -1101,29 +1123,29 @@ function createCoreRouter() {
                 platformName = unAuthData?.platform;
                 if (!platformName) {
                     tracer?.trace('setUserSettings:unknownPlatform', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Unknown platform') : 'Unknown platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Unknown platform'));
                     return;
                 }
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('setUserSettings:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
                 const { userSettings } = await userCore.updateUserSettings({ user, userSettings: req.body.userSettings, settingKeysToRemove: req.body.settingKeysToRemove || [], platformName });
-                res.status(200).send(tracer ? tracer.wrapResponse({ userSettings }) : { userSettings });
+                res.status(200).send(wrapDebugResponse(tracer, { userSettings }));
                 success = true;
             }
             else {
                 tracer?.trace('setUserSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Set user settings failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('setUserSettings:error', e, { platform: platformName });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
         const requestEndTime = new Date().getTime();
         analytics.track({
@@ -1150,22 +1172,22 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('hostname:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
-                res.status(200).send(tracer ? tracer.wrapResponse(user.hostname) : user.hostname);
+                res.status(200).send(wrapDebugResponse(tracer, user.hostname));
             }
             else {
                 tracer?.trace('hostname:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
             }
         }
         catch (e) {
             logger.error('Get hostname failed', { stack: e.stack });
             tracer?.traceError('hostname:error', e);
-            res.status(500).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(500).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
         }
-    })
+    });
     router.get('/oauth-callback', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1173,7 +1195,7 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let sessionId = null;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             if (!req.query?.callbackUri || req.query.callbackUri === 'undefined') {
                 // case: from mcp
@@ -1183,7 +1205,7 @@ function createCoreRouter() {
                 }
                 else {
                     tracer?.trace('oauth-callback:missingCallbackUri', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Missing callbackUri') : 'Missing callbackUri');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Missing callbackUri'));
                     return;
                 }
             }
@@ -1201,7 +1223,7 @@ function createCoreRouter() {
             const tokenUrl = req.query.tokenUrl;
             if (!platformName) {
                 tracer?.trace('oauth-callback:missingPlatformName', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing platform name'));
                 return;
             }
             const hasAuthCodeInCallbackUri = req.query.callbackUri.includes('code=');
@@ -1237,12 +1259,12 @@ function createCoreRouter() {
                     success = true;
                 }
                 else {
-                    res.status(200).send(tracer ? tracer.wrapResponse({ jwtToken, name: userInfo.name, returnMessage }) : { jwtToken, name: userInfo.name, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { jwtToken, name: userInfo.name, returnMessage }));
                     success = true;
                 }
             }
             else {
-                res.status(200).send(tracer ? tracer.wrapResponse({ returnMessage }) : { returnMessage });
+                res.status(200).send(wrapDebugResponse(tracer, { returnMessage }));
                 await updateAuthSession(sessionId, {
                     status: 'failed',
                     errorMessage: returnMessage?.message || 'Authentication failed'
@@ -1253,14 +1275,13 @@ function createCoreRouter() {
         catch (e) {
             logger.error('OAuth callback failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('oauth-callback:error', e, { platform: platformName });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             if (sessionId) {
                 await updateAuthSession(sessionId, {
                     status: 'failed',
-                    errorMessage: e.message || e.toString()
+                    errorMessage: getErrorResponse(e).toString()
                 });
             }
-
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1291,7 +1312,7 @@ function createCoreRouter() {
         });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const platform = req.body.platform;
             platformName = platform;
@@ -1299,12 +1320,12 @@ function createCoreRouter() {
             const hostname = req.body.hostname;
             const proxyId = req.body.proxyId;
             const additionalInfo = req.body.additionalInfo;
-            const rcAccessToken = req.body.rcAccessToken;
+            const rcAccessToken = getRcAccessTokenFromRequest(req);
             const connectorId = req.body.connectorId;
             const isPrivate = !!req.body.isPrivate;
             if (!platform) {
                 tracer?.trace('apiKeyLogin:missingPlatform', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing platform name'));
                 return;
             }
             let rcAccountId = null;
@@ -1331,18 +1352,18 @@ function createCoreRouter() {
                     id: userInfo.id.toString(),
                     platform: platform
                 });
-                res.status(200).send(tracer ? tracer.wrapResponse({ jwtToken, name: userInfo.name, returnMessage }) : { jwtToken, name: userInfo.name, returnMessage });
+                res.status(200).send(wrapDebugResponse(tracer, { jwtToken, name: userInfo.name, returnMessage }));
                 success = true;
             }
             else {
-                res.status(400).send(tracer ? tracer.wrapResponse({ returnMessage }) : { returnMessage });
+                res.status(400).send(wrapDebugResponse(tracer, { returnMessage }));
                 success = false;
             }
         }
         catch (e) {
             logger.error('API key login failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('apiKeyLogin:error', e, { platform: platformName });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1359,14 +1380,14 @@ function createCoreRouter() {
             author,
             eventAddedVia
         });
-    })
+    });
     router.post('/unAuthorize', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('unAuthorize:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -1375,24 +1396,24 @@ function createCoreRouter() {
                 const userToLogout = await UserModel.findByPk(unAuthData?.id);
                 if (!userToLogout) {
                     tracer?.trace('unAuthorize:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
                 const platformModule = connectorRegistry.getConnector(unAuthData?.platform ?? 'Unknown');
                 const { returnMessage } = await platformModule.unAuthorize({ user: userToLogout });
-                res.status(200).send(tracer ? tracer.wrapResponse(returnMessage) : returnMessage);
+                res.status(200).send(wrapDebugResponse(tracer, returnMessage));
                 success = true;
             }
             else {
                 tracer?.trace('unAuthorize:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Unauthorize failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('unAuthorize:error', e, { platform: platformName });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1416,24 +1437,23 @@ function createCoreRouter() {
             tracer?.trace('userInfoHash:start', { query: req.query });
             const extensionId = util.getHashValue(req.query.extensionId, process.env.HASH_KEY);
             const accountId = util.getHashValue(req.query.accountId, process.env.HASH_KEY);
-            res.status(200).send(tracer ? tracer.wrapResponse({ extensionId, accountId }) : { extensionId, accountId });
+            res.status(200).send(wrapDebugResponse(tracer, { extensionId, accountId }));
         }
         catch (e) {
             logger.error('Get user info hash failed', { stack: e.stack });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('userInfoHash:error', e);
         }
-    })
+    });
     router.get('/contact', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('findContact:start', { query: req.query });
-
         let platformName = null;
         let success = false;
         let resultCount = 0;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
@@ -1441,7 +1461,7 @@ function createCoreRouter() {
                 tracer?.trace('findContact:jwtDecoded', { decodedToken });
                 if (!decodedToken) {
                     tracer?.trace('findContact:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1456,12 +1476,12 @@ function createCoreRouter() {
                     isForceRefreshAccountData: req.query?.isForceRefreshAccountData === 'true'
                 });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     tracer?.trace('findContact:result', { successful, returnMessage, contact });
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage, contact }));
                     if (successful) {
                         const nonNewContact = contact?.filter(c => !c.isNewContact) ?? [];
                         resultCount = nonNewContact.length;
@@ -1474,7 +1494,7 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('findContact:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1482,7 +1502,7 @@ function createCoreRouter() {
             logger.error('Find contact failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('findContact:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1511,25 +1531,25 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createContact:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
                 const { successful, returnMessage, contact, extraDataTracking, isRevokeUserSession } = await contactCore.createContact({ platform, userId, phoneNumber: req.body.phoneNumber, newContactName: req.body.newContactName, newContactType: req.body.newContactType, additionalSubmission: req.body.additionalSubmission });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage, contact }));
                     success = true;
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
@@ -1538,7 +1558,7 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('createContact:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1546,7 +1566,7 @@ function createCoreRouter() {
             logger.error('Create contact failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('createContact:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1567,7 +1587,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.get('/appointments', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1575,14 +1594,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const jwtToken = req.query.jwtToken;
+            const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('listAppointments:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1592,11 +1611,11 @@ function createCoreRouter() {
                 const forceSync = req.query.forceSync === 'true';
                 const { successful, appointments, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.listAppointments({ platform, userId, range, mineOnly, forceSync });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, appointments, returnMessage }) : { successful, appointments, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointments, returnMessage }));
                     success = true;
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
@@ -1609,7 +1628,7 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('listAppointments:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1617,7 +1636,7 @@ function createCoreRouter() {
             logger.error('List appointments failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('listAppointments:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1638,7 +1657,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.post('/appointments', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1646,14 +1664,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const jwtToken = req.query.jwtToken;
+            const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createAppointment:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1661,20 +1679,20 @@ function createCoreRouter() {
                 const payload = req.body?.payload ?? req.body;
                 const { successful, appointmentId, appointment, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.createAppointment({ platform, userId, payload });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, appointmentId, appointment, returnMessage }) : { successful, appointmentId, appointment, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointmentId, appointment, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('createAppointment:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1682,7 +1700,7 @@ function createCoreRouter() {
             logger.error('Create appointment failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('createAppointment:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1703,7 +1721,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.patch('/appointments/:appointmentId', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1711,14 +1728,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const jwtToken = req.query.jwtToken;
+            const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('updateAppointment:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1727,20 +1744,20 @@ function createCoreRouter() {
                 const patchBody = req.body?.patch ?? req.body;
                 const { successful, appointment, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.updateAppointment({ platform, userId, appointmentId, patchBody });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, appointmentId, appointment, returnMessage }) : { successful, appointmentId, appointment, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointmentId, appointment, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('updateAppointment:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1748,7 +1765,7 @@ function createCoreRouter() {
             logger.error('Update appointment failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('updateAppointment:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1769,7 +1786,81 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
+    router.post('/appointments/:appointmentId/status', async function (req, res) {
+        const requestStartTime = new Date().getTime();
+        const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
+        tracer?.trace('updateAppointmentStatus:start', { query: req.query, params: req.params });
+        let platformName = null;
+        let success = false;
+        let extraData = {};
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
+        try {
+            const jwtToken = req.jwtToken || req.query.jwtToken;
+            if (jwtToken) {
+                const decodedToken = jwt.decodeJwt(jwtToken);
+                if (!decodedToken) {
+                    tracer?.trace('updateAppointmentStatus:invalidToken', {});
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
+                    return;
+                }
+                const status = String(req.body?.status || '').trim().toLowerCase();
+                if (!status) {
+                    tracer?.trace('updateAppointmentStatus:noStatus', {});
+                    res.status(400).send(wrapDebugResponse(tracer, 'Appointment status is required'));
+                    return;
+                }
+                const { id: userId, platform } = decodedToken;
+                platformName = platform;
+                const appointmentId = req.params.appointmentId;
+                const { successful, appointment, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.updateAppointment({
+                    platform,
+                    userId,
+                    appointmentId,
+                    patchBody: { status }
+                });
+                if (isRevokeUserSession) {
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
+                    success = false;
+                }
+                else {
+                    if (extraDataTracking) {
+                        extraData = extraDataTracking;
+                    }
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointmentId, appointment, returnMessage }));
+                    success = true;
+                }
+            }
+            else {
+                tracer?.trace('updateAppointmentStatus:noToken', {});
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
+                success = false;
+            }
+        }
+        catch (e) {
+            logger.error('Update appointment status failed', { platform: platformName, stack: e.stack });
+            tracer?.traceError('updateAppointmentStatus:error', e, { platform: platformName });
+            extraData.statusCode = e.response?.status ?? 'unknown';
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
+            success = false;
+        }
+        const requestEndTime = new Date().getTime();
+        analytics.track({
+            eventName: 'Update appointment status',
+            interfaceName: 'updateAppointmentStatus',
+            connectorName: platformName,
+            accountId: hashedAccountId,
+            extensionId: hashedExtensionId,
+            success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            extras: {
+                ...extraData
+            },
+            eventAddedVia
+        });
+    });
     router.get('/appointments/:appointmentId/refresh', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1777,14 +1868,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const jwtToken = req.query.jwtToken;
+            const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('refreshAppointment:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1792,20 +1883,20 @@ function createCoreRouter() {
                 const appointmentId = req.params.appointmentId;
                 const { successful, appointment, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.refreshAppointment({ platform, userId, appointmentId });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, appointmentId, appointment, returnMessage }) : { successful, appointmentId, appointment, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointmentId, appointment, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('refreshAppointment:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1813,7 +1904,7 @@ function createCoreRouter() {
             logger.error('Refresh appointment failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('refreshAppointment:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1834,7 +1925,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.post('/appointments/:appointmentId/confirm', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1842,14 +1932,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const jwtToken = req.query.jwtToken;
+            const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('confirmAppointment:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1857,20 +1947,20 @@ function createCoreRouter() {
                 const appointmentId = req.params.appointmentId;
                 const { successful, appointment, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.confirmAppointment({ platform, userId, appointmentId });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, appointmentId, appointment, returnMessage }) : { successful, appointmentId, appointment, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointmentId, appointment, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('confirmAppointment:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1878,7 +1968,7 @@ function createCoreRouter() {
             logger.error('Confirm appointment failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('confirmAppointment:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1899,7 +1989,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.post('/appointments/:appointmentId/cancel', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -1907,14 +1996,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
-            const jwtToken = req.query.jwtToken;
+            const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('cancelAppointment:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1922,20 +2011,20 @@ function createCoreRouter() {
                 const appointmentId = req.params.appointmentId;
                 const { successful, appointment, returnMessage, extraDataTracking, isRevokeUserSession } = await appointmentCore.cancelAppointment({ platform, userId, appointmentId });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, appointmentId, appointment, returnMessage }) : { successful, appointmentId, appointment, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, appointmentId, appointment, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('cancelAppointment:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
@@ -1943,7 +2032,7 @@ function createCoreRouter() {
             logger.error('Cancel appointment failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('cancelAppointment:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1971,30 +2060,31 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('saveNoteCache:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
                 const { successful, returnMessage, extraDataTracking } = await logCore.saveNoteCache({ platform, userId, sessionId: req.body.sessionId, note: req.body.note });
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                 success = true;
                 if (extraDataTracking) {
                     extraData = extraDataTracking;
                 }
             }
-        } catch (e) {
+        }
+        catch (e) {
             logger.error('Save note cache failed', { platform: platformName, stack: e.stack });
             tracer?.traceError('saveNoteCache:error', e, { platform: platformName });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -2014,7 +2104,7 @@ function createCoreRouter() {
                 ...extraData
             }
         });
-    })
+    });
     router.get('/callLog', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -2022,14 +2112,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('getCallLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -2043,11 +2133,11 @@ function createCoreRouter() {
                     requireDetails: req.query.requireDetails === 'true'
                 });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, logs, returnMessage }) : { successful, logs, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, logs, returnMessage }));
                     success = true;
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
@@ -2057,14 +2147,14 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('getCallLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Get call log failed', { platform: platformName, stack: e.stack });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('getCallLog:error', e, { platform: platformName });
             success = false;
         }
@@ -2093,41 +2183,41 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createCallLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
                 const { successful, logId, returnMessage, extraDataTracking, isRevokeUserSession } = await logCore.createCallLog({ jwtToken, platform, userId, incomingData: req.body, hashedAccountId: hashedAccountId ?? util.getHashValue(req.body.logInfo?.accountId, process.env.HASH_KEY), isFromSSCL: userAgent === 'SSCL' });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, logId, returnMessage }) : { successful, logId, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, logId, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('createCallLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Create call log failed', { platform: platformName, stack: e.stack });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('createCallLog:error', e, { platform: platformName });
             success = false;
         }
@@ -2156,14 +2246,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('updateCallLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -2172,19 +2262,19 @@ function createCoreRouter() {
                 if (extraDataTracking) {
                     extraData = extraDataTracking;
                 }
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful, logId, updatedNote, returnMessage }) : { successful, logId, updatedNote, returnMessage });
+                res.status(200).send(wrapDebugResponse(tracer, { successful, logId, updatedNote, returnMessage }));
                 success = true;
             }
             else {
                 tracer?.trace('updateCallLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Update call log failed', { platform: platformName, stack: e.stack });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('updateCallLog:error', e, { platform: platformName });
             success = false;
         }
@@ -2213,21 +2303,21 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('upsertCallDisposition:invalidJwtToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Invalid JWT token') : 'Invalid JWT token');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Invalid JWT token'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
                 if (!userId) {
                     tracer?.trace('upsertCallDisposition:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { successful, returnMessage, extraDataTracking, isRevokeUserSession } = await dispositionCore.upsertCallDisposition({
@@ -2240,27 +2330,27 @@ function createCoreRouter() {
                     additionalSubmission: req.body.additionalSubmission
                 });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('upsertCallDisposition:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Upsert call disposition failed', { platform: platformName, stack: e.stack });
             extraData.statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('upsertCallDisposition:error', e, { platform: platformName });
             success = false;
         }
@@ -2290,41 +2380,41 @@ function createCoreRouter() {
         let success = false;
         let statusCode = 200;
         let extraData = {};
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createMessageLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
                 const { successful, returnMessage, logIds, extraDataTracking, isRevokeUserSession } = await logCore.createMessageLog({ platform, userId, incomingData: req.body });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
                     if (extraDataTracking) {
                         extraData = extraDataTracking;
                     }
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, logIds }) : { successful, returnMessage, logIds });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage, logIds }));
                     success = true;
                 }
             }
             else {
                 tracer?.trace('createMessageLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
         }
         catch (e) {
             logger.error('Create message log failed', { platform: platformName, stack: e.stack });
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('createMessageLog:error', e, { platform: platformName });
             success = false;
         }
@@ -2354,26 +2444,27 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let statusCode = 200;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('scheduleCallDown:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             try {
-                const { id } = await calldown.schedule({ jwtToken, rcAccessToken: req.query.rcAccessToken, body: req.body });
+                const { id } = await calldown.schedule({ jwtToken, rcAccessToken: getRcAccessTokenFromRequest(req), body: req.body });
                 success = true;
-                res.status(200).send(tracer ? tracer.wrapResponse({ successful: true, id }) : { successful: true, id });
+                res.status(200).send(wrapDebugResponse(tracer, { successful: true, id }));
             }
             catch (e) {
                 return handleDatabaseError(e, 'Error scheduling call down');
             }
-        } catch (e) {
+        }
+        catch (e) {
             logger.error('Schedule call down failed', { platform: platformName, stack: e.stack });
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('scheduleCallDown:error', e, { platform: platformName });
             success = false;
         }
@@ -2402,21 +2493,22 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let statusCode = 200;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('getCallDownList:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             const { items } = await calldown.list({ jwtToken, status: req.query.status });
             success = true;
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true, items }) : { successful: true, items });
-        } catch (e) {
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true, items }));
+        }
+        catch (e) {
             logger.error('Get call down list failed', { platform: platformName, stack: e.stack });
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('getCallDownList:error', e, { platform: platformName });
             success = false;
         }
@@ -2443,28 +2535,29 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let statusCode = 200;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             const id = req.query.id;
             if (!jwtToken) {
                 tracer?.trace('deleteCallDownItem:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             const rid = req.params.id || id;
             if (!rid) {
                 tracer?.trace('deleteCallDownItem:missingId', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing id') : 'Missing id');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing id'));
                 return;
             }
             await calldown.remove({ jwtToken, id: rid });
             success = true;
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
-        } catch (e) {
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
+        }
+        catch (e) {
             logger.error('Delete call down item failed', { platform: platformName, stack: e.stack });
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('deleteCallDownItem:error', e, { platform: platformName });
             success = false;
         }
@@ -2491,27 +2584,28 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let statusCode = 200;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('markCallDownCalled:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             const id = req.params.id || req.body?.id;
             if (!id) {
                 tracer?.trace('markCallDownCalled:missingId', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Missing id') : 'Missing id');
+                res.status(400).send(wrapDebugResponse(tracer, 'Missing id'));
                 return;
             }
             await calldown.update({ jwtToken, id, updateData: req.body });
             success = true;
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
-        } catch (e) {
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
+        }
+        catch (e) {
             logger.error('Mark call down called failed', { platform: platformName, stack: e.stack });
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('markCallDownCalled:error', e, { platform: platformName });
             success = false;
         }
@@ -2538,14 +2632,14 @@ function createCoreRouter() {
         let platformName = null;
         let success = false;
         let statusCode = 200;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (jwtToken) {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('findContactWithName:invalidJwtToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('Invalid JWT token') : 'Invalid JWT token');
+                    res.status(400).send(wrapDebugResponse(tracer, 'Invalid JWT token'));
                     success = false;
                     return;
                 }
@@ -2553,25 +2647,24 @@ function createCoreRouter() {
                 platformName = platform;
                 const { successful, returnMessage, contact, isRevokeUserSession } = await contactCore.findContactWithName({ platform, userId, name: req.query.name });
                 if (isRevokeUserSession) {
-                    res.status(401).send(tracer ? tracer.wrapResponse({ successful, returnMessage }) : { successful, returnMessage });
+                    res.status(401).send(wrapDebugResponse(tracer, { successful, returnMessage }));
                     success = false;
                 }
                 else {
-                    res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
+                    res.status(200).send(wrapDebugResponse(tracer, { successful, returnMessage, contact }));
                     success = successful;
                 }
             }
             else {
                 tracer?.trace('contactSearchByName:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 success = false;
             }
-
         }
         catch (e) {
             logger.error('Contact search by name failed', { platform: platformName, stack: e.stack });
             statusCode = e.response?.status ?? 'unknown';
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('contactSearchByName:error', e, { platform: platformName });
             success = false;
         }
@@ -2598,7 +2691,7 @@ function createCoreRouter() {
         tracer?.trace('getAdminReport:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         const jwtToken = req.jwtToken || req.query.jwtToken;
         try {
             if (jwtToken) {
@@ -2606,21 +2699,21 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getAdminReport:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
                 const report = await adminCore.getAdminReport({ rcAccountId: user.rcAccountId, timezone: req.query.timezone, timeFrom: req.query.timeFrom, timeTo: req.query.timeTo, groupBy: req.query.groupBy });
-                res.status(200).send(tracer ? tracer.wrapResponse(report) : report);
+                res.status(200).send(wrapDebugResponse(tracer, report));
                 success = true;
                 return;
             }
             tracer?.trace('getAdminReport:invalidRequest', {});
-            res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
+            res.status(400).send(wrapDebugResponse(tracer, 'Invalid request'));
             success = false;
         }
         catch (e) {
             logger.error('Get admin report failed', { stack: e.stack });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('getAdminReport:error', e, { platform: platformName });
         }
         const requestEndTime = new Date().getTime();
@@ -2644,7 +2737,7 @@ function createCoreRouter() {
         tracer?.trace('getUserReport:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         const jwtToken = req.jwtToken || req.query.jwtToken;
         try {
             if (jwtToken) {
@@ -2652,20 +2745,20 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserReport:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                    res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                     return;
                 }
                 const report = await adminCore.getUserReport({ rcAccountId: user.rcAccountId, rcExtensionId: req.query.rcExtensionId, timezone: req.query.timezone, timeFrom: req.query.timeFrom, timeTo: req.query.timeTo });
-                res.status(200).send(tracer ? tracer.wrapResponse(report) : report);
+                res.status(200).send(wrapDebugResponse(tracer, report));
                 return;
             }
             tracer?.trace('getUserReport:invalidRequest', {});
-            res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
+            res.status(400).send(wrapDebugResponse(tracer, 'Invalid request'));
             success = false;
         }
         catch (e) {
             logger.error('Get user report failed', { stack: e.stack });
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { error: getErrorResponse(e) }));
             tracer?.traceError('getUserReport:error', e, { platform: platformName });
         }
         const requestEndTime = new Date().getTime();
@@ -2693,15 +2786,15 @@ function createCoreRouter() {
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
                 tracer?.trace('onRingcentralOAuthCallback:userNotFound', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                 return;
             }
             await authCore.onRingcentralOAuthCallback({ code, rcAccountId: user.rcAccountId });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
             return;
         }
         tracer?.trace('onRingcentralOAuthCallback:invalidRequest', {});
-        res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
+        res.status(400).send(wrapDebugResponse(tracer, 'Invalid request'));
     });
     router.get('/debug/report/url', async function (req, res) {
         const requestStartTime = new Date().getTime();
@@ -2709,17 +2802,17 @@ function createCoreRouter() {
         tracer?.trace('getErrorLogReportURL:start', { query: req.query });
         let platformName = null;
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         const jwtToken = req.jwtToken || req.query.jwtToken;
         if (jwtToken) {
             const unAuthData = jwt.decodeJwt(jwtToken);
             const uploadUrl = await s3ErrorLogReport.getUploadUrl({ userId: unAuthData?.id, platform: unAuthData?.platform });
-            res.status(200).send(tracer ? tracer.wrapResponse({ presignedUrl: uploadUrl }) : { presignedUrl: uploadUrl });
+            res.status(200).send(wrapDebugResponse(tracer, { presignedUrl: uploadUrl }));
             success = true;
         }
         else {
             tracer?.trace('getErrorLogReportURL:invalidRequest', {});
-            res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
+            res.status(400).send(wrapDebugResponse(tracer, 'Invalid request'));
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -2737,7 +2830,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.post('/plugin/async-callback/:taskId', async function (req, res) {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('pluginAsyncCallback:start', { taskId: req.params.taskId, body: req.body });
@@ -2746,42 +2838,40 @@ function createCoreRouter() {
                 taskId: req.params.taskId,
                 body: req.body || {},
             });
-            res.status(result.statusCode).send(tracer ? tracer.wrapResponse(result.body) : result.body);
+            res.status(result.statusCode).send(wrapDebugResponse(tracer, result.body));
         }
         catch (e) {
             logger.error('Plugin async callback failed', { taskId: req.params.taskId, stack: e.stack });
             tracer?.traceError('pluginAsyncCallback:error', e);
-            res.status(500).send(tracer ? tracer.wrapResponse({ successful: false, message: e.message || e }) : { successful: false, message: e.message || e });
+            res.status(500).send(wrapDebugResponse(tracer, { successful: false, message: getErrorResponse(e) }));
         }
     });
-
     router.post('/plugin/register', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('pluginRegister:start', { body: req.body });
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const { pluginId, rcAccountId, pluginAccess, pluginName, ownerRcAccountId } = req.body || {};
-            const rcAccessToken = req.query?.rcAccessToken;
+            const rcAccessToken = getRcAccessTokenFromRequest(req);
             if (!pluginId || !rcAccountId) {
-                res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'pluginId and rcAccountId are required' }) : { successful: false, returnMessage: 'pluginId and rcAccountId are required' });
+                res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'pluginId and rcAccountId are required' }));
                 return;
             }
             if (!rcAccessToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'Missing RingCentral access token' }) : { successful: false, returnMessage: 'Missing RingCentral access token' });
+                res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'Missing RingCentral access token' }));
                 return;
             }
             const { isValidated, rcAccountId: validatedRcAccountId } = await adminCore.validateAdminRole({ rcAccessToken });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'Admin validation failed' }) : { successful: false, returnMessage: 'Admin validation failed' });
+                res.status(403).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'Admin validation failed' }));
                 return;
             }
             if (validatedRcAccountId?.toString() !== rcAccountId?.toString()) {
-                res.status(403).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'rcAccountId mismatch' }) : { successful: false, returnMessage: 'rcAccountId mismatch' });
+                res.status(403).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'rcAccountId mismatch' }));
                 return;
             }
-
             await pluginCore.registerPluginAccount({
                 pluginId,
                 rcAccessToken,
@@ -2790,15 +2880,15 @@ function createCoreRouter() {
                 pluginAccess,
                 pluginName,
             });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
             success = true;
-        } catch (e) {
+        }
+        catch (e) {
             logger.error('Plugin register failed', { stack: e.stack });
-            res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: e.message || e }) : { successful: false, returnMessage: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: getErrorResponse(e) }));
             tracer?.traceError('pluginRegister:error', e);
             success = false;
         }
-
         const requestEndTime = new Date().getTime();
         analytics.track({
             eventName: 'Plugin Register',
@@ -2813,44 +2903,43 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.delete('/plugin/unregister', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('pluginUnregister:start', { query: req.query });
         let success = false;
-        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
+        const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers });
         try {
             const { pluginId, rcAccountId, pluginName } = req.query || {};
-            const rcAccessToken = req.query?.rcAccessToken;
+            const rcAccessToken = getRcAccessTokenFromRequest(req);
             if (!pluginId || !rcAccountId) {
-                res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'pluginId and rcAccountId are required' }) : { successful: false, returnMessage: 'pluginId and rcAccountId are required' });
+                res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'pluginId and rcAccountId are required' }));
                 return;
             }
             if (!rcAccessToken) {
-                res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'Missing RingCentral access token' }) : { successful: false, returnMessage: 'Missing RingCentral access token' });
+                res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'Missing RingCentral access token' }));
                 return;
             }
             const { isValidated, rcAccountId: validatedRcAccountId } = await adminCore.validateAdminRole({ rcAccessToken });
             if (!isValidated) {
-                res.status(403).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'Admin validation failed' }) : { successful: false, returnMessage: 'Admin validation failed' });
+                res.status(403).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'Admin validation failed' }));
                 return;
             }
             if (validatedRcAccountId?.toString() !== rcAccountId?.toString()) {
-                res.status(403).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: 'rcAccountId mismatch' }) : { successful: false, returnMessage: 'rcAccountId mismatch' });
+                res.status(403).send(wrapDebugResponse(tracer, { successful: false, returnMessage: 'rcAccountId mismatch' }));
                 return;
             }
-
             await pluginCore.unregisterPluginAccount({
                 pluginId,
                 rcAccountId: rcAccountId?.toString(),
                 pluginName,
             });
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
+            res.status(200).send(wrapDebugResponse(tracer, { successful: true }));
             success = true;
-        } catch (e) {
+        }
+        catch (e) {
             logger.error('Plugin unregister failed', { stack: e.stack });
-            res.status(400).send(tracer ? tracer.wrapResponse({ successful: false, returnMessage: e.message || e }) : { successful: false, returnMessage: e.message || e });
+            res.status(400).send(wrapDebugResponse(tracer, { successful: false, returnMessage: getErrorResponse(e) }));
             tracer?.traceError('pluginUnregister:error', e);
             success = false;
         }
@@ -2868,7 +2957,6 @@ function createCoreRouter() {
             eventAddedVia
         });
     });
-
     router.get('/plugin/licenseStatus', async function (req, res) {
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
         tracer?.trace('getPluginLicenseStatus:start', { query: req.query });
@@ -2876,31 +2964,30 @@ function createCoreRouter() {
             const jwtToken = req.jwtToken || req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('getPluginLicenseStatus:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
+                res.status(400).send(wrapDebugResponse(tracer, 'Please go to Settings and authorize CRM platform'));
                 return;
             }
             const unAuthData = jwt.decodeJwt(jwtToken);
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
                 tracer?.trace('getPluginLicenseStatus:userNotFound', {});
-                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
+                res.status(400).send(wrapDebugResponse(tracer, 'User not found'));
                 return;
             }
             const { rcAccountId, pluginId } = req.query;
             if (!rcAccountId || !pluginId) {
-                res.status(400).send(tracer ? tracer.wrapResponse('rcAccountId and pluginId are required') : 'rcAccountId and pluginId are required');
+                res.status(400).send(wrapDebugResponse(tracer, 'rcAccountId and pluginId are required'));
                 return;
             }
             const licenseStatus = await pluginCore.getPluginLicenseStatus({ rcAccountId, pluginId });
-            res.status(200).send(tracer ? tracer.wrapResponse(licenseStatus) : licenseStatus);
+            res.status(200).send(wrapDebugResponse(tracer, licenseStatus));
         }
         catch (e) {
             logger.error('Get plugin license status failed', { stack: e.stack });
-            res.status(200).send(tracer ? tracer.wrapResponse({ licenseStatus: false, licenseStatusDescription: e.message || e }) : { licenseStatus: false, licenseStatusDescription: e.message || e });
+            res.status(200).send(wrapDebugResponse(tracer, { licenseStatus: false, licenseStatusDescription: getErrorResponse(e) }));
             tracer?.traceError('getPluginLicenseStatus:error', e);
         }
     });
-
     if (process.env.IS_PROD === 'false') {
         router.post('/registerMockUser', async function (req, res) {
             const secretKey = req.query.secretKey;
@@ -2957,7 +3044,6 @@ function createCoreRouter() {
     router.get('/.well-known/openai-apps-challenge', (req, res) => {
         res.send(process.env.CHATGPT_VERIFICATION_CODE);
     });
-
     // --- METADATA ENDPOINT 1: Resource Metadata ---
     // Tells the client "I am protected" and "Here is who protects me"
     router.get('/.well-known/oauth-protected-resource', (req, res) => {
@@ -2968,7 +3054,6 @@ function createCoreRouter() {
             scopes_supported: ["ReadAccounts"]
         });
     });
-
     // --- METADATA ENDPOINT 2: Auth Server Metadata ---
     // Usually, you can redirect to your provider's configuration.
     // If your provider supports OIDC discovery, this is often sufficient.
@@ -2976,54 +3061,68 @@ function createCoreRouter() {
         res.json({
             issuer: process.env.APP_SERVER,
             registration_endpoint: `${process.env.APP_SERVER}/oauth/register`,
-
-            // CHANGE THIS: Don't point to RingCentral. Point to your own Shim.
+            // Keep the shim so unsupported metadata params are stripped before RingCentral.
             authorization_endpoint: `${process.env.APP_SERVER}/oauth/authorize_shim`,
-
-            // Keep the token endpoint pointing to RingCentral (that usually works fine)
+            // MCP clients exchange the authorization code with RingCentral directly using PKCE.
             token_endpoint: `${process.env.RINGCENTRAL_SERVER}/restapi/oauth/token`,
-            token_endpoint_auth_methods_supported: ["client_secret_basic"],
-            response_types_supported: ["code"]
+            token_endpoint_auth_methods_supported: ["none"],
+            response_types_supported: ["code"],
+            grant_types_supported: ["authorization_code", "refresh_token"],
+            code_challenge_methods_supported: ["S256"]
         });
     });
-
     router.get('/oauth/authorize_shim', (req, res) => {
-        // 1. Get the parameters ChatGPT sent us
-        const { response_type, client_id, redirect_uri, state, scope } = req.query;
-
-        // 2. Rebuild the query string for RingCentral
-        // We explicitly LEAVE OUT 'resource' and any other junk
-        const params = new URLSearchParams({
-            response_type,
-            client_id, // This will be your RC Client ID (since ChatGPT got it from /register)
-            redirect_uri,
-            state,
-            scope
-        });
-
-        // 3. Redirect the user's browser to the REAL RingCentral URL
+        const mcpClientId = process.env.RINGCENTRAL_MCP_CLIENT_ID;
+        if (!mcpClientId) {
+            return res.status(500).send('RINGCENTRAL_MCP_CLIENT_ID is not configured');
+        }
+        const { response_type, client_id, redirect_uri, state, scope, code_challenge, code_challenge_method, } = req.query;
+        const requestedClientId = getFirstQueryValue(client_id);
+        const requestedCodeChallenge = getFirstQueryValue(code_challenge);
+        const requestedCodeChallengeMethod = getFirstQueryValue(code_challenge_method);
+        if (requestedClientId && requestedClientId !== mcpClientId) {
+            return res.status(400).send(buildMcpOAuthError({
+                error: 'mcp_oauth_client_mismatch',
+                message: MCP_OAUTH_STALE_CLIENT_MESSAGE,
+            }));
+        }
+        if (!getFirstQueryValue(response_type) || !getFirstQueryValue(redirect_uri)) {
+            return res.status(400).send('Missing OAuth authorization parameters');
+        }
+        if (!requestedCodeChallenge || requestedCodeChallengeMethod !== 'S256') {
+            return res.status(400).send('PKCE S256 code_challenge is required');
+        }
+        const params = new URLSearchParams();
+        appendOAuthQueryParam(params, 'response_type', response_type);
+        params.set('client_id', mcpClientId);
+        appendOAuthQueryParam(params, 'redirect_uri', redirect_uri);
+        appendOAuthQueryParam(params, 'state', state);
+        appendOAuthQueryParam(params, 'scope', scope);
+        appendOAuthQueryParam(params, 'code_challenge', code_challenge);
+        appendOAuthQueryParam(params, 'code_challenge_method', code_challenge_method);
         const rcUrl = `${process.env.RINGCENTRAL_SERVER}/restapi/oauth/authorize?${params.toString()}`;
-
         console.log("Proxying OAuth request to:", rcUrl); // Helpful for debugging
         res.redirect(rcUrl);
     });
-
     router.post('/oauth/register', (req, res) => {
-        // The MCP client calls this to get credentials.
-        // We simply return our hardcoded RingCentral app credentials.
+        const mcpClientId = process.env.RINGCENTRAL_MCP_CLIENT_ID;
+        if (!mcpClientId) {
+            return res.status(500).send('RINGCENTRAL_MCP_CLIENT_ID is not configured');
+        }
+        // Dynamic registration for MCP public clients. No client secret is issued.
         res.json({
-            client_id: process.env.RINGCENTRAL_CLIENT_ID,
-            client_secret: process.env.RINGCENTRAL_CLIENT_SECRET
+            client_id: mcpClientId,
+            token_endpoint_auth_method: 'none',
+            grant_types: ['authorization_code', 'refresh_token'],
+            response_types: ['code']
         });
     });
-
     router.use('/mcp', (req, res, next) => {
         // Widget tool calls are unauthenticated — they come from the iframe
         // which has no access to the RC bearer token.
         if (req.path === '/widget-tool-call') {
             return next();
         }
-
         const authHeader = req.headers.authorization;
         const token = authHeader?.split(' ')[1]; // Remove "Bearer "
         // Allow GET and OPTIONS (CORS preflight) to pass freely.
@@ -3045,16 +3144,23 @@ function createCoreRouter() {
         }
         // SCENARIO 1: No Token provided. Kick off the OAuth flow.
         if (!token) {
-            res.setHeader('WWW-Authenticate', `Bearer realm="mcp", resource_metadata="${process.env.APP_SERVER}/.well-known/oauth-protected-resource"`);
-            return res.status(401).send();
+            res.setHeader('WWW-Authenticate', getMcpOAuthChallengeHeader({
+                appServer: process.env.APP_SERVER,
+                errorDescription: MCP_OAUTH_REQUIRED_MESSAGE,
+            }));
+            return res.status(401).json(buildMcpOAuthError({
+                message: MCP_OAUTH_REQUIRED_MESSAGE,
+            }));
         }
-
         // SCENARIO 2: Token provided. Verify it.
         try {
             next();
-        } catch {
-            res.setHeader('WWW-Authenticate', `Bearer realm="mcp", resource_metadata="${process.env.APP_SERVER}/.well-known/oauth-protected-resource"`);
-            return res.status(401).send();
+        }
+        catch {
+            res.setHeader('WWW-Authenticate', getMcpOAuthChallengeHeader({
+                appServer: process.env.APP_SERVER,
+            }));
+            return res.status(401).json(buildMcpOAuthError());
         }
     });
     // Handle OPTIONS for CORS preflight
@@ -3065,21 +3171,18 @@ function createCoreRouter() {
         res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Authorization');
         res.status(200).end();
     });
-
     // Dedicated endpoint for all MCP traffic
     router.post('/mcp', async (req, res) => {
         // Set CORS headers
         res.setHeader('Access-Control-Allow-Origin', '*');
         res.setHeader('Content-Type', 'application/json');
-
         await mcpHandler.handleMcpRequest(req, res);
     });
-
     // Lightweight endpoint for widget tool calls (bypasses MCP protocol)
     router.options('/mcp/widget-tool-call', (req, res) => {
         res.setHeader('Access-Control-Allow-Origin', '*');
         res.setHeader('Access-Control-Allow-Methods', 'POST, OPTIONS');
-        res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+        res.setHeader('Access-Control-Allow-Headers', 'Content-Type, X-App-Connect-Widget-Token');
         res.status(200).end();
     });
     router.post('/mcp/widget-tool-call', async (req, res) => {
@@ -3087,10 +3190,8 @@ function createCoreRouter() {
         res.setHeader('Content-Type', 'application/json');
         await mcpHandler.handleWidgetToolCall(req, res);
     });
-
     return router;
 }
-
 // Create middleware for core functionality
 function createCoreMiddleware() {
     return [
@@ -3110,18 +3211,12 @@ function createCoreMiddleware() {
         })
     ];
 }
-
 // Initialize core services
 async function initializeCore(options = {}) {
-    const {
-        skipDatabaseInit = false,
-        skipAnalyticsInit = false,
-    } = options;
-
+    const { skipDatabaseInit = false, skipAnalyticsInit = false, } = options;
     if (!skipAnalyticsInit) {
         analytics.init();
     }
-
     if (!skipDatabaseInit) {
         await initDB();
         // Run the heavy callLogs primary-key migration in the BACKGROUND, off the
@@ -3136,7 +3231,6 @@ async function initializeCore(options = {}) {
         }
     }
 }
-
 // Create a complete app with core functionality
 function createCoreApp(options = {}) {
     const coreInit = initializeCore(options).catch((err) => {
@@ -3147,14 +3241,14 @@ function createCoreApp(options = {}) {
         throw err;
     });
     const app = express();
-
     // Block routing until DB sync/migrations finish so traffic never hits a half-ready DB,
     // and ensure init failures are logged instead of only as unhandled rejections.
     app.use(async (req, res, next) => {
         try {
             await coreInit;
             next();
-        } catch (e) {
+        }
+        catch (e) {
             logger.error('Request rejected: core initialization failed', {
                 message: e?.message,
                 stack: e?.stack,
@@ -3164,22 +3258,17 @@ function createCoreApp(options = {}) {
                 .json({ error: 'Service unavailable', detail: e?.message });
         }
     });
-
     // Allow bigger POST body size
     app.use(express.json({ limit: '50mb' }));
     app.use(express.urlencoded({ limit: '50mb', extended: true }));
-
     // Apply core middleware
     const coreMiddleware = createCoreMiddleware();
     coreMiddleware.forEach(middleware => app.use(middleware));
-
     // Apply core routes
     const coreRouter = createCoreRouter();
     app.use('/', coreRouter);
-
     return app;
 }
-
 exports.createCoreRouter = createCoreRouter;
 exports.createCoreMiddleware = createCoreMiddleware;
 exports.createCoreApp = createCoreApp;