Fix reload loop

Author: desmondsow

dockerfiles/Dockerfile.development

@@ -5,8 +5,14 @@ FROM node:${NODE_VERSION}
 
 LABEL com.iotportaldevicemanagement.product="iotportaldevicemanagement"
 
+ARG NEXT_PUBLIC_VERSION=2.0.0
+
 ENV NODE_ENV=development
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_PUBLIC_VERSION=${NEXT_PUBLIC_VERSION}
+
+# TODO: Implement API from ARG build
+#ENV NEXT_PUBLIC_BACKEND_URL=${NEXT_PUBLIC_BACKEND_URL}
 
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why
 # libc6-compat might be needed.

dockerfiles/Dockerfile.production

@@ -21,8 +21,15 @@ RUN set -eux; \
 
 COPY . .
 
+ARG NEXT_PUBLIC_VERSION=2.0.0
+
+ENV NODE_ENV=production
 # Disable telemetry. Learn more here: https://nextjs.org/telemetry
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_PUBLIC_VERSION=${NEXT_PUBLIC_VERSION}
+
+# TODO: Implement API_URL from ARG build
+#ENV NEXT_PUBLIC_BACKEND_URL=${NEXT_PUBLIC_BACKEND_URL}
 
 RUN npm run build
 
@@ -31,8 +38,14 @@ FROM node:${NODE_VERSION} AS runner
 
 LABEL com.iotportaldevicemanagement.product="iotportaldevicemanagement"
 
+ARG NEXT_PUBLIC_VERSION=2.0.0
+
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV NEXT_PUBLIC_VERSION=${NEXT_PUBLIC_VERSION}
+
+# TODO: Implement API_URL from ARG build
+#ENV NEXT_PUBLIC_BACKEND_URL=${NEXT_PUBLIC_BACKEND_URL}
 
 WORKDIR /app
 

src/hooks/useAuth.ts

@@ -51,7 +51,8 @@ export const useAuth = ({ middleware, redirectIfAuthenticated }: UseAuthProps) =
         if (error.response.status !== 409)
           throw error;
 
-        router.push('/verify-email');
+        if (window.location.pathname !== '/verify-email')
+          router.push('/verify-email');
       })
   );
 
@@ -143,13 +144,22 @@ export const useAuth = ({ middleware, redirectIfAuthenticated }: UseAuthProps) =
         .then(() => mutate());
     }
 
-    window.location.pathname = '/login';
+    if (window.location.pathname !== '/login')
+      window.location.pathname = '/login';
   };
 
   useEffect(() => {
-    if (middleware === 'guest' && redirectIfAuthenticated && user) router.push(redirectIfAuthenticated);
-    if (middleware === 'auth' && redirectIfAuthenticated && user) router.push(redirectIfAuthenticated);
-    if (middleware === 'auth' && error) logout();
+    if (
+      middleware === 'guest' &&
+      redirectIfAuthenticated &&
+      user &&
+      !error &&
+      window.location.pathname !== redirectIfAuthenticated
+    )
+      router.push(redirectIfAuthenticated);
+
+    if (middleware === 'auth' && error)
+      logout();
   }, [user, error]);
 
   return {

src/pages/verify-email.tsx

@@ -20,7 +20,6 @@ const VerifyEmailPage: NextPageWithLayout = () => {
 
   const { logout, resendEmailVerification } = useAuth({
     middleware: 'auth',
-    redirectIfAuthenticated: '/',
   });
 
   return (