From 4de258156c465e98ece1a42ea7fe5529512c42a9 Mon Sep 17 00:00:00 2001
From: Markus Thielker <mail.markus.thielker@gmail.com>
Date: Mon, 2 Dec 2024 16:42:48 +0100
Subject: [PATCH] NORY-20: improve authentication middleware

---
 authentication/src/middleware.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/authentication/src/middleware.ts b/authentication/src/middleware.ts
index 676100f..d7cd027 100644
--- a/authentication/src/middleware.ts
+++ b/authentication/src/middleware.ts
@@ -1,6 +1,6 @@
 import { NextRequest, NextResponse } from 'next/server';
-import { getFrontendApi } from 'ory/sdk/server';
 import { cookies } from 'next/headers';
+import { getFrontendApi } from '@/ory/sdk/server';
 
 export async function middleware(request: NextRequest) {
 
@@ -26,6 +26,17 @@ export async function middleware(request: NextRequest) {
         return NextResponse.redirect(url);
     }
 
+    if (session && request.nextUrl.pathname.startsWith('/flow')) {
+
+        console.log('SESSION EXISTS');
+
+        const returnTo = request.nextUrl.searchParams.get('return_to') ?? request.nextUrl.host;
+
+        console.log('REDIRECT TO', returnTo);
+
+        return NextResponse.redirect(returnTo);
+    }
+
     return NextResponse.next();
 }