From eea4f5fa49f82b9065ca34d3aadb507449784e9f Mon Sep 17 00:00:00 2001
From: Nicola Molinari <nicola.molinari@commercetools.com>
Date: Fri, 3 Jun 2022 11:50:13 +0200
Subject: [PATCH] fix(mc-scripts): local login dev for internal usage (#2626)

---
 .changeset/fuzzy-comics-visit.md                          | 6 ++++++
 .../src/create-mc-dev-authentication-middleware.ts        | 8 ++++----
 .../mc-scripts/src/config/webpack-dev-server.config.js    | 4 +---
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 .changeset/fuzzy-comics-visit.md

diff --git a/.changeset/fuzzy-comics-visit.md b/.changeset/fuzzy-comics-visit.md
new file mode 100644
index 0000000000..5c5d37cf45
--- /dev/null
+++ b/.changeset/fuzzy-comics-visit.md
@@ -0,0 +1,6 @@
+---
+'@commercetools-frontend/mc-dev-authentication': patch
+'@commercetools-frontend/mc-scripts': patch
+---
+
+Fix dev middleware usage for local login flow (internal usage only)"
diff --git a/packages/mc-dev-authentication/src/create-mc-dev-authentication-middleware.ts b/packages/mc-dev-authentication/src/create-mc-dev-authentication-middleware.ts
index 50ce93c0d2..e4cc0b6ad2 100644
--- a/packages/mc-dev-authentication/src/create-mc-dev-authentication-middleware.ts
+++ b/packages/mc-dev-authentication/src/create-mc-dev-authentication-middleware.ts
@@ -23,7 +23,7 @@ function createMcDevAuthenticationMiddleware(
     if (request.originalUrl === '/api/graphql') {
       response.statusCode = 404;
       response.setHeader('Content-Type', 'application/json');
-      response.end(
+      response.send(
         JSON.stringify({
           message: `This GraphQL endpoint is only available in production in the [Merchant Center Proxy Router](https://docs.commercetools.com/custom-applications/concepts/merchant-center-proxy-router). Please check that you are not calling this endpoint in development mode.`,
         })
@@ -42,7 +42,7 @@ function createMcDevAuthenticationMiddleware(
           if (isDevAuthenticationMiddlewareDisabled) {
             next();
           } else {
-            response.end(htmlLogin);
+            response.send(htmlLogin);
           }
           return;
         }
@@ -52,7 +52,7 @@ function createMcDevAuthenticationMiddleware(
         if (isDevAuthenticationMiddlewareDisabled) {
           next();
         } else {
-          response.end(htmlLogin);
+          response.send(htmlLogin);
         }
         return;
       }
@@ -62,7 +62,7 @@ function createMcDevAuthenticationMiddleware(
         if (isDevAuthenticationMiddlewareDisabled) {
           next();
         } else {
-          response.end(htmlLogout);
+          response.send(htmlLogout);
         }
         return;
       }
diff --git a/packages/mc-scripts/src/config/webpack-dev-server.config.js b/packages/mc-scripts/src/config/webpack-dev-server.config.js
index 4068859d60..56c18fef4d 100644
--- a/packages/mc-scripts/src/config/webpack-dev-server.config.js
+++ b/packages/mc-scripts/src/config/webpack-dev-server.config.js
@@ -45,14 +45,12 @@ module.exports = ({ port, publicPath }) => ({
   hot: true,
   https: false,
   port,
-  // Enable HTTPS if the HTTPS environment variable is set to 'true'
-  // `proxy` is run between `before` and `after` `webpack-dev-server` hooks
   setupMiddlewares(middlewares, devServer) {
     if (!devServer) {
       throw new Error('webpack-dev-server is not defined');
     }
 
-    middlewares.push(createMcDevAuthenticationMiddleware(applicationConfig));
+    devServer.app.use(createMcDevAuthenticationMiddleware(applicationConfig));
 
     return middlewares;
   },