Fix WebChat get attachment

tzargo-org · Feb 28, 2023 · a957645 · a957645
1 parent 8300f37
commit a957645
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/Composer/packages/server/src/directline/middleware/attachmentHandler.ts b/Composer/packages/server/src/directline/middleware/attachmentHandler.ts
@@ -76,8 +76,7 @@ export function createGetAttachmentHandler(state: DLServerState) {
               buffer = Buffer.from(attachmentBase64.toString(), 'base64');
             }
 
-            res.type(attachment.type);
-            res.send(StatusCodes.OK, buffer);
+            res.status(StatusCodes.OK).type(attachment.type).send(buffer);
           } else {
             handleDirectLineErrors(req, res, {
               status: StatusCodes.NOT_FOUND,

diff --git a/Composer/packages/server/src/middleware/logNetworkTraffic.ts b/Composer/packages/server/src/middleware/logNetworkTraffic.ts
@@ -18,9 +18,11 @@ export function logNetworkTraffic(req: Request, res: Response, next?: NextFuncti
   // when the request finishes, log the payload and status code to the client
   res.once('finish', () => {
     let data: ConversationNetworkErrorItem | ConversationNetworkTrafficItem | undefined;
+    let payload = (res as any).sentData;
+    payload = typeof payload === 'string' ? JSON.parse(payload || '{}') : payload;
     if (res.statusCode >= 400) {
       // an error was sent to the client
-      const { error = {} } = JSON.parse((res as any).sentData || '{}');
+      const { error = {} } = payload;
       data = {
         error: {
           details: error.details,
@@ -29,7 +31,7 @@ export function logNetworkTraffic(req: Request, res: Response, next?: NextFuncti
         id: uuid(),
         request: { method: req.method, payload: req.body, route: req.originalUrl },
         response: {
-          payload: JSON.parse((res as any).sentData || '{}'),
+          payload,
           statusCode: res.statusCode,
         },
         timestamp: Date.now(),
@@ -41,7 +43,7 @@ export function logNetworkTraffic(req: Request, res: Response, next?: NextFuncti
         id: uuid(),
         request: { method: req.method, payload: req.body, route: req.originalUrl },
         response: {
-          payload: JSON.parse((res as any).sentData || '{}'),
+          payload,
           statusCode: res.statusCode,
         },
         timestamp: Date.now(),