@app-connect/core 1.7.8 → 1.7.11

package/index.js

@@ -1,15 +1,16 @@
 const express = require('express');
 const cors = require('cors')
 const bodyParser = require('body-parser');
+require('body-parser-xml')(bodyParser);
 const dynamoose = require('dynamoose');
 const axios = require('axios');
 const { UserModel } = require('./models/userModel');
 const { CallDownListModel } = require('./models/callDownListModel');
-const { Op } = require('sequelize');
 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');
@@ -24,14 +25,19 @@ 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 { handleDatabaseError } = require('./lib/errorHandler');
+const { updateAuthSession } = require('./lib/authSession');
 
 let packageJson = null;
 try {
     packageJson = require('./package.json');
 }
 catch (e) {
+    logger.error('Error loading package.json', { stack: e.stack });
     packageJson = require('../package.json');
 }
 
@@ -39,18 +45,25 @@ catch (e) {
 if (process.env.DYNAMODB_LOCALHOST) {
     dynamoose.aws.ddb.local(process.env.DYNAMODB_LOCALHOST);
 }
-
+// log axios requests
+if (process.env.IS_PROD === 'false') {
+    axios.interceptors.request.use(request => {
+        console.log('Request:', `[${request.method}]`, request.url);
+        return request;
+    });
+}
 axios.defaults.headers.common['Unified-CRM-Extension-Version'] = packageJson.version;
 
 async function initDB() {
     if (!process.env.DISABLE_SYNC_DB_TABLE) {
-        console.log('creating db tables if not exist...');
+        logger.info('creating db tables if not exist...');
         await UserModel.sync();
         await CallLogModel.sync();
         await MessageLogModel.sync();
         await AdminConfigModel.sync();
         await CacheModel.sync();
         await CallDownListModel.sync();
+        await AccountDataModel.sync();
     }
 }
 
@@ -120,6 +133,7 @@ function createCoreRouter() {
             }
         }
         catch (e) {
+            logger.error('Error getting crm manifest', { stack: e.stack });
             res.status(400).send('Platform not found');
         }
     });
@@ -159,11 +173,11 @@ function createCoreRouter() {
                 result.getLicenseStatus = !!platformModule.getLicenseStatus;
                 result.getLogFormatType = !!platformModule.getLogFormatType;
                 result.cacheCallNote = !!process.env.USE_CACHE;
-                res.status(200).send(tracer ? tracer.wrapResponse({ result }) : { result });
+                res.status(200).send(tracer ? tracer.wrapResponse(result) : result);
             }
             else {
                 tracer?.trace('implementedInterfaces:noPlatform', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please provide platform.' }) : { error: 'Please provide platform.' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please provide platform.') : 'Please provide platform.');
                 return;
             }
         }
@@ -187,11 +201,11 @@ function createCoreRouter() {
                 platformName = platform;
                 if (!userId) {
                     tracer?.trace('licenseStatus:noUserId', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'No user ID' }) : { error: 'No user ID' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('No user ID') : '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(tracer ? tracer.wrapResponse(licenseStatus) : licenseStatus);
                 success = true;
             }
             else {
@@ -253,7 +267,7 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('authValidation:invalidJwtToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Invalid JWT token' }) : { error: 'Invalid JWT token' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Invalid JWT token') : 'Invalid JWT token');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -267,12 +281,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('authValidation:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
@@ -314,17 +328,17 @@ function createCoreRouter() {
             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({ message: 'Admin settings updated' }) : { message: 'Admin settings updated' });
+                res.status(200).send(tracer ? tracer.wrapResponse('Admin settings updated') : 'Admin settings updated');
                 success = true;
             }
             else {
                 tracer?.trace('setAdminSettings:adminValidationFailed', {});
-                res.status(401).send(tracer ? tracer.wrapResponse({ error: 'Admin validation failed' }) : { error: 'Admin validation failed' });
+                res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 });
             success = false;
@@ -358,7 +372,7 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getAdminSettings:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                     return;
                 }
                 const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
@@ -366,7 +380,7 @@ function createCoreRouter() {
                 if (isValidated) {
                     const adminSettings = await adminCore.getAdminSettings({ hashedRcAccountId });
                     if (adminSettings) {
-                        res.status(200).send(tracer ? tracer.wrapResponse({ adminSettings }) : { adminSettings });
+                        res.status(200).send(tracer ? tracer.wrapResponse(adminSettings) : adminSettings);
                     }
                     else {
                         res.status(200).send(tracer ? tracer.wrapResponse({
@@ -381,13 +395,13 @@ function createCoreRouter() {
                 }
                 else {
                     tracer?.trace('getAdminSettings:adminValidationFailed', {});
-                    res.status(401).send(tracer ? tracer.wrapResponse({ error: 'Admin validation failed' }) : { error: 'Admin validation failed' });
+                    res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                     success = true;
                 }
             }
             else {
                 tracer?.trace('getAdminSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
@@ -426,30 +440,30 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserMapping:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                     return;
                 }
                 const { isValidated, rcAccountId } = await adminCore.validateAdminRole({ rcAccessToken: req.query.rcAccessToken });
                 const hashedRcAccountId = util.getHashValue(rcAccountId, process.env.HASH_KEY);
                 if (isValidated) {
                     const userMapping = await adminCore.getUserMapping({ user, hashedRcAccountId, rcExtensionList: req.body.rcExtensionList });
-                    res.status(200).send(tracer ? tracer.wrapResponse({ userMapping }) : { userMapping });
+                    res.status(200).send(tracer ? tracer.wrapResponse(userMapping) : userMapping);
                     success = true;
                 }
                 else {
                     tracer?.trace('getUserMapping:adminValidationFailed', {});
-                    res.status(401).send(tracer ? tracer.wrapResponse({ error: 'Admin validation failed' }) : { error: 'Admin validation failed' });
+                    res.status(401).send(tracer ? tracer.wrapResponse('Admin validation failed') : 'Admin validation failed');
                     success = true;
                 }
             }
             else {
                 tracer?.trace('getUserMapping:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 });
         }
@@ -477,7 +491,7 @@ function createCoreRouter() {
         const jwtToken = req.query.jwtToken;
         if (!jwtToken) {
             tracer?.trace('getServerLoggingSettings:noToken', {});
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+            res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
             return;
         }
         const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
@@ -485,22 +499,22 @@ function createCoreRouter() {
             const unAuthData = jwt.decodeJwt(jwtToken);
             if (!unAuthData?.id) {
                 tracer?.trace('getServerLoggingSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : '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({ error: 'User not found' }) : { error: 'User not found' });
+                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                 return;
             }
             const serverLoggingSettings = await adminCore.getServerLoggingSettings({ user });
-            res.status(200).send(tracer ? tracer.wrapResponse({ serverLoggingSettings }) : { serverLoggingSettings });
+            res.status(200).send(tracer ? tracer.wrapResponse(serverLoggingSettings) : serverLoggingSettings);
             success = true;
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 });
         }
@@ -528,12 +542,12 @@ function createCoreRouter() {
         const jwtToken = req.query.jwtToken;
         if (!jwtToken) {
             tracer?.trace('setServerLoggingSettings:noToken', {});
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+            res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
             return;
         }
         if (!req.body.additionalFieldValues) {
             tracer?.trace('setServerLoggingSettings:missingAdditionalFieldValues', {});
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Missing additionalFieldValues' }) : { error: 'Missing additionalFieldValues' });
+            res.status(400).send(tracer ? tracer.wrapResponse('Missing additionalFieldValues') : 'Missing additionalFieldValues');
             return;
         }
         const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
@@ -541,14 +555,14 @@ function createCoreRouter() {
             const unAuthData = jwt.decodeJwt(jwtToken);
             if (!unAuthData?.id) {
                 tracer?.trace('setServerLoggingSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : '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({ error: 'User not found' }) : { error: 'User not found' });
+                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                 return;
             }
             const { successful, returnMessage } = await adminCore.updateServerLoggingSettings({ user, additionalFieldValues: req.body.additionalFieldValues });
@@ -556,7 +570,7 @@ function createCoreRouter() {
             success = true;
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 } });
             success = false;
@@ -584,15 +598,15 @@ function createCoreRouter() {
             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(tracer ? tracer.wrapResponse(userSettings) : userSettings);
             }
             else {
                 tracer?.trace('getUserSettingsByAdmin:noRcAccessTokenOrRcAccountId', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Cannot find rc user login' }) : { error: 'Cannot find rc user login' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Cannot find rc user login') : 'Cannot find rc user login');
             }
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 });
         }
@@ -613,7 +627,7 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserSettings:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                     return;
                 }
                 else {
@@ -621,17 +635,17 @@ function createCoreRouter() {
                     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(tracer ? tracer.wrapResponse(userSettings) : userSettings);
                 }
             }
             else {
                 success = false;
                 tracer?.trace('getUserSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
         }
@@ -664,13 +678,13 @@ function createCoreRouter() {
                 platformName = unAuthData?.platform;
                 if (!platformName) {
                     tracer?.trace('setUserSettings:unknownPlatform', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Unknown platform' }) : { error: 'Unknown platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Unknown platform') : 'Unknown platform');
                     return;
                 }
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('setUserSettings:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                     return;
                 }
                 const { userSettings } = await userCore.updateUserSettings({ user, userSettings: req.body.userSettings, platformName });
@@ -679,12 +693,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('setUserSettings:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
         }
@@ -713,18 +727,18 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('hostname:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                     return;
                 }
-                res.status(200).send(tracer ? tracer.wrapResponse({ hostname: user.hostname }) : { hostname: user.hostname });
+                res.status(200).send(tracer ? tracer.wrapResponse(user.hostname) : user.hostname);
             }
             else {
                 tracer?.trace('hostname:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
             }
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 });
         }
@@ -735,21 +749,32 @@ function createCoreRouter() {
         tracer?.trace('oauth-callback:start', { query: req.query });
         let platformName = null;
         let success = false;
+        let sessionId = null;
         const { hashedExtensionId, hashedAccountId, userAgent, ip, author, eventAddedVia } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
         try {
             if (!req.query?.callbackUri || req.query.callbackUri === 'undefined') {
-                tracer?.trace('oauth-callback:missingCallbackUri', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Missing callbackUri' }) : { error: 'Missing callbackUri' });
-                return;
+                // case: from mcp
+                if (req.query.code) {
+                    // eslint-disable-next-line no-param-reassign
+                    req.query.callbackUri = `${process.env.APP_SERVER}/oauth-callback?code=${req.query.code}`;
+                }
+                else {
+                    tracer?.trace('oauth-callback:missingCallbackUri', {});
+                    res.status(400).send(tracer ? tracer.wrapResponse('Missing callbackUri') : 'Missing callbackUri');
+                    return;
+                }
             }
-            platformName = req.query.state ?
-                req.query.state.split('platform=')[1] :
-                decodeURIComponent(req.originalUrl).split('state=')[1].split('&')[0].split('platform=')[1];
-            const hostname = req.query.hostname;
+            const state = new URL(req.query.callbackUri).searchParams.get('state') ?? req.query.state;
+            const stateParams = new URLSearchParams(state ? decodeURIComponent(state) : '');
+            platformName = stateParams.get('platform');
+            // Extract mcp auth sessionId if present
+            sessionId = stateParams?.get('sessionId');
+            const isFromMCP = !!sessionId;
+            const hostname = req.query.hostname ?? stateParams.get('hostname');
             const tokenUrl = req.query.tokenUrl;
             if (!platformName) {
                 tracer?.trace('oauth-callback:missingPlatformName', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Missing platform name' }) : { error: 'Missing platform name' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
                 return;
             }
             const hasAuthCodeInCallbackUri = req.query.callbackUri.includes('code=');
@@ -761,29 +786,53 @@ function createCoreRouter() {
                 platform: platformName,
                 hostname,
                 tokenUrl,
-                callbackUri: req.query.callbackUri,
-                apiUrl: req.query.apiUrl,
-                username: req.query.username,
                 query: req.query,
-                proxyId: req.query.proxyId
+                proxyId: req.query.proxyId,
+                isFromMCP
             });
             if (userInfo) {
                 const jwtToken = jwt.generateJwt({
                     id: userInfo.id.toString(),
                     platform: platformName
                 });
-                res.status(200).send(tracer ? tracer.wrapResponse({ jwtToken, name: userInfo.name, returnMessage }) : { jwtToken, name: userInfo.name, returnMessage });
-                success = true;
+                // Store in session if sessionId exists (MCP flow)
+                if (isFromMCP) {
+                    await updateAuthSession(sessionId, {
+                        status: 'completed',
+                        jwtToken,
+                        userInfo: {
+                            id: userInfo.id,
+                            name: userInfo.name
+                        }
+                    });
+                    res.status(200).send("Authentication successful. Please go back to AI Agent and confirm it.");
+                    success = true;
+                }
+                else {                
+                    res.status(200).send(tracer ? tracer.wrapResponse({ jwtToken, name: userInfo.name, returnMessage }) : { jwtToken, name: userInfo.name, returnMessage });
+                    success = true;
+                }
             }
             else {
                 res.status(200).send(tracer ? tracer.wrapResponse({ returnMessage }) : { returnMessage });
-                success = false;
+                await updateAuthSession(sessionId, {
+                    status: 'failed',
+                    errorMessage: returnMessage?.message || 'Authentication failed'
+                });
             }
+            success = false;
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
+            if (sessionId) {
+                await updateAuthSession(sessionId, {
+                    status: 'failed',
+                    errorMessage: e.message || e.toString()
+                });
+            }
+
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -800,7 +849,7 @@ function createCoreRouter() {
             author,
             eventAddedVia
         });
-    })
+    });
     router.post('/apiKeyLogin', async function (req, res) {
         const requestStartTime = new Date().getTime();
         const tracer = req.headers['is-debug'] === 'true' ? DebugTracer.fromRequest(req) : null;
@@ -817,12 +866,12 @@ function createCoreRouter() {
             const additionalInfo = req.body.additionalInfo;
             if (!platform) {
                 tracer?.trace('apiKeyLogin:missingPlatform', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Missing platform name' }) : { error: 'Missing platform name' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Missing platform name') : 'Missing platform name');
                 return;
             }
             if (!apiKey) {
                 tracer?.trace('apiKeyLogin:missingApiKey', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Missing api key' }) : { error: 'Missing api key' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Missing api key') : 'Missing api key');
                 return;
             }
             const { userInfo, returnMessage } = await authCore.onApiKeyLogin({ platform, hostname, apiKey, proxyId, additionalInfo });
@@ -840,7 +889,7 @@ function createCoreRouter() {
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             success = false;
@@ -875,22 +924,22 @@ function createCoreRouter() {
                 const userToLogout = await UserModel.findByPk(unAuthData?.id);
                 if (!userToLogout) {
                     tracer?.trace('unAuthorize:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : '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(tracer ? tracer.wrapResponse(returnMessage) : returnMessage);
                 success = true;
             }
             else {
                 tracer?.trace('unAuthorize:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             success = false;
@@ -919,7 +968,7 @@ function createCoreRouter() {
             res.status(200).send(tracer ? tracer.wrapResponse({ extensionId, accountId }) : { extensionId, accountId });
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            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 });
             tracer?.traceError('userInfoHash:error', e);
         }
@@ -941,12 +990,20 @@ function createCoreRouter() {
                 tracer?.trace('findContact:jwtDecoded', { decodedToken });
                 if (!decodedToken) {
                     tracer?.trace('findContact:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, returnMessage, contact, extraDataTracking } = await contactCore.findContact({ platform, userId, phoneNumber: req.query.phoneNumber.replace(' ', '+'), overridingFormat: req.query.overridingFormat, isExtension: req.query?.isExtension ?? false, tracer });
+                const { successful, returnMessage, contact, extraDataTracking } = await contactCore.findContact({
+                    platform,
+                    userId,
+                    phoneNumber: req.query.phoneNumber.replace(' ', '+'),
+                    overridingFormat: req.query.overridingFormat,
+                    isExtension: req.query?.isExtension ?? false,
+                    tracer,
+                    isForceRefreshAccountData: req.query?.isForceRefreshAccountData === 'true'
+                });
                 tracer?.trace('findContact:result', { successful, returnMessage, contact });
                 res.status(200).send(tracer ? tracer.wrapResponse({ successful, returnMessage, contact }) : { successful, returnMessage, contact });
                 if (successful) {
@@ -960,12 +1017,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('findContact:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
@@ -1004,7 +1061,7 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createContact:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1018,12 +1075,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('createContact:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
@@ -1061,12 +1118,12 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('saveNoteCache:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
                 platformName = platform;
-                const { successful, returnMessage, extraDataTracking } = await logCore.saveNoteCache({ sessionId: req.body.sessionId, note: req.body.note });
+                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 });
                 success = true;
                 if (extraDataTracking) {
@@ -1074,7 +1131,7 @@ function createCoreRouter() {
                 }
             }
         } catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
@@ -1088,6 +1145,14 @@ function createCoreRouter() {
             accountId: hashedAccountId,
             extensionId: hashedExtensionId,
             success,
+            requestDuration: (requestEndTime - requestStartTime) / 1000,
+            userAgent,
+            ip,
+            author,
+            eventAddedVia,
+            extras: {
+                ...extraData
+            }
         });
     })
     router.get('/callLog', async function (req, res) {
@@ -1104,7 +1169,7 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('getCallLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1119,12 +1184,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('getCallLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('getCallLog:error', e, { platform: platformName });
@@ -1162,7 +1227,7 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createCallLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1176,12 +1241,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('createCallLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('createCallLog:error', e, { platform: platformName });
@@ -1219,7 +1284,7 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('updateCallLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1233,12 +1298,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('updateCallLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('updateCallLog:error', e, { platform: platformName });
@@ -1277,7 +1342,7 @@ function createCoreRouter() {
                 platformName = platform;
                 if (!userId) {
                     tracer?.trace('upsertCallDisposition:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { successful, returnMessage, extraDataTracking } = await dispositionCore.upsertCallDisposition({
@@ -1295,12 +1360,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('upsertCallDisposition:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('upsertCallDisposition:error', e, { platform: platformName });
@@ -1339,7 +1404,7 @@ function createCoreRouter() {
                 const decodedToken = jwt.decodeJwt(jwtToken);
                 if (!decodedToken) {
                     tracer?.trace('createMessageLog:invalidToken', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                     return;
                 }
                 const { id: userId, platform } = decodedToken;
@@ -1353,12 +1418,12 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('createMessageLog:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('createMessageLog:error', e, { platform: platformName });
@@ -1395,14 +1460,19 @@ function createCoreRouter() {
             const jwtToken = req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('scheduleCallDown:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 return;
             }
-            const { id } = await calldown.schedule({ jwtToken, rcAccessToken: req.query.rcAccessToken, body: req.body });
-            success = true;
-            res.status(200).send(tracer ? tracer.wrapResponse({ successful: true, id }) : { successful: true, id });
+            try {
+                const { id } = await calldown.schedule({ jwtToken, rcAccessToken: req.query.rcAccessToken, body: req.body });
+                success = true;
+                res.status(200).send(tracer ? tracer.wrapResponse({ successful: true, id }) : { successful: true, id });
+            }
+            catch (e) {
+                return handleDatabaseError(e, 'Error scheduling call down');
+            }
         } catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('scheduleCallDown:error', e, { platform: platformName });
@@ -1438,14 +1508,14 @@ function createCoreRouter() {
             const jwtToken = req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('getCallDownList:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : '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) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('getCallDownList:error', e, { platform: platformName });
@@ -1480,20 +1550,20 @@ function createCoreRouter() {
             const id = req.query.id;
             if (!jwtToken) {
                 tracer?.trace('deleteCallDownItem:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : '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({ error: 'Missing id' }) : { error: 'Missing id' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Missing id') : 'Missing id');
                 return;
             }
             await calldown.remove({ jwtToken, id: rid });
             success = true;
             res.status(200).send(tracer ? tracer.wrapResponse({ successful: true }) : { successful: true });
         } catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('deleteCallDownItem:error', e, { platform: platformName });
@@ -1527,20 +1597,20 @@ function createCoreRouter() {
             const jwtToken = req.query.jwtToken;
             if (!jwtToken) {
                 tracer?.trace('markCallDownCalled:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : '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({ error: 'Missing id' }) : { error: 'Missing id' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Missing id') : '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) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('markCallDownCalled:error', e, { platform: platformName });
@@ -1568,7 +1638,6 @@ function createCoreRouter() {
         tracer?.trace('contactSearchByName:start', { query: req.query });
         let platformName = null;
         let success = false;
-        let resultCount = 0;
         let statusCode = 200;
         const { hashedExtensionId, hashedAccountId, userAgent, ip, author } = getAnalyticsVariablesInReqHeaders({ headers: req.headers })
         try {
@@ -1582,13 +1651,13 @@ function createCoreRouter() {
             }
             else {
                 tracer?.trace('contactSearchByName:noToken', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Please go to Settings and authorize CRM platform' }) : { error: 'Please go to Settings and authorize CRM platform' });
+                res.status(400).send(tracer ? tracer.wrapResponse('Please go to Settings and authorize CRM platform') : 'Please go to Settings and authorize CRM platform');
                 success = false;
             }
 
         }
         catch (e) {
-            console.log(`platform: ${platformName} \n${e.stack}`);
+            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 });
             tracer?.traceError('contactSearchByName:error', e, { platform: platformName });
@@ -1625,7 +1694,7 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getAdminReport:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : '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 });
@@ -1634,11 +1703,11 @@ function createCoreRouter() {
                 return;
             }
             tracer?.trace('getAdminReport:invalidRequest', {});
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Invalid request' }) : { error: 'Invalid request' });
+            res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
             success = false;
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            logger.error('Get admin report failed', { stack: e.stack });
             res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
             tracer?.traceError('getAdminReport:error', e, { platform: platformName });
         }
@@ -1671,7 +1740,7 @@ function createCoreRouter() {
                 const user = await UserModel.findByPk(unAuthData?.id);
                 if (!user) {
                     tracer?.trace('getUserReport:userNotFound', {});
-                    res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                    res.status(400).send(tracer ? tracer.wrapResponse('User not found') : '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 });
@@ -1679,11 +1748,11 @@ function createCoreRouter() {
                 return;
             }
             tracer?.trace('getUserReport:invalidRequest', {});
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Invalid request' }) : { error: 'Invalid request' });
+            res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
             success = false;
         }
         catch (e) {
-            console.log(`${e.stack}`);
+            logger.error('Get user report failed', { stack: e.stack });
             res.status(400).send(tracer ? tracer.wrapResponse({ error: e.message || e }) : { error: e.message || e });
             tracer?.traceError('getUserReport:error', e, { platform: platformName });
         }
@@ -1712,7 +1781,7 @@ function createCoreRouter() {
             const user = await UserModel.findByPk(unAuthData?.id);
             if (!user) {
                 tracer?.trace('onRingcentralOAuthCallback:userNotFound', {});
-                res.status(400).send(tracer ? tracer.wrapResponse({ error: 'User not found' }) : { error: 'User not found' });
+                res.status(400).send(tracer ? tracer.wrapResponse('User not found') : 'User not found');
                 return;
             }
             await authCore.onRingcentralOAuthCallback({ code, rcAccountId: user.rcAccountId });
@@ -1720,7 +1789,7 @@ function createCoreRouter() {
             return;
         }
         tracer?.trace('onRingcentralOAuthCallback:invalidRequest', {});
-        res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Invalid request' }) : { error: 'Invalid request' });
+        res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
     });
     router.get('/debug/report/url', async function (req, res) {
         const requestStartTime = new Date().getTime();
@@ -1738,7 +1807,7 @@ function createCoreRouter() {
         }
         else {
             tracer?.trace('getErrorLogReportURL:invalidRequest', {});
-            res.status(400).send(tracer ? tracer.wrapResponse({ error: 'Invalid request' }) : { error: 'Invalid request' });
+            res.status(400).send(tracer ? tracer.wrapResponse('Invalid request') : 'Invalid request');
             success = false;
         }
         const requestEndTime = new Date().getTime();
@@ -1809,6 +1878,116 @@ function createCoreRouter() {
             }
         });
     }
+    // --- 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) => {
+        res.json({
+            resource: process.env.APP_SERVER,
+            // CHANGE THIS: Point to your own server so the client fetches YOUR metadata next
+            authorization_servers: [process.env.APP_SERVER],
+            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.
+    router.get('/.well-known/oauth-authorization-server', (req, res) => {
+        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.
+            authorization_endpoint: `${process.env.APP_SERVER}/oauth/authorize_shim`,
+
+            // Keep the token endpoint pointing to RingCentral (that usually works fine)
+            token_endpoint: `${process.env.RINGCENTRAL_SERVER}/restapi/oauth/token`,
+            token_endpoint_auth_methods_supported: ["client_secret_basic"],
+            response_types_supported: ["code"]
+        });
+    });
+
+    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 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.
+        res.json({
+            client_id: process.env.RINGCENTRAL_CLIENT_ID,
+            client_secret: process.env.RINGCENTRAL_CLIENT_SECRET
+        });
+    });
+
+    router.use('/mcp', (req, res, next) => {// LOG EVERYTHING
+        console.log(`[${req.method}] /mcp`);
+        console.log("Headers:", JSON.stringify(req.headers['authorization'] ? "Auth Token Present" : "No Auth"));
+        console.log("Body:", JSON.stringify(req.body));
+        // return next();
+        // Capture the response finish to see the status code
+        res.on('finish', () => {
+            console.log(`[Response] Status: ${res.statusCode}`);
+            console.log(`[Response] data: ${JSON.stringify(res.data)}`);
+        });
+
+        const authHeader = req.headers.authorization;
+        const token = authHeader?.split(' ')[1]; // Remove "Bearer "
+        // Allow the initial connection (GET) and CORS checks (OPTIONS) to pass freely.
+        // We only want to block the actual commands (POST).
+        if (req.method === 'GET' || req.method === 'OPTIONS') {
+            return next();
+        }
+        // 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();
+        }
+
+        // SCENARIO 2: Token provided. Verify it.
+        try {
+            next();
+        } catch (error) {
+            console.error("Token validation failed:", error.message);
+            // Token is invalid or expired
+            res.setHeader('WWW-Authenticate', `Bearer realm="mcp", resource_metadata="${process.env.APP_SERVER}/.well-known/oauth-protected-resource"`);
+            return res.status(401).send();
+        }
+    });
+    // Handle OPTIONS for CORS preflight
+    router.options('/mcp', (req, res) => {
+        res.setHeader('Access-Control-Allow-Origin', '*');
+        res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
+        res.setHeader('Access-Control-Allow-Headers', 'Content-Type, Accept');
+        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);
+    });
 
     return router;
 }
@@ -1817,6 +1996,15 @@ function createCoreRouter() {
 function createCoreMiddleware() {
     return [
         bodyParser.json(),
+        bodyParser.xml({
+            limit: '50mb',
+            xmlParseOptions: {
+                explicitArray: false,
+                normalize: true,
+                normalizeTags: false,
+                trim: true
+            }
+        }),
         cors({
             methods: ['GET', 'POST', 'PATCH', 'PUT', 'DELETE']
         })