feat(SW-162): Optimized as review comments
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user