Show registration page if no admin account exists (#582)

Dusk-Labs · Nov 29, 2023 · 5bf5b3b · 5bf5b3b
1 parent aa0743b
commit 5bf5b3b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/ui/src/Pages/Auth/Register.jsx b/ui/src/Pages/Auth/Register.jsx
@@ -84,7 +84,7 @@ function Register(props) {
           credentials={[username, pass, invite]}
           error={[setUsernameErr, setPassErr, setInviteErr]}
         />
-        <Link to="/login">I have an account</Link>
+        {auth.admin_exists && <Link to="/login">I have an account</Link>}
       </footer>
     </div>
   );

diff --git a/ui/src/Pages/Preferences/Account/DelAccountBtn.jsx b/ui/src/Pages/Preferences/Account/DelAccountBtn.jsx
@@ -25,7 +25,7 @@ function DelAccountBtn() {
     (async () => {
       if (deleteAccount.deleted && !deleteAccount.error) {
         await dispatch(logout());
-        history.push("/login");
+        window.location.href = "/";
       }
     })();
   }, [deleteAccount, dispatch, history]);

diff --git a/ui/src/Routes/Private.jsx b/ui/src/Routes/Private.jsx
@@ -2,7 +2,7 @@ import { useEffect } from "react";
 import { Route, useHistory } from "react-router-dom";
 import { useDispatch, useSelector } from "react-redux";
 
-import { updateAuthToken } from "../actions/auth.js";
+import { checkAdminExists, updateAuthToken } from "../actions/auth.js";
 import { fetchUser } from "../actions/user.js";
 
 function PrivateRoute(props) {
@@ -21,7 +21,7 @@ function PrivateRoute(props) {
     ?.split("=")[1];
 
   const { logged_in, error } = auth.login;
-  const { token } = auth;
+  const { token, admin_exists } = auth;
 
   useEffect(() => {
     if (tokenInCookie && !token) {
@@ -40,9 +40,18 @@ function PrivateRoute(props) {
     }
 
     if (!token && !tokenInCookie) {
-      history.push("/login");
+      switch (admin_exists) {
+        case true:
+          history.push("/login");
+          return;
+        case false:
+          history.push("/register");
+          return;
+        default:
+          return;
+      }
     }
-  }, [error, history, logged_in, token, tokenInCookie, dispatch]);
+  }, [error, history, logged_in, token, tokenInCookie, admin_exists, dispatch]);
 
   // auto logout when logged out in another tab
   useEffect(() => {
@@ -88,6 +97,7 @@ function PrivateRoute(props) {
   }, [history.location.pathname]);
 
   useEffect(() => {
+    dispatch(checkAdminExists());
     dispatch(fetchUser());
   }, [dispatch]);
 

diff --git a/ui/src/reducers/auth.js b/ui/src/reducers/auth.js
@@ -53,7 +53,7 @@ const deleteAccount = {
 
 const initialState = {
   token: null,
-  admin_exists: false,
+  admin_exists: null,
   login,
   register,
   createNewInvite,