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

fix: cleanup logs

Browse Source
This commit is contained in:
Matilda Landström
2024-05-22 11:11:19 +02:00
parent e65145687d
commit e3e4d6c1c8
4 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/[lang]/(live)/(protected)/logout/route.ts
View File

@@ -17,7 +17,7 @@ export async function GET(
let redirectTo: string let redirectTo: string
const returnUrl = request.headers.get("x-returnurl") const returnUrl = request.headers.get("x-returnurl")
console.log("TESTING", returnUrl)
if (returnUrl) { if (returnUrl) {
redirectTo = returnUrl redirectTo = returnUrl
} else { } else {
@@ -67,6 +67,7 @@ export async function GET(
const redirectUrl = new URL(redirectUrlValue) const redirectUrl = new URL(redirectUrlValue)
redirectUrl.searchParams.set("returnurl", redirectTo) redirectUrl.searchParams.set("returnurl", redirectTo)
redirectTo = redirectUrl.toString() redirectTo = redirectUrl.toString()
console.log("TOTO", redirectTo)
} catch (e) { } catch (e) {
console.error( console.error(
"Unable to create URL for seamless logout, proceeding without it." "Unable to create URL for seamless logout, proceeding without it."

3
app/[lang]/(live)/(public)/login/route.ts
View File

@@ -15,7 +15,7 @@ export async function GET(
let redirectTo: string let redirectTo: string
const returnUrl = request.headers.get("x-returnurl") const returnUrl = request.headers.get("x-returnurl")
console.log("TESTTEST", returnUrl, request)
if (returnUrl) { if (returnUrl) {
// Seamless login request from Current web // Seamless login request from Current web
redirectTo = returnUrl redirectTo = returnUrl
@@ -33,6 +33,7 @@ export async function GET(
} }
redirectTo = new URL(redirectTo, env.PUBLIC_URL).href redirectTo = new URL(redirectTo, env.PUBLIC_URL).href
} }
// Clean up cookie from authRequired middleware // Clean up cookie from authRequired middleware
redirectHeaders = new Headers() redirectHeaders = new Headers()
redirectHeaders.append( redirectHeaders.append(

2
middlewares/authRequired.ts
View File

@@ -40,7 +40,7 @@ import type { MiddlewareMatcher } from "@/types/middleware"
export const middleware = auth(async (request) => { export const middleware = auth(async (request) => {
const { nextUrl } = request const { nextUrl } = request
const lang = findLang(nextUrl.pathname)! const lang = findLang(nextUrl.pathname)!
console.log("TestTest ", nextUrl)
const isLoggedIn = !!request.auth const isLoggedIn = !!request.auth
const hasError = request.auth?.error const hasError = request.auth?.error

15
middlewares/currentWebLogout.ts
View File

@@ -8,24 +8,15 @@ import type { NextMiddleware } from "next/server"
import type { MiddlewareMatcher } from "@/types/middleware" import type { MiddlewareMatcher } from "@/types/middleware"
export const middleware: NextMiddleware = (request) => { export const middleware: NextMiddleware = (request) => {
console.log("HEJ", request)
const currentwebUrl = request.nextUrl.searchParams.get("currentweb") const currentwebUrl = request.nextUrl.searchParams.get("currentweb")
if (currentwebUrl == null) { if (currentwebUrl == null || undefined) {
return badRequest() return badRequest()
} }
const lang = findLang(request.nextUrl.pathname)! const lang = findLang(request.nextUrl.pathname)!
//const headers = new Headers(request.headers) return NextResponse.rewrite(new URL(`/${lang}/logout`, request.nextUrl))
//headers.set("x-returnurl", returnUrl)
return NextResponse.rewrite(new URL(`/${lang}/logout`, request.nextUrl), {
/*request: {
headers,
},*/
})
} }
export const matcher: MiddlewareMatcher = (request) => { export const matcher: MiddlewareMatcher = (request) => {
return request.nextUrl.pathname.endsWith("/updatelogout") //?currentweb") return request.nextUrl.pathname.endsWith("/updatelogout")
} }