Skip to content

Commit 35b9898

Browse files
committed
Request and receive user preferences before dispatching logged in success
1 parent 2006a93 commit 35b9898

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/app/state/actions.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ export const logInUser = (provider: AuthenticationProvider, params: {email: stri
219219
persistence.remove(KEY.AFTER_AUTH_PATH);
220220
try {
221221
const result = await api.authentication.login(provider, params);
222-
dispatch({type: ACTION_TYPE.USER_LOG_IN_RESPONSE_SUCCESS, user: result.data});
223222
await dispatch(requestCurrentUser() as any); // Request user preferences
223+
dispatch({type: ACTION_TYPE.USER_LOG_IN_RESPONSE_SUCCESS, user: result.data});
224224
history.push(afterAuthPath);
225225
} catch (e) {
226226
dispatch({type: ACTION_TYPE.USER_LOG_IN_RESPONSE_FAILURE, errorMessage: (e.response) ? extractMessage(e) : API_REQUEST_FAILURE_MESSAGE})
@@ -277,8 +277,8 @@ export const handleProviderCallback = (provider: AuthenticationProvider, paramet
277277
dispatch({type: ACTION_TYPE.AUTHENTICATION_HANDLE_CALLBACK});
278278
try {
279279
const providerResponse = await api.authentication.checkProviderCallback(provider, parameters);
280-
dispatch({type: ACTION_TYPE.USER_LOG_IN_RESPONSE_SUCCESS, user: providerResponse.data});
281280
await dispatch(requestCurrentUser() as any); // Request user preferences
281+
dispatch({type: ACTION_TYPE.USER_LOG_IN_RESPONSE_SUCCESS, user: providerResponse.data});
282282
let nextPage = persistence.load(KEY.AFTER_AUTH_PATH);
283283
persistence.remove(KEY.AFTER_AUTH_PATH);
284284
nextPage = nextPage || "/";

0 commit comments

Comments
 (0)