This commit is contained in:
Matilda Landström
2024-05-14 15:23:21 +02:00
parent a43754d624
commit 74ff37008d
3 changed files with 5 additions and 4 deletions

View File

@@ -15,6 +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
@@ -32,7 +33,6 @@ 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(
@@ -94,7 +94,7 @@ export async function GET(
ui_locales: context.params.lang, ui_locales: context.params.lang,
} }
) )
console.log(redirectUrl)
if (redirectUrl) { if (redirectUrl) {
return NextResponse.redirect(redirectUrl, { return NextResponse.redirect(redirectUrl, {
headers: redirectHeaders, headers: redirectHeaders,

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

View File

@@ -1,8 +1,9 @@
import { NextResponse, type NextMiddleware } from "next/server" import { type NextMiddleware, NextResponse } from "next/server"
import { findLang } from "@/constants/languages" import { findLang } from "@/constants/languages"
import { env } from "@/env/server" import { env } from "@/env/server"
import { badRequest, internalServerError } from "@/server/errors/next" import { badRequest, internalServerError } from "@/server/errors/next"
import { decryptData } from "@/utils/aes" import { decryptData } from "@/utils/aes"
import type { MiddlewareMatcher } from "@/types/middleware" import type { MiddlewareMatcher } from "@/types/middleware"