Feature/issue #441

client/src/App.js

@@ -6,15 +6,22 @@ import { useAuthContext } from "contexts/AuthContext";
 import LandingPage from "pages/LandingPage";
 import CalendarPage from "pages/CalendarPage";
 import { AdminDashboard } from "pages/AdminDashboard";
+// eslint-disable-next-line
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 
 function App() {
  const auth = useAuthContext();
  const isAuthenticated = auth.isAuthenticated();
  const isNot100Dever = auth.isNot100Dever();
  const deleteNeedsToBeWelcome = auth.deleteNeedsToBeWelcome;
+
+ /* from feature-#441 implementation of testing needed before isAdmin and isLoading can be used
+ const isAdmin = auth.isAdmin; 
+ const isLoading = auth.loading; // Destructure loading from auth 
+ */
+
  //Sets rejection modal to true because updating state is a pain
- //Line 49 will prevent the modal from rendering unless user is not 100Dever
+ //Line 65 will prevent the modal from rendering unless user is not 100Dever
  const [rejectionModalOpen, setRejectionModalOpen] = useState(true);
  const rejectionModalContext = {
  isOpen: rejectionModalOpen,
@@ -34,12 +41,21 @@ function App() {
  if (auth.user) setWelcomeUserModalOpen(auth.needsToBeWelcome());
  }, [auth]);
 
+ /* from featute-#441 implementation of testing for user that has admin role needed before use.
+ if (isLoading) {
+ return <div>Loading...</div>; // Render a loading indicator while fetching user data
+ }
+ */
+
  return (
  <>
  <Routes>
  <Route path="/" element={<LandingPage />} />
  <Route path="/calendar" element={<CalendarPage />} />
+ {/* From feature-#441 Not included now because testing needs to be implemented that logs in a user with admin role */}
+ {/* {isAdmin() && ( */}
  <Route path="/adminDashboard" element={<AdminDashboard />} />
+ {/* )} */}
  </Routes>
  {isAuthenticated && (
  <Modal context={welcomeUserModalContext}>

client/src/contexts/AuthContext/useProvideAuth.js

@@ -8,13 +8,15 @@ import { useNavigate } from "react-router-dom";
 const useProvideAuth = () => {
  const [user, setUser] = useState(null);
  const navigate = useNavigate();
+ const [loading, setLoading] = useState(true);
 
  // Check if there is already a user session
  useEffect(() => {
  // If so, save user's information to the context
  DataService.getCurrentUser().then(response => {
  console.log(response.data);
  setUser(response.data);
+ setLoading(false); // set loading to false after fetching user data
  });
  }, []);
 
@@ -48,13 +50,20 @@ const useProvideAuth = () => {
  DataService.deleteNeedsToBeWelcome();
  };
 
+ // Check if user is not null and user has role of admin.
+ const isAdmin = () => {
+ return user ? user.role === "admin" : false;
+ };
+
  return {
  user,
  logout,
  isAuthenticated,
+ isAdmin,
  isNot100Dever,
  needsToBeWelcome,
  deleteNeedsToBeWelcome,
+ loading,
  };
 };
 

client/src/index.js

@@ -7,6 +7,7 @@ import ModalProvider from "contexts/ModalContext";
 import EventsProvider from "contexts/EventsContext";
 import FormModalProvider from "contexts/FormModalContext";
 import { createRoot } from "react-dom/client";
+// eslint-disable-next-line no-unused-vars
 import { BrowserRouter as Router, Routes, Route } from "react-router-dom";
 
 const rootElement = document.getElementById("root");

server/config/mockUser.json

@@ -5,5 +5,6 @@
  "discordId": "9999999999999999",
  "avatar": "450a0b622a7c905c4c75e190cb21f2df",
  "bio": "",
- "__v": 0
+ "__v": 0,
+ "role": "admin"
 }

server/config/passport.js

@@ -52,6 +52,7 @@ module.exports = function (passport) {
  socials: [],
  bio: "",
  needsToBeWelcome: true,
+ role: "user",
  });
 
  return cb(null, user);

server/models/User.js

@@ -7,6 +7,11 @@ const UserSchema = new mongoose.Schema({
  socials: [{ type: String }],
  bio: { type: String },
  needsToBeWelcome: { type: String },
+ role: {
+ type: String,
+ enum: ["user", "moderator", "admin", "superadmin"],
+ default: "user",
+ },
 });
 
 UserSchema.virtual("avatarURL").get(function () {