bug fixes

kpi-ua · Jan 31, 2025 · 6045ae5 · 6045ae5
1 parent 918de85
commit 6045ae5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/app/[locale]/(private)/accept-honor/page.tsx b/src/app/[locale]/(private)/accept-honor/page.tsx
@@ -35,7 +35,7 @@ export default function CodeOfHonorAlert() {
       return;
     }
     setUser(res);
-    router.refresh();
+    router.push('/');
   };
 
   return (

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -81,18 +81,21 @@ const authMiddleware = (request: NextRequest) => {
 };
 
 const CoHMiddleware = async (request: NextRequest) => {
-  const user = await getUserDetails();
-  const hasAcceptedCoH = Boolean(user?.codeOfHonorSignDate && user?.studentProfile);
+  try {
+    const user = await getUserDetails();
+    const hasAcceptedCoH = !!user?.codeOfHonorSignDate;
 
-  if (!hasAcceptedCoH && !isAcceptHonorPath(request)) {
-    return redirectWithIntl(request, '/accept-honor');
-  }
+    if (!hasAcceptedCoH && !isAcceptHonorPath(request)) {
+      return redirectWithIntl(request, '/accept-honor');
+    }
 
-  if (hasAcceptedCoH && isAcceptHonorPath(request)) {
-    return redirectWithIntl(request, '/');
+    if ((!user?.studentProfile || hasAcceptedCoH) && isAcceptHonorPath(request)) {
+      return redirectWithIntl(request, '/');
+    }
+  } catch (error) {
+    return null;
   }
-
-  return null;
+  return intlMiddleware(request);
 };
 
 export async function middleware(request: NextRequest) {