Merge pull request #23 from SalamanderHP/jol51.sidebar_authorization

JOL51: Sidebar authorization
sagara11 · Feb 22, 2022 · fe9ff49 · fe9ff49
2 parents ac1fe4e + 990ec2d
commit fe9ff49
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 39 deletions.
diff --git a/client/src/components/Sidebar/index.jsx b/client/src/components/Sidebar/index.jsx
@@ -8,9 +8,12 @@ import {MdDocumentScanner} from "react-icons/md";
 import {NavLink} from "react-router-dom";
 import {globalState} from "../../features/global/globalSlice";
 import {useSelector} from "react-redux";
+import { authorizationState } from '../../features/authorization/authorizationSlice';
 
 function Sidebar() {
-  const {currentUser} = useSelector(globalState);
+  const { currentUser } = useSelector(globalState);
+  const { userRole } = useSelector(authorizationState);
+
   return (
     <>
       <div className="sidebar__wrapper">
@@ -43,40 +46,48 @@ function Sidebar() {
               <AiFillSafetyCertificate className="sidebar__icon" />
             </NavLink>
             {/* Doctor icons */}
-            <NavLink
-              to="/medical-records"
-              className={(isActive) =>
-                "sidebar__item" + (isActive ? " active-item" : "")
-              }
-            >
-              <IoDocumentsSharp className="sidebar__icon" />
-            </NavLink>
-            <NavLink
-              to="/vaccination-certificates"
-              className={(isActive) =>
-                "sidebar__item" + (isActive ? " active-item" : "")
-              }
-            >
-              <AiFillSafetyCertificate className="sidebar__icon" />
-            </NavLink>
+            {userRole.includes(process.env.REACT_APP_ROLE_DOCTOR) &&
+              <NavLink
+                to="/medical-records"
+                className={(isActive) =>
+                  "sidebar__item" + (isActive ? " active-item" : "")
+                }
+              >
+                <IoDocumentsSharp className="sidebar__icon" />
+              </NavLink>
+            }
+            {userRole.includes(process.env.REACT_APP_ROLE_DOCTOR) &&
+              <NavLink
+                to="/vaccination-certificates"
+                className={(isActive) =>
+                  "sidebar__item" + (isActive ? " active-item" : "")
+                }
+              >
+                <AiFillSafetyCertificate className="sidebar__icon" />
+              </NavLink>
+            }
             {/* Manager icons */}
-            <NavLink
-              to="/doctors"
-              className={(isActive) =>
-                "sidebar__item" + (isActive ? " active-item" : "")
-              }
-            >
-              <BsPeopleFill className="sidebar__icon" />
-            </NavLink>
+            {userRole.includes(process.env.REACT_APP_ROLE_MANAGER) &&
+              <NavLink
+                to="/doctors"
+                className={(isActive) =>
+                  "sidebar__item" + (isActive ? " active-item" : "")
+                }
+              >
+                <BsPeopleFill className="sidebar__icon" />
+              </NavLink>
+            }
             {/* Admin icons */}
-            <NavLink
-              to="/managers"
-              className={(isActive) =>
-                "sidebar__item" + (isActive ? " active-item" : "")
-              }
-            >
-              <BsFillPersonPlusFill className="sidebar__icon" />
-            </NavLink>
+            {userRole.includes(process.env.REACT_APP_ROLE_ADMIN) &&
+              <NavLink
+                to="/managers"
+                className={(isActive) =>
+                  "sidebar__item" + (isActive ? " active-item" : "")
+                }
+              >
+                <BsFillPersonPlusFill className="sidebar__icon" />
+              </NavLink>
+            }
           </div>
           <div className="sidebar-bottom">
             <NavLink

diff --git a/client/src/features/authorization/authorizationSlice.js b/client/src/features/authorization/authorizationSlice.js
@@ -67,16 +67,16 @@ export const authorizationSlice = createSlice({
         alert(action.error.message);
       })
       .addCase(getCurrentUserRole.fulfilled, (state, action) => {
-        if(action.payload[0] === '1') {
+        if(action.payload[0] === '1' && !state.userRole.includes(process.env.REACT_APP_ROLE_PATIENT)) {
           state.userRole.push(process.env.REACT_APP_ROLE_PATIENT);
         }
-        if(action.payload[1] === '1') {
+        if(action.payload[1] === '1' && !state.userRole.includes(process.env.REACT_APP_ROLE_DOCTOR)) {
           state.userRole.push(process.env.REACT_APP_ROLE_DOCTOR);
         }
-        if(action.payload[2] === '1') {
+        if(action.payload[2] === '1' && !state.userRole.includes(process.env.REACT_APP_ROLE_MANAGER)) {
           state.userRole.push(process.env.REACT_APP_ROLE_MANAGER);
         }
-        if(action.payload[3] === '1') {
+        if(action.payload[3] === '1' && !state.userRole.includes(process.env.REACT_APP_ROLE_ADMIN)) {
           state.userRole.push(process.env.REACT_APP_ROLE_ADMIN);
         }
         console.log(`Current user role: ${state.userRole}`);

diff --git a/client/src/pages/HomePage/index.jsx b/client/src/pages/HomePage/index.jsx
@@ -42,7 +42,7 @@ function HomePage() {
             </section>
             <section className="home__section post__section">
               <div className="background-image">
-                <img src="covid19-iniciativas-innovacion-social.jpg" alt="" />
+                <img src="/covid19-iniciativas-innovacion-social.jpg" alt="" />
               </div>
               <div className="background-cover">
                 <div className="post-header">Post title: Research of Covid19 variant</div>

diff --git a/server/app/controllers/AuthenticationController.js b/server/app/controllers/AuthenticationController.js
@@ -34,7 +34,7 @@ class AuthenticationController {
     return res.status(200).json(req.account);
   }
 
-  async refreshToken(req, res) {
+  async refreshToken(req, res, next) {
     const refreshToken = req.body.refreshToken;
     const accessToken = await authenticationServices.refreshTokenHandle(
       refreshToken