Merge a6f9d0f into 9224192

.changeset/yellow-moose-lie.md

@@ -0,0 +1,6 @@
+---
+'@commercetools-frontend/mc-dev-authentication': patch
+'@commercetools-frontend/mc-scripts': patch
+---
+
+Adjust the dev auth server compat with HTTP request / response options

packages/mc-dev-authentication/package.json

@@ -29,9 +29,9 @@
   },
   "devDependencies": {
     "@commercetools-frontend/application-config": "workspace:*",
-    "@types/express": "^4.17.17",
+    "@types/connect": "^3.4.35",
     "@tsconfig/node16": "^16.0.0",
-    "express": "4.18.2"
+    "connect": "^3.7.0"
   },
   "engines": {
     "node": "16.x || >=18.0.0"

packages/mc-dev-authentication/src/create-mc-dev-authentication-middleware.ts

@@ -1,8 +1,9 @@
-import type { Request, Response, NextFunction } from 'express';
+import type { ServerResponse } from 'node:http';
+import type { IncomingMessage, NextFunction } from 'connect';
+// https://babeljs.io/blog/2017/09/11/zero-config-with-babel-macros
 import pages from /* preval */ './pages';
 import { logout } from './routes';
 import type { TCustomApplicationRuntimeConfig } from './types';
-// https://babeljs.io/blog/2017/09/11/zero-config-with-babel-macros
 
 const trimTrailingSlash = (value: string) => value.replace(/\/$/, '');
 
@@ -19,11 +20,15 @@ function createMcDevAuthenticationMiddleware(
     String(applicationConfig.env.disableAuthRoutesOfDevServer) === 'true' ||
     applicationConfig.env.servedByProxy;
 
-  return (request: Request, response: Response, next: NextFunction) => {
+  return (
+    request: IncomingMessage,
+    response: ServerResponse,
+    next: NextFunction
+  ) => {
     if (request.originalUrl === '/api/graphql') {
       response.statusCode = 404;
       response.setHeader('Content-Type', 'application/json');
-      response.send(
+      response.end(
         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.`,
         })
@@ -38,11 +43,11 @@ function createMcDevAuthenticationMiddleware(
           'http://localhost'
         )
       ) {
-        if (request.originalUrl.startsWith('/login/authorize')) {
+        if (request.originalUrl?.startsWith('/login/authorize')) {
           if (isDevAuthenticationMiddlewareDisabled) {
             next();
           } else {
-            response.send(htmlLogin);
+            response.end(htmlLogin);
           }
           return;
         }
@@ -52,7 +57,7 @@ function createMcDevAuthenticationMiddleware(
         if (isDevAuthenticationMiddlewareDisabled) {
           next();
         } else {
-          response.send(htmlLogin);
+          response.end(htmlLogin);
         }
         return;
       }
@@ -62,7 +67,7 @@ function createMcDevAuthenticationMiddleware(
         if (isDevAuthenticationMiddlewareDisabled) {
           next();
         } else {
-          response.send(htmlLogout);
+          response.end(htmlLogout);
         }
         return;
       }

packages/mc-dev-authentication/src/routes/logout.ts

@@ -1,7 +1,7 @@
-import type { Response } from 'express';
+import type { ServerResponse } from 'node:http';
 
 function logoutRoute(
-  response: Response,
+  response: ServerResponse,
   additionalCookieParameters: string[] = []
 ) {
   // NOTE: removing the cookie only works if your are running the MC API

packages/mc-scripts/src/vite-plugins/vite-plugin-custom-application.ts

@@ -1,4 +1,4 @@
-import type { Plugin, Connect } from 'vite';
+import type { Plugin } from 'vite';
 import type { ApplicationRuntimeConfig } from '@commercetools-frontend/application-config';
 import { createMcDevAuthenticationMiddleware } from '@commercetools-frontend/mc-dev-authentication';
 import {
@@ -27,9 +27,7 @@ const vitePluginCustomApplication = (
 
         // Handle auth routes for internal local development.
         server.middlewares.use(
-          createMcDevAuthenticationMiddleware(
-            applicationConfig
-          ) as Connect.NextHandleFunction
+          createMcDevAuthenticationMiddleware(applicationConfig)
         );
       };
     },