chore: added fix to the redirect functionality

interledger · Aug 22, 2024 · 715fe11 · 715fe11
1 parent adbb734
commit 715fe11
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/frontend/app/lib/kratos_checks.server.ts b/packages/frontend/app/lib/kratos_checks.server.ts
@@ -34,7 +34,7 @@ export async function checkAuthAndRedirect(
   const { pathname } = new URL(url)
   const isAuthPath = pathname.startsWith('/auth')
   const isSettingsPage = pathname.includes('/settings')
-  const isLogoutPage = pathname.includes('/logout')
+  const isLogoutPage = pathname.includes('logout')
 
   if (!variables.authEnabled) {
     // If auth is disabled users shouldn't accesses the auth path or Kratos settings pages
@@ -45,7 +45,6 @@ export async function checkAuthAndRedirect(
     }
   }
 
-  // auth is enabled
   const loggedIn = await isLoggedIn(cookieHeader)
 
   // Logged-in users can access all pages except auth pages, with the exception of the manual logout page
@@ -55,8 +54,8 @@ export async function checkAuthAndRedirect(
     }
     return
   } else {
-    // Unauthenticated users can only access auth path pages
-    if (!isAuthPath) {
+    // Users who are not logged in can only access auth path pages and cannot logout
+    if (!isAuthPath || isLogoutPage) {
       throw redirect('/auth')
     }
     return

diff --git a/packages/frontend/app/routes/auth.manual-logout.tsx b/packages/frontend/app/routes/auth.manual-logout.tsx
@@ -6,6 +6,7 @@ import { checkAuthAndRedirect } from '../lib/kratos_checks.server'
 export const loader = async ({ request }: LoaderFunctionArgs) => {
   const cookies = request.headers.get('cookie')
   await checkAuthAndRedirect(request.url, cookies)
+  return null
 }
 
 export default function Logout() {