From 0b6b88e8e726738e8b47c25d9506347358d790a8 Mon Sep 17 00:00:00 2001
From: Hrishikesh Vaipurkar <hrishikesh.vaipurkar@scandichotels.com>
Date: Tue, 23 Jul 2024 16:11:11 +0200
Subject: [PATCH] feat: SW-158 Optimized code

---
 app/[lang]/(live)/(public)/login/route.ts     |  5 -----
 .../(live)/(public)/verifymagiclink/route.ts  | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/[lang]/(live)/(public)/login/route.ts b/app/[lang]/(live)/(public)/login/route.ts
index 0854f8be8..0a82def28 100644
--- a/app/[lang]/(live)/(public)/login/route.ts
+++ b/app/[lang]/(live)/(public)/login/route.ts
@@ -123,11 +123,6 @@ export async function GET(
     )
 
     if (redirectUrl) {
-      // Remove nonce for User to be able to login via Magic Link, but normal login fails as nonce becomes absent in the token response
-      // if (redirectUrl.indexOf("nonce") != -1) {
-      //   redirectUrl = redirectUrl.replace(/nonce=.*&code_challenge=/gi, "&code_challenge=");
-      //   redirectUrl = redirectUrl.replace(/&nonce=.*/gi, "");
-      // }
       return NextResponse.redirect(redirectUrl, {
         headers: redirectHeaders,
       })
diff --git a/app/[lang]/(live)/(public)/verifymagiclink/route.ts b/app/[lang]/(live)/(public)/verifymagiclink/route.ts
index 9efc07a28..28ef544a9 100644
--- a/app/[lang]/(live)/(public)/verifymagiclink/route.ts
+++ b/app/[lang]/(live)/(public)/verifymagiclink/route.ts
@@ -2,6 +2,7 @@ import { NextRequest, NextResponse } from "next/server"
 import { AuthError } from "next-auth"
 
 import { Lang } from "@/constants/languages"
+import { login } from "@/constants/routes/handleAuth"
 import { env } from "@/env/server"
 import { internalServerError } from "@/server/errors/next"
 
@@ -11,12 +12,10 @@ export async function GET(
   request: NextRequest,
   context: { params: { lang: Lang } }
 ) {
-  let redirectHeaders: Headers | undefined = undefined
   let redirectTo: string
-  let loginKey: string
+  let loginKey: string | null
 
-  redirectTo =
-    request.cookies.get("Scandic-auth.callback-url")?.value || "/" // Cookie gets set by NextAuth from login initiation
+  redirectTo = request.cookies.get("Scandic-auth.callback-url")?.value || "/" // Cookie gets set by NextAuth from login initiation
 
   // Make relative URL to absolute URL
   if (redirectTo.startsWith("/")) {
@@ -33,7 +32,17 @@ export async function GET(
       redirectTo.substring(redirectTo.indexOf("returnurl") + 10)
     )
   }
-  loginKey = "" + request.nextUrl.searchParams.get("loginKey")?.toString()
+
+  loginKey = request.nextUrl.searchParams.get("loginKey")
+
+  if (!loginKey) {
+    if (!env.PUBLIC_URL) {
+      throw internalServerError("No value for env.PUBLIC_URL")
+    }
+    const publicUrl = new URL(env.PUBLIC_URL)
+    const loginUrl = login[context.params.lang]
+    return NextResponse.redirect(new URL(loginUrl, publicUrl))
+  }
 
   try {
     /**