Merge pull request #4073 from gibkigonzo/bugfix/update-current-token-with-refresh-token

fix current token invalidation with refresh token

Author: andrzejewsky

CHANGELOG.md

@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix problem with storeView as dependency in filters - @gibkigonzo (#3968)
 - Fix v-model not working in BaseRadioButton - @lukeromanowicz (#4035)
 - add disconnect and sync options for clear/cart - @gibkigonzo (#4062)
+- Fix current token invalidation with refresh token - @gibkigonzo (#3928, #3620, #3626)
 
 ## [1.10.5] - 28.11.2019
 

core/lib/sync/helpers/index.ts

@@ -0,0 +1,31 @@
+export const hasResponseError = (jsonResponse): boolean => {
+  if (typeof jsonResponse.result === 'string') {
+    return true
+  }
+
+  const hasMessage = jsonResponse.result.result || jsonResponse.result.message
+
+  return Boolean(hasMessage) && jsonResponse.result.code !== 'ENOTFOUND'
+}
+
+export const getResponseMessage = (jsonResponse): string => {
+  if (typeof jsonResponse.result === 'string') {
+    return jsonResponse.result
+  }
+
+  if (typeof jsonResponse.result.result === 'string') {
+    return jsonResponse.result.result
+  }
+
+  return jsonResponse.result.message
+}
+
+export const getResponseCode = (jsonResponse): number => {
+  let responseCode = null
+  if (jsonResponse.result && jsonResponse.result.code) {
+    responseCode = parseInt(jsonResponse.result.code)
+  } else {
+    responseCode = parseInt(jsonResponse.code)
+  }
+  return responseCode
+}

core/lib/sync/task.ts

@@ -2,7 +2,6 @@ import Vue from 'vue'
 import i18n from '@vue-storefront/i18n'
 import isNaN from 'lodash-es/isNaN'
 import isUndefined from 'lodash-es/isUndefined'
-import toString from 'lodash-es/toString'
 import fetch from 'isomorphic-fetch'
 import * as localForage from 'localforage'
 import rootStore from '@vue-storefront/core/store'
@@ -16,6 +15,7 @@ import { processURLAddress } from '@vue-storefront/core/helpers'
 import { serial } from '@vue-storefront/core/helpers'
 import config from 'config'
 import { onlineHelper } from '@vue-storefront/core/helpers'
+import { hasResponseError, getResponseMessage, getResponseCode } from '@vue-storefront/core/lib/sync/helpers'
 
 const AUTO_REFRESH_MAX_ATTEMPTS = 20
 
@@ -33,7 +33,7 @@ function _sleep (time) {
 }
 
 function _internalExecute (resolve, reject, task: Task, currentToken, currentCartId) {
-  if (currentToken !== null && rootStore.state.userTokenInvalidateLock > 0) { // invalidate lock set
+  if (currentToken && rootStore.state.userTokenInvalidateLock > 0) { // invalidate lock set
     Logger.log('Waiting for rootStore.state.userTokenInvalidateLock to release for ' + task.url, 'sync')()
     _sleep(1000).then(() => {
       Logger.log('Another try for rootStore.state.userTokenInvalidateLock for ' + task.url, 'sync')()
@@ -42,7 +42,7 @@ function _internalExecute (resolve, reject, task: Task, currentToken, currentCar
     return // return but not resolve
   } else if (rootStore.state.userTokenInvalidateLock < 0) {
     Logger.error('Aborting the network task' + task.url + rootStore.state.userTokenInvalidateLock, 'sync')()
-    resolve({ code: 401, message: i18n.t('Error refreshing user token. User is not authorized to access the resource') })()
+    resolve({ code: 401, result: i18n.t('Error refreshing user token. User is not authorized to access the resource') })()
     return
   } else {
     if (rootStore.state.userTokenInvalidated) {
@@ -73,9 +73,9 @@ function _internalExecute (resolve, reject, task: Task, currentToken, currentCar
     }
   }).then((jsonResponse) => {
     if (jsonResponse) {
-      const responseCode = parseInt(jsonResponse.code)
+      const responseCode = getResponseCode(jsonResponse)
       if (responseCode !== 200) {
-        if (responseCode === 401 /** unauthorized */ && currentToken !== null) { // the token is no longer valid, try to invalidate it
+        if (responseCode === 401 /** unauthorized */ && currentToken) { // the token is no longer valid, try to invalidate it
           Logger.error('Invalid token - need to be revalidated' + currentToken + task.url + rootStore.state.userTokenInvalidateLock, 'sync')()
           if (isNaN(rootStore.state.userTokenInvalidateAttemptsCount) || isUndefined(rootStore.state.userTokenInvalidateAttemptsCount)) rootStore.state.userTokenInvalidateAttemptsCount = 0
           if (isNaN(rootStore.state.userTokenInvalidateLock) || isUndefined(rootStore.state.userTokenInvalidateLock)) rootStore.state.userTokenInvalidateLock = 0
@@ -128,12 +128,10 @@ function _internalExecute (resolve, reject, task: Task, currentToken, currentCar
           }
         }
 
-        if (!task.silent && jsonResponse.result && (typeof jsonResponse.result === 'string' || (((jsonResponse.result.result || jsonResponse.result.message) && jsonResponse.result.code !== 'ENOTFOUND') && !silentMode))) {
-          const message = typeof jsonResponse.result === 'string' ? jsonResponse.result : typeof jsonResponse.result.result === 'string' ? jsonResponse.result.result : jsonResponse.result.message
-
+        if (!task.silent && jsonResponse.result && hasResponseError(jsonResponse) && !silentMode) {
           rootStore.dispatch('notification/spawnNotification', {
             type: 'error',
-            message: i18n.t(message),
+            message: i18n.t(getResponseMessage(jsonResponse)),
             action1: { label: i18n.t('OK') }
           })
         }

core/modules/user/hooks/afterRegistration.ts

@@ -3,7 +3,7 @@ import * as types from './../store/mutation-types'
 
 export async function afterRegistration ({ Vue, config, store, isServer }) {
   if (!isServer) {
-    await store.dispatch('user/startSession')
+    store.dispatch('user/startSession')
 
     Vue.prototype.$bus.$on('user-before-logout', () => {
       store.dispatch('user/logout', { silent: false })