scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "chore: debug middleware"

Browse Source 
This reverts commit b2f0b88cae.

Revert "chore: debug mfa login"

This reverts commit 0f1ce32c4d.

Revert "chore: debug mfa login"

This reverts commit 670778864e.

Revert "chore: debug mfa login"

This reverts commit 5269fcb6c4.
This commit is contained in:
Michael Zetterberg
2024-10-17 01:42:27 +02:00
parent b2f0b88cae
commit a53ab5c833
3 changed files with 5 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
middlewares/authRequired.ts
View File

@@ -37,21 +37,13 @@ import type { MiddlewareMatcher } from "@/types/middleware"
* https://authjs.dev/reference/nextjs
*/
export const middleware = auth(async (request) => {
console.log("[mwauth] start")
console.log("[mwauth] request.nextUrl.origin", request.nextUrl.origin)
console.log("[mwauth] request.nextUrl", request.nextUrl)
console.log("[mwauth] request", request)
console.log("[mwauth] request.headers", request.headers)
for (let [key, value] of request.headers.entries()) {
console.log(`[mwauth] header '${key}'`, value)
}
const lang = findLang(request.nextUrl.pathname)!
const { nextUrl } = request
const lang = findLang(nextUrl.pathname)!
const isLoggedIn = !!request.auth
const hasError = request.auth?.error
const nextUrlPublic = getPublicNextURL(request)
console.log("[mfa] nextUrlPublic", nextUrlPublic)
/**
* Function to validate MFA from token data
@@ -63,21 +55,13 @@ export const middleware = auth(async (request) => {
: false
return !(request.auth?.token.mfa_scope && isMFATokenValid)
}
const isMFAPath = mfaRequired.includes(request.nextUrl.pathname)
const isMFAPath = mfaRequired.includes(nextUrl.pathname)
if (isLoggedIn && isMFAPath && isMFAInvalid()) {
console.log("[mfa] required")
const headers = new Headers(request.headers)
headers.set("x-returnurl", nextUrlPublic.href)
headers.set("x-login-source", "mfa")
console.log("[mfa] headers", headers)
console.log("[mfa] request.nextUrl", request.nextUrl)
console.log("[mfa] request", request)
const u = new URL(`/${lang}/login`, request.nextUrl)
console.log("[mfa] rewrite url", u)
return NextResponse.rewrite(u, {
return NextResponse.rewrite(new URL(`/${lang}/login`, request.nextUrl), {
request: {
headers,
},

12
middlewares/currentWebLogin.ts
View File

@@ -9,10 +9,6 @@ import type { NextMiddleware } from "next/server"
import type { MiddlewareMatcher } from "@/types/middleware"
export const middleware: NextMiddleware = (request) => {
console.log("[updatelogin] start")
console.log("[updatelogin] request.nextUrl.origin", request.nextUrl.origin)
console.log("[updatelogin] request.nextUrl", request.nextUrl)
console.log("[updatelogin] request", request)
const returnUrl = request.nextUrl.searchParams.get("returnurl")
if (!returnUrl) {
@@ -24,14 +20,8 @@ export const middleware: NextMiddleware = (request) => {
const headers = new Headers(request.headers)
headers.set("x-returnurl", returnUrl)
headers.set("x-login-source", "seamless")
console.log("[updatelogin] headers", headers)
console.log("[updatelogin] request.nextUrl", request.nextUrl)
console.log("[updatelogin] request", request)
const u = new URL(`/${lang}/login`, request.nextUrl)
console.log("[updatelogin] rewrite url", u)
return NextResponse.rewrite(u, {
return NextResponse.rewrite(new URL(`/${lang}/login`, request.nextUrl), {
request: {
headers,
},