resolve conflicts

vuestorefront · Jul 23, 2019 · 80d545a · 80d545a
1 parent 59269a3
commit 80d545a
Showing 1 changed file with 10 additions and 15 deletions.
diff --git a/core/modules/user/store/actions.ts b/core/modules/user/store/actions.ts
@@ -31,13 +31,13 @@ const actions: ActionTree<UserState, RootState> = {
       commit(types.USER_TOKEN_CHANGED, { newToken })
       dispatch('sessionAfterAuthorized', {})
 
-      if (config.usePriceTiers) {
-        const userData = await usersCollection.getItem('current-user')
 
-        if (userData) {
-          dispatch('setUserGroup', userData)
-        }
+      const userData = await usersCollection.getItem('current-user')
+
+      if (userData) {
+        dispatch('setUserGroup', userData)
       }
+
     } else {
       EventBus.$emit('session-after-nonauthorized')
     }
@@ -94,17 +94,12 @@ const actions: ActionTree<UserState, RootState> = {
    * @param userData
    */
   setUserGroup ({ commit }, userData) {
-    if (config.usePriceTiers) {
-      if (userData.groupToken) {
-        commit(types.USER_GROUP_TOKEN_CHANGED, userData.groupToken)
-      }
+    if (userData.groupToken) {
+      commit(types.USER_GROUP_TOKEN_CHANGED, userData.groupToken)
+    }
 
-      if (userData.group_id) {
-        commit(types.USER_GROUP_CHANGED, userData.group_id)
-      }
-    } else {
-      commit(types.USER_GROUP_TOKEN_CHANGED, '')
-      commit(types.USER_GROUP_CHANGED, null)
+    if (userData.group_id) {
+      commit(types.USER_GROUP_CHANGED, userData.group_id)
     }
   },
   async restoreCurrentUserFromCache ({ commit, dispatch }) {