Merge pull request #3601 from gibkigonzo/bugfix/logout-user-if-error-…

…occurs 3588 clear user data if error occurs while login
vuestorefront · Sep 24, 2019 · 6115522 · 6115522
2 parents 5c251dc + ecc9e9a
commit 6115522
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -107,6 +107,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Prevent caching storage instance in plugin module scope - @gibkigonzo (#3571)
 - Fixed incorrect image sizes in related section on product page - @andrzejewsky (#3590)
 - Fix typo on default language - @lorenaramonda (#3076)
+- clear user data if error occurs while login - @gibkigonzo (#3588)
 - Fix loading bestsellers on 404 error page - @andrzejewsky (#3540)
 
 ### Changed / Improved

diff --git a/core/modules/user/store/actions.ts b/core/modules/user/store/actions.ts
@@ -54,9 +54,14 @@ const actions: ActionTree<UserState, RootState> = {
     userHooksExecutors.afterUserAuthorize(resp)
 
     if (resp.code === 200) {
-      await dispatch('resetUserInvalidateLock', {}, { root: true })
-      commit(types.USER_TOKEN_CHANGED, { newToken: resp.result, meta: resp.meta }) // TODO: handle the "Refresh-token" header
-      await dispatch('sessionAfterAuthorized', { refresh: true, useCache: false })
+      try {
+        await dispatch('resetUserInvalidateLock', {}, { root: true })
+        commit(types.USER_TOKEN_CHANGED, { newToken: resp.result, meta: resp.meta }) // TODO: handle the "Refresh-token" header
+        await dispatch('sessionAfterAuthorized', { refresh: true, useCache: false })
+      } catch (err) {
+        await dispatch('clearCurrentUser')
+        throw new Error(err)
+      }
     }
 
     return resp