Merge pull request #7642 from marmelab/fix-use-configure-admin-router…

…-from-children-permissions

Simplify useConfigureAdminRouterFromChildren permissions

packages/ra-core/src/core/useConfigureAdminRouterFromChildren.tsx

@@ -10,7 +10,7 @@ import {
     useEffect,
     useState,
 } from 'react';
-import { useLogout, useGetPermissions, useAuthState } from '../auth';
+import { useLogout, usePermissions, useAuthState } from '../auth';
 import { useSafeSetState } from '../util';
 import {
     AdminChildren,
@@ -43,7 +43,7 @@ import { useResourceDefinitionContext } from './useResourceDefinitionContext';
 export const useConfigureAdminRouterFromChildren = (
     children: AdminChildren
 ): RoutesAndResources & { status: AdminRouterStatus } => {
-    const permissions = usePermissionsWithLogout();
+    const { permissions } = usePermissions();
 
     // Whenever children are updated, update our custom routes and resources
     const [routesAndResources, status] = useRoutesAndResourcesFromChildren(
@@ -62,25 +62,6 @@ export const useConfigureAdminRouterFromChildren = (
     };
 };
 
-const usePermissionsWithLogout = () => {
-    const getPermissions = useGetPermissions();
-    const doLogout = useLogout();
-    const [permissions, setPermissions] = useState<any>();
-
-    useEffect(() => {
-        getPermissions()
-            .then(newPermissions => {
-                setPermissions(newPermissions);
-            })
-            .catch(error => {
-                console.error(error);
-                doLogout();
-            });
-    }, [doLogout, getPermissions]);
-
-    return permissions;
-};
-
 /**
  * A hook that determine the routes and resources from React nodes and permissions.
  * Returns a tuple with the routes and resources as a single object, and the status.