Merge pull request #12 from IrinaMalysheva/feature/improvement-1.0

Fix console error with infinite token update and getting user
IrinaMalysheva · May 26, 2022 · f85cae4 · f85cae4
2 parents c522cd4 + fb51a54
commit f85cae4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/services/actions/authRegister.ts b/src/services/actions/authRegister.ts
@@ -245,8 +245,7 @@ export const getUser: AppThunk = () => (dispatch) => {
         })
         .catch((err) => {
             if (getCookie('refreshToken')) {
-                dispatch(updateToken());
-                dispatch(getUser());
+                dispatch(updateToken(getUser));
             } else {
                 dispatch(getUserErrorAction())
             }
@@ -360,7 +359,7 @@ export const resetPassword: AppThunk = (passwordValue: string, tokenValue: strin
         })
 };
 
-export const updateToken: AppThunk = () => (dispatch: AppDispatch) => {
+export const updateToken: AppThunk = (afterRefresh: AppThunk) => (dispatch) => {
     dispatch(updateTokenRequestAction());
     return fetch(API_URL + "/auth/token", {
         method: 'POST',
@@ -377,6 +376,7 @@ export const updateToken: AppThunk = () => (dispatch: AppDispatch) => {
                 const accessToken = jsonResp.accessToken.split('Bearer ')[1];
                 setCookie('accessToken', accessToken, { path: '/' });
                 dispatch(updateTokenSuccessAction());
+                dispatch(afterRefresh());
             }
         })
         .catch((err) => {