diff --git a/packages/core.gbapp/services/router/bridge.ts b/packages/core.gbapp/services/router/bridge.ts index d5c33f53..6ab91911 100644 --- a/packages/core.gbapp/services/router/bridge.ts +++ b/packages/core.gbapp/services/router/bridge.ts @@ -3,7 +3,6 @@ import express from 'express'; import fetch from 'isomorphic-fetch'; import moment from 'moment'; import * as uuidv4 from 'uuid'; - import { IActivity, IBotData, IConversation, IConversationUpdateActivity, IMessageActivity } from './types'; import { GBConfigService } from '../GBConfigService.js'; @@ -70,7 +69,7 @@ export const getRouter = ( router.post(`/directline/conversations/`, reqs); // Reconnect API - router.get('/v3/directline/conversations/:conversationId', (req, res) => { + const req3 = (req, res) => { const conversation = getConversation(req.params.conversationId, conversationInitRequired); if (conversation) { res.status(200).send(conversation); @@ -80,7 +79,9 @@ export const getRouter = ( } console.warn('/v3/directline/conversations/:conversationId not implemented'); - }); + }; + router.get('/v3/directline/conversations/:conversationId',req3); + router.get(`/directline/${botId}/conversations/:conversationId`,req3); // Gets activities from store (local history array for now) router.get(`/api/messages/${botId}/v3/directline/conversations/:conversationId/activities`, (req, res) => { @@ -110,7 +111,7 @@ export const getRouter = ( // Sends message to bot. Assumes message activities - router.post(`/api/messages/${botId}/v3/directline/conversations/:conversationId/activities`, (req, res) => { + const res2= (req, res) => { const incomingActivity = req.body; // Make copy of activity. Add required fields const activity = createMessageActivity(incomingActivity, serviceUrl, req.params.conversationId, @@ -133,7 +134,10 @@ export const getRouter = ( // Conversation was never initialized res.status(400).send(); } - }); + }; + + router.post(`/api/messages/${botId}/v3/directline/conversations/:conversationId/activities`, res2); + router.post(`/directline/${botId}/conversations/:conversationId/activities`, res2); router.post('/v3/directline/conversations/:conversationId/upload', (req, res) => { console.warn('/v3/directline/conversations/:conversationId/upload not implemented'); @@ -364,3 +368,6 @@ const conversationsCleanup = () => { }); }, conversationsCleanupInterval); }; + + + diff --git a/packages/default.gbui/package.json b/packages/default.gbui/package.json index 47e09a34..8f10b3e1 100644 --- a/packages/default.gbui/package.json +++ b/packages/default.gbui/package.json @@ -8,24 +8,24 @@ "homepage": ".", "dependencies": { "@midudev/react-static-content": "1.0.4", - "ajv": "8.11.2", - "botframework-directlinejs": "0.15.1", - "botframework-webchat": "4.15.6", + "ajv": "8.17.1", + "botframework-directlinejs": "0.15.5", + "botframework-webchat": "4.18.0", "deep-extend": "0.6.0", - "eslint": "8.28.0", + "eslint": "9.10.0", "fetch": "1.1.0", - "msal": "1.4.17", - "powerbi-client": "2.22.0", - "react": "18.2.0", - "react-dom": "18.2.0", + "msal": "1.4.18", + "powerbi-client": "2.23.1", + "react": "18.3.1", + "react-dom": "18.3.1", "react-helmet": "6.1.0", - "react-player": "2.11.0", + "react-player": "2.16.0", "react-scripts": "5.0.1", - "react-super-seo": "1.0.7", + "react-super-seo": "1.1.9", "react-transition-group": "4.4.5", - "rxjs": "7.5.7", + "rxjs": "7.8.1", "url-join": "5.0.0", - "webpack": "5.75.0" + "webpack": "5.94.0" }, "scripts": { "start": "react-scripts start",