feat(SW-162): Optimized as review comments

This commit is contained in:
Hrishikesh Vaipurkar
2024-08-12 10:23:58 +02:00
parent 51df6bfd34
commit 84670dbd14

View File

@@ -58,14 +58,14 @@ export const middleware = auth(async (request) => {
* @returns boolean * @returns boolean
*/ */
function isMFAInvalid() { function isMFAInvalid() {
const isMFAPath = mfaRequired.includes(nextUrl.pathname)
const isMFATokenValid = request.auth const isMFATokenValid = request.auth
? request.auth.token.mfa_expires_at > Date.now() ? request.auth.token.mfa_expires_at > Date.now()
: false : 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) const headers = new Headers(request.headers)
headers.set("x-mfa-login", "true") headers.set("x-mfa-login", "true")
headers.set("x-returnurl", request.nextUrl.href) headers.set("x-returnurl", request.nextUrl.href)