diff --git a/lib/trpc/server.ts b/lib/trpc/server.ts index 61b75b2c7..765c5fbbe 100644 --- a/lib/trpc/server.ts +++ b/lib/trpc/server.ts @@ -35,6 +35,8 @@ export function serverClient() { redirect(redirectUrl) } + console.error("Unautorized on web, redirecting to login") + const pathname = ctx?.pathname || "/" redirect( `/${lang}/login?redirectTo=${encodeURIComponent(`/${lang}/${pathname}`)}` diff --git a/middlewares/webView.ts b/middlewares/webView.ts index 8f91387d0..d6ad52dac 100644 --- a/middlewares/webView.ts +++ b/middlewares/webView.ts @@ -35,6 +35,7 @@ export const middleware: NextMiddleware = async (request) => { const searchParams = new URLSearchParams(request.nextUrl.searchParams) searchParams.set("uri", pathNameWithoutLang) + const webviewToken = request.cookies.get("webviewToken") if (webviewToken) { // since the token exists, this is a subsequent visit @@ -82,6 +83,8 @@ export const middleware: NextMiddleware = async (request) => { ) headers.set("Cookie", `webviewToken=${decryptedData}`) + console.log("IN WEBVIEW MIDDLEWARE", decryptedData) + if (myPagesWebviews.includes(nextUrl.pathname)) { return NextResponse.rewrite( new URL( diff --git a/server/context.ts b/server/context.ts index f70a054a4..2791a994c 100644 --- a/server/context.ts +++ b/server/context.ts @@ -38,6 +38,13 @@ export function createContext() { const cookie = cookies() const webviewTokenCookie = cookie.get("webviewToken") + console.log("IN CONTEXT", { + lang: h.get("x-lang") as Lang, + pathname: h.get("x-pathname")!, + url: h.get("x-url")!, + webviewToken: cookie.get("webviewToken"), + }) + return createContextInner({ auth, lang: h.get("x-lang") as Lang,