fixes bug with permissions being loaded before user is logged in

This commit is contained in:
James
2020-06-15 14:31:23 -04:00
parent 8016436433
commit 2233a61e81
2 changed files with 7 additions and 4 deletions

View File

@@ -26,7 +26,7 @@ const {
const Routes = () => {
const [initialized, setInitialized] = useState(null);
const { user, permissions: { canAccessAdmin } } = useUser();
const { user, permissions, permissions: { canAccessAdmin } } = useUser();
useEffect(() => {
requests.get(`${routes.api}/${userSlug}/init`).then(res => res.json().then((data) => {

View File

@@ -33,7 +33,9 @@ const isNotExpired = decodedJWT => (decodedJWT?.exp || 0) > Date.now() / 1000;
const UserProvider = ({ children }) => {
const [token, setToken] = useState('');
const [user, setUser] = useState(null);
const [permissions, setPermissions] = useState({});
const [permissions, setPermissions] = useState({ canAccessAdmin: null });
const { pathname } = useLocation();
const history = useHistory();
const { open: openModal, closeAll: closeAllModals } = useModal();
@@ -105,7 +107,9 @@ const UserProvider = ({ children }) => {
}
}
getPermissions();
if (email) {
getPermissions();
}
}, [email]);
useEffect(() => {
@@ -131,7 +135,6 @@ const UserProvider = ({ children }) => {
if (remainingTime > 0) {
forceLogOut = setTimeout(() => {
console.log('logging out');
logOut();
history.push(`${admin}/logout`);
closeAllModals();