Fix some reauthenticate problems

src/actions/auth.js

@@ -13,14 +13,17 @@ import { promisesForPopulate, getPopulateObjs } from '../utils/populate'
 
 /**
  * Dispatch login error action
+ *
  * @param {Function} dispatch - Action dispatch function
  * @param {object} authError - Error object
+ * @param {object} params - Supplement action params
  * @returns {any} Return of action dispatch
  * @private
  */
-function dispatchLoginError(dispatch, authError) {
+function dispatchLoginError(dispatch, authError, params = {}) {
   return dispatch({
     type: actionTypes.LOGIN_ERROR,
+    ...params,
     authError
   })
 }
@@ -596,10 +599,6 @@ export const login = (dispatch, firebase, credentials) => {
  * @private
  */
 export const reauthenticate = (dispatch, firebase, credentials) => {
-  if (firebase._.config.resetBeforeLogin) {
-    dispatchLoginError(dispatch, null)
-  }
-
   const { method, params } = getReauthenticateMethodAndParams(
     firebase,
     credentials
@@ -643,7 +642,7 @@ export const reauthenticate = (dispatch, firebase, credentials) => {
       ).then(profile => ({ profile, ...userData }))
     })
     .catch(err => {
-      dispatchLoginError(dispatch, err)
+      dispatchLoginError(dispatch, err, { reauthenticate: true })
       return Promise.reject(err)
     })
 }

src/reducers.js

@@ -232,6 +232,10 @@ export function authReducer(
     case LOGIN_ERROR:
     case AUTH_EMPTY_CHANGE:
     case LOGOUT:
+      // If it's reauthenticate keep user datas
+      if (action.reauthenticate) {
+        return preserveValuesFromState(state, true, {})
+      }
       // Support keeping data when logging out
       if (action.preserve && action.preserve.auth) {
         return preserveValuesFromState(state, action.preserve.auth, {