Merge pull request #10763 from carloshv93/hotfix/10172-reject_promise_in_checkError_with_logoutUser_false_and_without_redirectTo_causes_an_error

fix(useLogoutAccessDenied): handle errors without redirect

Author: slax57

packages/ra-core/src/auth/useLogoutIfAccessDenied.spec.tsx

@@ -258,4 +258,34 @@ describe('useLogoutIfAccessDenied', () => {
             expect(screen.queryByText('unauthorized')).not.toBeNull();
         });
     });
+
+    it('should stay on same page if error have no redirectTo', async () => {
+        render(
+            <TestMemoryRouter>
+                <AuthContext.Provider
+                    value={{
+                        ...authProvider,
+                        checkError: () => {
+                            return Promise.reject({
+                                logoutUser: false,
+                                message: 'Access denied',
+                            });
+                        },
+                    }}
+                >
+                    <Routes>
+                        <Route path="/" element={<TestComponent />} />
+                        <Route path="/login" element={<div>Login page</div>} />
+                    </Routes>
+                </AuthContext.Provider>
+            </TestMemoryRouter>
+        );
+        await waitFor(() => {
+            expect(authProvider.logout).toHaveBeenCalledTimes(0);
+            expect(notify).toHaveBeenCalledWith('Access denied', {
+                type: 'error',
+            });
+            expect(notify).toHaveBeenCalledTimes(1);
+        });
+    });
 });

packages/ra-core/src/auth/useLogoutIfAccessDenied.ts

@@ -43,6 +43,18 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
     const logout = useLogout();
     const notify = useNotify();
     const navigate = useNavigate();
+
+    const handleRedirect = useCallback(
+        (url: string) => {
+            if (url.startsWith('http')) {
+                window.location.href = url;
+            } else {
+                navigate(url);
+            }
+        },
+        [navigate]
+    );
+
     const logoutIfAccessDenied = useCallback(
         (error?: any) => {
             if (!authProvider) {
@@ -102,20 +114,14 @@ const useLogoutIfAccessDenied = (): LogoutIfAccessDenied => {
 
                     if (logoutUser) {
                         logout({}, redirectTo);
-                    } else {
-                        if (redirectTo.startsWith('http')) {
-                            // absolute link (e.g. https://my.oidc.server/login)
-                            window.location.href = redirectTo;
-                        } else {
-                            // internal location
-                            navigate(redirectTo);
-                        }
+                    } else if (redirectTo) {
+                        handleRedirect(redirectTo);
                     }
 
                     return true;
                 });
         },
-        [authProvider, logout, notify, navigate]
+        [authProvider, logout, notify, handleRedirect]
     );
     return logoutIfAccessDenied;
 };