From 84670dbd14355d92f93d501a27df6568a05f0a74 Mon Sep 17 00:00:00 2001
From: Hrishikesh Vaipurkar <hrishikesh.vaipurkar@scandichotels.com>
Date: Mon, 12 Aug 2024 10:23:58 +0200
Subject: [PATCH] feat(SW-162): Optimized as review comments

---
 middlewares/authRequired.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/middlewares/authRequired.ts b/middlewares/authRequired.ts
index 67581369d..2e748b95c 100644
--- a/middlewares/authRequired.ts
+++ b/middlewares/authRequired.ts
@@ -58,14 +58,14 @@ export const middleware = auth(async (request) => {
    * @returns boolean
    */
   function isMFAInvalid() {
-    const isMFAPath = mfaRequired.includes(nextUrl.pathname)
     const isMFATokenValid = request.auth
       ? request.auth.token.mfa_expires_at > Date.now()
       : false
-    return isMFAPath && !(request.auth?.token.mfa_scope && isMFATokenValid)
+    return !(request.auth?.token.mfa_scope && isMFATokenValid)
   }
+  const isMFAPath = mfaRequired.includes(nextUrl.pathname)
 
-  if (isLoggedIn && isMFAInvalid()) {
+  if (isLoggedIn && isMFAPath && isMFAInvalid()) {
     const headers = new Headers(request.headers)
     headers.set("x-mfa-login", "true")
     headers.set("x-returnurl", request.nextUrl.href)