fix(app-security): handle cases when identity is not available

webiny · Nov 3, 2021 · d6578fe · d6578fe
1 parent f87635e
commit d6578fe
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/packages/app-security/src/contexts/Security.tsx b/packages/app-security/src/contexts/Security.tsx
@@ -15,6 +15,10 @@ export const SecurityProvider = props => {
 
     const getPermission = useCallback(
         <T extends SecurityPermission = SecurityPermission>(name: string): T => {
+            if (!identity) {
+                return null;
+            }
+
             const perms = identity.permissions || [];
             const exactMatch = perms.find(p => p.name === name);
             if (exactMatch) {
@@ -29,11 +33,13 @@ export const SecurityProvider = props => {
 
     const value = useMemo(
         () => ({
-            identity: {
-                ...identity,
-                // For backwards compatibility, expose the `getPermission` method on the `identity` object.
-                getPermission: getPermission as any
-            },
+            identity: identity
+                ? {
+                      ...identity,
+                      // For backwards compatibility, expose the `getPermission` method on the `identity` object.
+                      getPermission: getPermission as any
+                  }
+                : null,
             setIdentity,
             getPermission
         }),