move CoH check to middleware

kpi-ua · Jan 31, 2025 · e6794c0 · e6794c0
1 parent 34ed1f7
commit e6794c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 14 deletions.
diff --git a/src/components/code-of-honor-alert.tsx → .../[locale]/(private)/accept-honor/page.tsx b/src/components/code-of-honor-alert.tsx → .../[locale]/(private)/accept-honor/page.tsx
@@ -9,7 +9,6 @@ import { acceptCodeOfHonor } from '@/actions/profile.actions';
 import {
   AlertDialog,
   AlertDialogAction,
-  AlertDialogCancel,
   AlertDialogContent,
   AlertDialogDescription,
   AlertDialogFooter,
@@ -52,9 +51,6 @@ export default function CodeOfHonorAlert() {
           </AlertDialogDescription>
         </AlertDialogHeader>
         <AlertDialogFooter>
-          <Link href="/">
-            <AlertDialogCancel>{t('button.go-to-home')}</AlertDialogCancel>
-          </Link>
           <AlertDialogAction onClick={handleAcceptCodeOfHonor}>{t('button.agree')}</AlertDialogAction>
         </AlertDialogFooter>
       </AlertDialogContent>

diff --git a/src/app/[locale]/(private)/sub-layout.tsx b/src/app/[locale]/(private)/sub-layout.tsx
@@ -9,8 +9,6 @@ import {
 import { cn } from '@/lib/utils';
 import React from 'react';
 import { getTranslations } from 'next-intl/server';
-import { getUserDetails } from '@/actions/auth.actions';
-import CodeOfHonorAlert from '@/components/code-of-honor-alert';
 
 interface SubLayoutProps {
   children: React.ReactNode;
@@ -21,11 +19,6 @@ interface SubLayoutProps {
 
 export const SubLayout = async ({ children, breadcrumbs = [], pageTitle, className }: SubLayoutProps) => {
   const t = await getTranslations('global.menu');
-  const user = await getUserDetails();
-
-  if (!user?.codeOfHonorSignDate && !!user?.studentProfile) {
-    return <CodeOfHonorAlert />;
-  }
 
   return (
     <section>

diff --git a/src/messages/en.json b/src/messages/en.json
@@ -235,7 +235,6 @@
         "add-new": "Add new",
         "edit": "Edit",
         "agree": "Agree",
-        "go-to-home": "Go to homepage",
         "logout": "Logout"
       },
       "placeholder": {

diff --git a/src/messages/uk.json b/src/messages/uk.json
@@ -236,7 +236,6 @@
         "add-new": "Додати новий",
         "edit": "Редагувати",
         "agree": "Погоджуюсь",
-        "go-to-home": "На головну",
         "logout": "Вийти"
       },
       "placeholder": {

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -5,6 +5,7 @@ import JWT from 'jsonwebtoken';
 import createMiddleware from 'next-intl/middleware';
 import dayjs from 'dayjs';
 import { trim } from 'radash';
+import { getUserDetails } from '@/actions/auth.actions';
 
 const intlMiddleware = createMiddleware(routing);
 
@@ -16,6 +17,8 @@ const composePathsRegExp = (paths: string[]) => RegExp(`^(/(${LOCALES.join('|')}
 
 const rootRegExp = new RegExp('^\/?$', 'i');
 
+const honorPageRegExp = composePathsRegExp(['/accept-honor']);
+
 const authPathRegExp = composePathsRegExp(['/login', '/password-reset/success', '/password-reset']);
 
 const publicPathRegExp = composePathsRegExp([
@@ -32,6 +35,7 @@ const publicPathRegExp = composePathsRegExp([
 const isRoot = (request: NextRequest) => rootRegExp.test(request.nextUrl.pathname);
 const isPublicPath = (request: NextRequest) => publicPathRegExp.test(request.nextUrl.pathname);
 const isAuthPath = (request: NextRequest) => authPathRegExp.test(request.nextUrl.pathname);
+const isAcceptHonorPath = (request: NextRequest) => honorPageRegExp.test(request.nextUrl.pathname);
 
 const isAuthenticated = (request: NextRequest) => {
   const cookie = request.cookies.get('token');
@@ -76,8 +80,21 @@ const authMiddleware = (request: NextRequest) => {
   return intlMiddleware(request);
 };
 
+const honorMiddleware = async (request: NextRequest) => {
+  try {
+    const user = await getUserDetails();
+
+    if (!user?.codeOfHonorSignDate && !!user?.studentProfile) {
+      return redirectWithIntl(request, '/accept-honor');
+    }
+  } catch (error) {
+    return intlMiddleware(request);
+  }
+  return intlMiddleware(request);
+};
+
 export async function middleware(request: NextRequest) {
-  // If it's a root path — proces it with i18n middleware first
+  // If it's a root path — process it with i18n middleware first
   if (isRoot(request)) {
     return intlMiddleware(request);
   }
@@ -90,5 +107,11 @@ export async function middleware(request: NextRequest) {
     return intlMiddleware(request);
   }
 
+  await honorMiddleware(request);
+
+  if (isAcceptHonorPath(request)) {
+    return redirectWithIntl(request, '/');
+  }
+
   return (authMiddleware as any)(request);
 }