Fix multiple redirect events on auth error

marmelab · Mar 4, 2019 · de78b59 · de78b59
1 parent 5dca68b
commit de78b59
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/packages/ra-core/src/sideEffect/auth.ts b/packages/ra-core/src/sideEffect/auth.ts
@@ -1,4 +1,11 @@
-import { all, put, call, select, takeEvery } from 'redux-saga/effects';
+import {
+    all,
+    put,
+    call,
+    select,
+    takeLatest,
+    takeEvery,
+} from 'redux-saga/effects';
 import { push, replace } from 'react-router-redux';
 
 import { AuthProvider } from '../types';
@@ -46,18 +53,18 @@ export default (authProvider?: AuthProvider) => {
                         select(nextPathnameSelector);
                     yield put(push(redirectTo || '/'));
                 } catch (e) {
-                    yield put({
-                        type: USER_LOGIN_FAILURE,
-                        error: e,
-                        meta: { auth: true },
-                    });
                     const errorMessage =
                         typeof e === 'string'
                             ? e
                             : typeof e === 'undefined' || !e.message
                             ? 'ra.auth.sign_in_error'
                             : e.message;
                     yield put(showNotification(errorMessage, 'warning'));
+                    yield put({
+                        type: USER_LOGIN_FAILURE,
+                        error: e,
+                        meta: { auth: true },
+                    });
                 }
                 break;
             }
@@ -111,7 +118,7 @@ export default (authProvider?: AuthProvider) => {
     return function* watchAuthActions() {
         yield all([
             takeEvery(action => action.meta && action.meta.auth, handleAuth),
-            takeEvery(FETCH_ERROR, handleAuth),
+            takeLatest(FETCH_ERROR, handleAuth),
         ]);
     };
 };