Merge pull request #5248 from bardeutsch/fix-redirect-url-after-login

Changed code to use pathName first (if exists) for redirect after login
marmelab · Sep 16, 2020 · 5379985 · 5379985
2 parents d1aef1d + 2bc73cf
commit 5379985
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/ra-core/src/auth/useLogin.ts b/packages/ra-core/src/auth/useLogin.ts
@@ -34,9 +34,12 @@ const useLogin = (): Login => {
     const nextPathName = locationState && locationState.nextPathname;
 
     const login = useCallback(
-        (params: any = {}, pathName = defaultAuthParams.afterLoginUrl) =>
+        (params: any = {}, pathName) =>
             authProvider.login(params).then(ret => {
-                history.push(nextPathName || pathName);
+                const redirectUrl = pathName
+                    ? pathName
+                    : nextPathName || defaultAuthParams.afterLoginUrl;
+                history.push(redirectUrl);
                 return ret;
             }),
         [authProvider, history, nextPathName]