fix: reimplement callbackurl for redirect to signin

complexdatacollective · May 3, 2024 · ff3b90f · ff3b90f
1 parent c8e0429
commit ff3b90f
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/app/dashboard/interviews/page.tsx b/app/dashboard/interviews/page.tsx
@@ -7,7 +7,7 @@ import { requirePageAuth } from '~/utils/auth';
 
 export default async function InterviewPage() {
   await requireAppNotExpired();
-  await requirePageAuth();
+  await requirePageAuth({ redirectPath: '/dashboard/interviews' });
   return (
     <>
       <ResponsiveContainer>

diff --git a/app/dashboard/layout.tsx b/app/dashboard/layout.tsx
@@ -12,7 +12,7 @@ export const dynamic = 'force-dynamic';
 
 const Layout = async ({ children }: { children: React.ReactNode }) => {
   await requireAppNotExpired();
-  await requirePageAuth();
+  await requirePageAuth({ redirectPath: '/dashboard' });
 
   return (
     <>

diff --git a/app/dashboard/page.tsx b/app/dashboard/page.tsx
@@ -17,7 +17,7 @@ export default async function Home({
   searchParams: Record<string, string | string[] | undefined>;
 }) {
   await requireAppNotExpired();
-  await requirePageAuth();
+  await requirePageAuth({ redirectPath: '/dashboard' });
 
   searchParamsCache.parse(searchParams);
 

diff --git a/app/dashboard/participants/page.tsx b/app/dashboard/participants/page.tsx
@@ -8,7 +8,7 @@ import { requirePageAuth } from '~/utils/auth';
 
 export default async function ParticipantPage() {
   await requireAppNotExpired();
-  await requirePageAuth();
+  await requirePageAuth({ redirectPath: '/dashboard/participants' });
   return (
     <>
       <ResponsiveContainer>

diff --git a/app/dashboard/protocols/page.tsx b/app/dashboard/protocols/page.tsx
@@ -7,7 +7,7 @@ import { requirePageAuth } from '~/utils/auth';
 
 export default async function ProtocolsPage() {
   await requireAppNotExpired();
-  await requirePageAuth();
+  await requirePageAuth({ redirectPath: '/dashboard/protocols' });
   return (
     <>
       <ResponsiveContainer>

diff --git a/app/dashboard/settings/page.tsx b/app/dashboard/settings/page.tsx
@@ -15,7 +15,7 @@ import { requirePageAuth } from '~/utils/auth';
 
 export default async function Settings() {
   await requireAppNotExpired();
-  await requirePageAuth();
+  await requirePageAuth({ redirectPath: '/dashboard/settings' });
 
   const installationIdPromise = getInstallationId();
 

diff --git a/utils/auth.ts b/utils/auth.ts
@@ -82,7 +82,7 @@ export async function requirePageAuth(
       redirect('/signin');
     }
 
-    redirect('/signin');
+    redirect('/signin?callbackUrl=' + encodeURIComponent(redirectPath));
   }
   return session;
 }