fix: 400 errors

Signed-off-by: Ar Rakin <rakinar2@gmail.com>
onesoft-sudo · Aug 28, 2024 · 3f8cd2f · 3f8cd2f
1 parent d708252
commit 3f8cd2f
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -12,7 +12,12 @@ const httpStatusText: Record<number, string> = {
     500: "Internal Server Error",
 };
 
-const FRONTEND_DOMAIN = process.env.NEXT_PUBLIC_FRONTEND_ROOT_DOMAIN?.replace(
+const FRONTEND_DOMAIN = process.env.NEXT_PUBLIC_FRONTEND_DOMAIN?.replace(
+    /:\d+$/,
+    "",
+);
+
+const FRONTEND_ROOT_DOMAIN = process.env.NEXT_PUBLIC_FRONTEND_ROOT_DOMAIN?.replace(
     /:\d+$/,
     "",
 );
@@ -82,14 +87,14 @@ export function middleware(request: NextRequest) {
 
     if (
         !hostname ||
-        (!hostname.endsWith("." + FRONTEND_DOMAIN) &&
-            hostname !== FRONTEND_DOMAIN)
+        (!hostname.endsWith("." + FRONTEND_ROOT_DOMAIN) &&
+            hostname !== FRONTEND_DOMAIN && hostname !== FRONTEND_ROOT_DOMAIN)
     ) {
         return error(400, "The request hostname is not valid.");
     }
 
-    if (hostname === FRONTEND_DOMAIN) {
-        requestHeaders.set("x-domain", FRONTEND_DOMAIN);
+    if (hostname === FRONTEND_DOMAIN || hostname === FRONTEND_ROOT_DOMAIN) {
+        requestHeaders.set("x-domain", FRONTEND_ROOT_DOMAIN);
 
         return NextResponse.next({
             request: {
@@ -98,8 +103,7 @@ export function middleware(request: NextRequest) {
         });
     }
 
-    const subdomain = hostname.replace("." + FRONTEND_DOMAIN, "").trim();
-
+    const subdomain = hostname.replace("." + FRONTEND_ROOT_DOMAIN, "").trim();
     const subdomainConfig = subdomains[subdomain];
 
     if (!subdomainConfig) {