From 74ff37008d390290062faf5bee4c69470a4c13b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Tue, 14 May 2024 15:23:21 +0200 Subject: [PATCH] temp --- app/[lang]/(live)/(public)/login/route.ts | 4 ++-- middlewares/authRequired.ts | 2 +- middlewares/webView.ts | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/[lang]/(live)/(public)/login/route.ts b/app/[lang]/(live)/(public)/login/route.ts index 006c8af9e..16447022c 100644 --- a/app/[lang]/(live)/(public)/login/route.ts +++ b/app/[lang]/(live)/(public)/login/route.ts @@ -15,6 +15,7 @@ export async function GET( let redirectTo: string const returnUrl = request.headers.get("x-returnurl") + console.log("TESTTEST", returnUrl, request) if (returnUrl) { // Seamless login request from Current web redirectTo = returnUrl @@ -32,7 +33,6 @@ export async function GET( } redirectTo = new URL(redirectTo, env.PUBLIC_URL).href } - // Clean up cookie from authRequired middleware redirectHeaders = new Headers() redirectHeaders.append( @@ -94,7 +94,7 @@ export async function GET( ui_locales: context.params.lang, } ) - + console.log(redirectUrl) if (redirectUrl) { return NextResponse.redirect(redirectUrl, { headers: redirectHeaders, diff --git a/middlewares/authRequired.ts b/middlewares/authRequired.ts index 268316d41..d0a65c215 100644 --- a/middlewares/authRequired.ts +++ b/middlewares/authRequired.ts @@ -40,7 +40,7 @@ import type { MiddlewareMatcher } from "@/types/middleware" export const middleware = auth(async (request) => { const { nextUrl } = request const lang = findLang(nextUrl.pathname)! - + console.log("TestTest ", nextUrl) const isLoggedIn = !!request.auth const hasError = request.auth?.error diff --git a/middlewares/webView.ts b/middlewares/webView.ts index 99dcbec28..7b6fadee6 100644 --- a/middlewares/webView.ts +++ b/middlewares/webView.ts @@ -1,8 +1,9 @@ -import { NextResponse, type NextMiddleware } from "next/server" +import { type NextMiddleware, NextResponse } from "next/server" import { findLang } from "@/constants/languages" import { env } from "@/env/server" import { badRequest, internalServerError } from "@/server/errors/next" + import { decryptData } from "@/utils/aes" import type { MiddlewareMatcher } from "@/types/middleware"