From dd02ae471e3a3b7f973189c54fe72d106bfe9d9f Mon Sep 17 00:00:00 2001
From: Ahmed Bouhuolia <a.bouhuolia@gmail.com>
Date: Mon, 6 May 2024 17:45:32 +0200
Subject: [PATCH] feat: redirect to the setup page if user is verified

---
 packages/webapp/src/components/App.tsx        |  5 +++-
 .../Guards/EnsureUserEmailNotVerified.tsx     | 24 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 packages/webapp/src/components/Guards/EnsureUserEmailNotVerified.tsx

diff --git a/packages/webapp/src/components/App.tsx b/packages/webapp/src/components/App.tsx
index 856f83686..4f43a8613 100644
--- a/packages/webapp/src/components/App.tsx
+++ b/packages/webapp/src/components/App.tsx
@@ -19,6 +19,7 @@ import { SplashScreen, DashboardThemeProvider } from '../components';
 import { queryConfig } from '../hooks/query/base';
 import { EnsureUserEmailVerified } from './Guards/EnsureUserEmailVerified';
 import { EnsureAuthNotAuthenticated } from './Guards/EnsureAuthNotAuthenticated';
+import { EnsureUserEmailNotVerified } from './Guards/EnsureUserEmailNotVerified';
 
 const EmailConfirmation = LazyLoader({
   loader: () => import('@/containers/Authentication/EmailConfirmation'),
@@ -38,7 +39,9 @@ function AppInsider({ history }) {
           <Switch>
             <Route path={'/auth/register/verify'}>
               <EnsureAuthenticated>
-                <RegisterVerify />
+                <EnsureUserEmailNotVerified>
+                  <RegisterVerify />
+                </EnsureUserEmailNotVerified>
               </EnsureAuthenticated>
             </Route>
 
diff --git a/packages/webapp/src/components/Guards/EnsureUserEmailNotVerified.tsx b/packages/webapp/src/components/Guards/EnsureUserEmailNotVerified.tsx
new file mode 100644
index 000000000..ac35b649f
--- /dev/null
+++ b/packages/webapp/src/components/Guards/EnsureUserEmailNotVerified.tsx
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Redirect } from 'react-router-dom';
+import { useAuthUserVerified } from '@/hooks/state';
+
+interface EnsureUserEmailNotVerifiedProps {
+  children: React.ReactNode;
+  redirectTo?: string;
+}
+
+/**
+ * Higher Order Component to ensure that the user's email is not verified.
+ * If is verified, redirects to the inner setup page.
+ */
+export function EnsureUserEmailNotVerified({
+  children,
+  redirectTo = '/',
+}: EnsureUserEmailNotVerifiedProps) {
+  const isAuthVerified = useAuthUserVerified();
+
+  if (isAuthVerified) {
+    return <Redirect to={{ pathname: redirectTo }} />;
+  }
+  return <>{children}</>;
+}