From ef904e4e38509921ff7fe2b4c5dcb81cfeade7cb Mon Sep 17 00:00:00 2001
From: GotPPay <bilal.catic@hotmail.com>
Date: Fri, 25 May 2018 17:15:31 +0200
Subject: [PATCH] fix getting roles

---
 src/components/Sidenav/SidenavContent.js  | 64 ++++++++++++-----------
 src/utils/authorization/normalizeRoles.js |  2 +-
 2 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/components/Sidenav/SidenavContent.js b/src/components/Sidenav/SidenavContent.js
index f017ccb..5a4becf 100644
--- a/src/components/Sidenav/SidenavContent.js
+++ b/src/components/Sidenav/SidenavContent.js
@@ -101,10 +101,10 @@ class SidebarContent extends React.Component {
 
     return (
       <ul className="nav" ref={(c) => { this.nav = c; }}>
-        {loggedUser.anyOf(planScheduler, visitReporter) &&
+        {loggedUser.anyOf(visitReporter) &&
           <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
         }
-        {!loggedUser.anyOf(planScheduler, visitReporter) &&
+        {!loggedUser.anyOf(visitReporter) &&
           <li>
             <FlatButton href="#/app/form"><i className="nav-icon material-icons cyan-text text-lighter-4">directions_car</i><span className="nav-text">Rides</span></FlatButton>
             <ul>
@@ -113,7 +113,7 @@ class SidebarContent extends React.Component {
             </ul>
           </li>
         }
-        {!loggedUser.anyOf(planScheduler, visitReporter) &&
+        {!loggedUser.anyOf(visitReporter) &&
           <li>
             <FlatButton href="#/app/chart"><i className="nav-icon material-icons">people_outline</i><span className="nav-text">Members</span></FlatButton>
             <ul>
@@ -122,36 +122,40 @@ class SidebarContent extends React.Component {
             </ul>
           </li>
         }
-        <li>
-          <FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton>
-          <ul>
-            <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
-            <li> <FlatButton className="prepend-icon" href="#/app/table/visits"><span className="nav-text">Manage Visits</span></FlatButton></li>
-          </ul>
-        </li>
+        {!loggedUser.anyOf(visitReporter) &&
+          <li>
+            <FlatButton href="#/app/chart"><i className="nav-icon material-icons">schedule</i><span className="nav-text">Visits</span></FlatButton>
+            <ul>
+              <li><FlatButton className="prepend-icon" href={"#/app/form/visit/" + this.state.user.useruuid}><span>Create Visit</span></FlatButton></li>
+              <li> <FlatButton className="prepend-icon" href="#/app/table/visits"><span className="nav-text">Manage Visits</span></FlatButton></li>
+            </ul>
+          </li>
+        }
 
-        <li>
-          <FlatButton href="#/app/chart"><i className="nav-icon material-icons">settings</i><span className="nav-text">Manage</span></FlatButton>
-          <ul>
-            {!loggedUser.anyOf(planScheduler, providerScheduler) &&
+        {!loggedUser.anyOf(visitReporter) &&
+          <li>
+            <FlatButton href="#/app/chart"><i className="nav-icon material-icons">settings</i><span className="nav-text">Manage</span></FlatButton>
+            <ul>
+              {!loggedUser.anyOf(planScheduler, providerScheduler) &&
+                <li>
+                  <FlatButton href="#/app/table/authorizedusers"><i className="nav-icon material-icons">people</i><span className="nav-text">Authorized Users</span></FlatButton>
+                </li>
+              }
               <li>
-                <FlatButton href="#/app/table/authorizedusers"><i className="nav-icon material-icons">people</i><span className="nav-text">Authorized Users</span></FlatButton>
+                <FlatButton href="#/app/table/organizations"><i className="nav-icon material-icons">assignment</i><span className="nav-text">Organizations</span></FlatButton>
               </li>
-            }
-            <li>
-              <FlatButton href="#/app/table/organizations"><i className="nav-icon material-icons">assignment</i><span className="nav-text">Organizations</span></FlatButton>
-            </li>
-            <li>
-              <FlatButton href="#/app/table/provider"><i className="nav-icon material-icons">local_hospital</i><span className="nav-text">Participating Providers</span></FlatButton>
-            </li>
-            <li>
-              <FlatButton href={"#/app/authorizedusers/" + this.state.user.useruuid}><i className="nav-icon material-icons">account_circle</i><span className="nav-text">Profile</span></FlatButton>
-            </li>
-            {/* <li>
-              <FlatButton href="#/app/dashboard"><i className="nav-icon material-icons">equalizer</i><span className="nav-text">Reports</span></FlatButton>
-            </li> */}
-          </ul>
-        </li>
+              <li>
+                <FlatButton href="#/app/table/provider"><i className="nav-icon material-icons">local_hospital</i><span className="nav-text">Participating Providers</span></FlatButton>
+              </li>
+              <li>
+                <FlatButton href={"#/app/authorizedusers/" + this.state.user.useruuid}><i className="nav-icon material-icons">account_circle</i><span className="nav-text">Profile</span></FlatButton>
+              </li>
+              {/* <li>
+                <FlatButton href="#/app/dashboard"><i className="nav-icon material-icons">equalizer</i><span className="nav-text">Reports</span></FlatButton>
+              </li> */}
+            </ul>
+          </li>
+        }
 
         <li className="nav-divider" />
       </ul>
diff --git a/src/utils/authorization/normalizeRoles.js b/src/utils/authorization/normalizeRoles.js
index 4071129..135a705 100644
--- a/src/utils/authorization/normalizeRoles.js
+++ b/src/utils/authorization/normalizeRoles.js
@@ -11,7 +11,7 @@ const normalizeRoles = (profiles) => {
   }
 
   if (roleKeys.length === 1) {
-    return profiles[roleKeys[0]].authorize;
+    return profiles[roleKeys[0]].roles;
   }
 
   const roles = profiles.reduce((result, profile) => {