From fe32a723e64b48218ad81b61d7f29b822386f4fe Mon Sep 17 00:00:00 2001
From: Darya Umrikhina <darya.umrihina@onlyoffice.com>
Date: Tue, 20 Aug 2024 01:22:48 +0400
Subject: [PATCH] Login:Src: fix redirect

---
 .../login/src/components/ConfirmRoute.tsx     |  6 ----
 packages/login/src/middleware.ts              | 32 ++++++++++++-------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/packages/login/src/components/ConfirmRoute.tsx b/packages/login/src/components/ConfirmRoute.tsx
index ddb0cbc39d..714b352ddb 100644
--- a/packages/login/src/components/ConfirmRoute.tsx
+++ b/packages/login/src/components/ConfirmRoute.tsx
@@ -50,7 +50,6 @@ function ConfirmRoute(props: ConfirmRouteProps) {
     children,
     confirmLinkResult,
     confirmLinkParams,
-    confirmType,
   } = props;
 
   const [stateData, setStateData] = useState<TConfirmRouteContext | undefined>(
@@ -116,11 +115,6 @@ function ConfirmRoute(props: ConfirmRouteProps) {
     }
   }
 
-  if (!confirmType && confirmLinkParams.type)
-    window.location.replace(
-      `/confirm/${confirmLinkParams.type}?${searchParams.toString()}`,
-    );
-
   return (
     <ConfirmRouteContext.Provider
       value={{
diff --git a/packages/login/src/middleware.ts b/packages/login/src/middleware.ts
index d9ea85358c..a9633a9a6e 100644
--- a/packages/login/src/middleware.ts
+++ b/packages/login/src/middleware.ts
@@ -49,21 +49,31 @@ export function middleware(request: NextRequest) {
   }
 
   if (request.nextUrl.pathname.includes("confirm")) {
-    const queryType = request.nextUrl.searchParams.get("type");
-
+    const searchParams = new URLSearchParams(request.nextUrl.searchParams);
+    const queryType = searchParams.get("type") ?? "";
     const posSeparator = request.nextUrl.pathname.lastIndexOf("/");
     const type = !!posSeparator
       ? request.nextUrl.pathname?.slice(posSeparator + 1)
-      : "";
-    requestHeaders.set("x-confirm-type", type);
-    requestHeaders.set(
-      "x-confirm-query",
-      request.nextUrl.searchParams.toString(),
-    );
+      : queryType;
 
-    return NextResponse.rewrite(
-      `${request.nextUrl.origin}/login/confirm/${queryType}${request.nextUrl.search}`,
-      { headers: requestHeaders },
+    let queryString: string;
+    if (queryType) {
+      searchParams.set("type", type);
+      queryString = searchParams.toString();
+    } else {
+      queryString = `type=${type}&${searchParams.toString()}`;
+    }
+
+    requestHeaders.set("x-confirm-type", type);
+    requestHeaders.set("x-confirm-query", searchParams.toString());
+
+    const confirmUrl = `${request.nextUrl.origin}/login/confirm/${type}?${queryString}`;
+    if (request.nextUrl.toString() == confirmUrl) {
+      return NextResponse.rewrite(confirmUrl, { headers: requestHeaders });
+    }
+
+    return NextResponse.redirect(
+      `${request.nextUrl.origin}/confirm/${type}?${queryString}`,
     );
   }