Merge pull request #3247 from andrzejewsky/feature/3095-refactoring-u…

…ser-vuex-module

Refactoring user vuex module

CHANGELOG.md

@@ -51,6 +51,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added catching of errors when ES is down - @qiqqq
 - Added debounce for updating quantity method in the cart - @andrzejewsky (#3191)
 - New modules API and rewrite - @filrak, @JCown (#3144)
+- Refactored the vuex user module - @andrzejewsky (#3095)
 
 ## [1.10.0-rc.2] - UNRELEASED
 

core/data-resolver/UserService.ts

@@ -0,0 +1,107 @@
+import { DataResolver } from './types/DataResolver';
+import { UserProfile } from '@vue-storefront/core/modules/user/types/UserProfile'
+import { TaskQueue } from '@vue-storefront/core/lib/sync'
+import Task from '@vue-storefront/core/lib/sync/types/Task'
+import { processLocalizedURLAddress } from '@vue-storefront/core/helpers'
+import config from 'config'
+
+const headers = {
+  'Accept': 'application/json, text/plain, */*',
+  'Content-Type': 'application/json'
+}
+
+const resetPassword = async (email: string): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.resetPassword_endpoint),
+    payload: {
+      method: 'POST',
+      mode: 'cors',
+      headers,
+      body: JSON.stringify({ email })
+    }
+  })
+
+const login = async (username: string, password: string): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.login_endpoint),
+    payload: {
+      method: 'POST',
+      mode: 'cors',
+      headers,
+      body: JSON.stringify({ username, password })
+    }
+  })
+
+const register = async (customer: DataResolver.Customer, password: string): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.create_endpoint),
+    payload: {
+      method: 'POST',
+      headers,
+      body: JSON.stringify({ customer, password })
+    }
+  })
+
+const updateProfile = async (userProfile: UserProfile): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.me_endpoint),
+    payload: {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      mode: 'cors',
+      body: JSON.stringify(userProfile)
+    }
+  })
+
+const getProfile = async () =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.me_endpoint),
+    payload: {
+      method: 'GET',
+      mode: 'cors',
+      headers
+    }
+  })
+
+const getOrdersHistory = async (): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.history_endpoint),
+    payload: {
+      method: 'GET',
+      mode: 'cors',
+      headers
+    }
+  })
+
+const changePassword = async (passwordData: DataResolver.PasswordData): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.changePassword_endpoint),
+    payload: {
+      method: 'POST',
+      mode: 'cors',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(passwordData)
+    }
+  })
+
+const invalidateToken = async (refreshToken: string): Promise<Task> =>
+  TaskQueue.execute({
+    url: processLocalizedURLAddress(config.users.refresh_endpoint),
+    payload: {
+      method: 'POST',
+      mode: 'cors',
+      headers,
+      body: JSON.stringify({ refreshToken })
+    }
+  })
+
+export const UserService: DataResolver.UserService = {
+  resetPassword,
+  login,
+  register,
+  updateProfile,
+  getProfile,
+  getOrdersHistory,
+  changePassword,
+  invalidateToken
+}

core/data-resolver/index.ts

@@ -1,5 +1,7 @@
 import { CategoryService } from './CategoryService';
+import { UserService } from './UserService';
 
 export {
-  CategoryService
+  CategoryService,
+  UserService
 }

core/data-resolver/types/DataResolver.d.ts

@@ -1,4 +1,6 @@
 import { Category } from 'core/modules/catalog-next/types/Category';
+import { UserProfile } from 'core/modules/user/types/UserProfile'
+import Task from '@vue-storefront/core/lib/sync/types/Task'
 
 declare namespace DataResolver {
 
@@ -15,7 +17,30 @@ declare namespace DataResolver {
     excludeFields?: string[]
   }
 
+  interface Customer {
+    email: string,
+    firstname: string,
+    lastname: string,
+    addresses: string
+  }
+
+  interface PasswordData {
+    currentPassword: string,
+    newPassword: string
+  }
+
   interface CategoryService {
     getCategories: (searchRequest?: CategorySearchOptions) => Promise<Category[]>
   }
+
+  interface UserService {
+    resetPassword: (email: string) => Promise<Task>,
+    login: (username: string, password: string) => Promise<Task>,
+    register: (customer: Customer, pssword: string) => Promise<Task>,
+    updateProfile: (userProfile: UserProfile) => Promise<Task>,
+    getProfile: () => Promise<Task>,
+    getOrdersHistory: () => Promise<Task>,
+    changePassword: (passwordData: PasswordData) => Promise<Task>,
+    invalidateToken: (refreshToken: string) => Promise<Task>
+  }
 }

core/helpers/index.ts

@@ -6,12 +6,21 @@ import config from 'config'
 import { sha3_224 } from 'js-sha3'
 import { unicodeAlpha, unicodeAlphaNum } from './validators'
 import store from '@vue-storefront/core/store'
+import { adjustMultistoreApiUrl } from '@vue-storefront/core/lib/multistore'
 
 export const processURLAddress = (url: string = '') => {
   if (url.startsWith('/')) return `${config.api.url}${url}`
   return url
 }
 
+export const processLocalizedURLAddress = (url: string = '') => {
+  if (config.storeViews.multistore) {
+    return processURLAddress(adjustMultistoreApiUrl(url))
+  }
+
+  return processURLAddress(url)
+}
+
 /**
  * Create slugify -> "create-slugify" permalink  of text
  * @param {String} text

core/lib/sync/task.ts

@@ -146,6 +146,7 @@ function _internalExecute (resolve, reject, task: Task, currentToken, currentCar
       task.resultCode = jsonResponse.code
       task.code = jsonResponse.code // backward compatibility to fetch()
       task.acknowledged = false
+      task.meta = jsonResponse.meta
 
       if (task.callback_event) {
         if (task.callback_event.startsWith('store:')) {

core/lib/sync/types/Task.ts

@@ -10,5 +10,6 @@ export default interface Task {
   transmited: boolean,
   transmited_at: Date,
   url: string,
-  is_result_cacheable?: boolean
+  is_result_cacheable?: boolean,
+  meta: any
 }