From 29c42d7f34fda9131dfe6325085238761d29e96e Mon Sep 17 00:00:00 2001 From: taro Date: Tue, 18 Feb 2025 00:32:34 -0300 Subject: [PATCH 1/4] refactor: migrate `fetchUser` API call from PHP to Salix --- src/stores/user.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/stores/user.js b/src/stores/user.js index 90aaa688..a81b3c2c 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -248,11 +248,13 @@ export const useUserStore = defineStore('user', () => { const fetchUser = async (userType = 'user') => { try { - const userData = await jApi.getObject( - 'SELECT id, nickname, name, lang FROM account.myUser' - ); - if (userType === 'user') mainUser.value = userData; - else supplantedUser.value = userData; + const _token = getToken(); + const userData = await api.get('VnUsers/getCurrentUserData', { + headers: { Authorization: _token } + }); + + if (userType === 'user') mainUser.value = userData.data; + else supplantedUser.value = userData.data; } catch (error) { console.error('Error fetching user: ', error); } -- 2.40.1 From bf449548c9116521407a37ab5a98c76bf3fe2ae9 Mon Sep 17 00:00:00 2001 From: taro Date: Wed, 19 Feb 2025 02:05:42 -0300 Subject: [PATCH 2/4] =?UTF-8?q?address=20comments=20=E2=80=94=20remove=20u?= =?UTF-8?q?nnecessary=20explicit=20passing=20of=20auth=20token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/stores/user.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/stores/user.js b/src/stores/user.js index a81b3c2c..7f9d8a54 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -248,10 +248,7 @@ export const useUserStore = defineStore('user', () => { const fetchUser = async (userType = 'user') => { try { - const _token = getToken(); - const userData = await api.get('VnUsers/getCurrentUserData', { - headers: { Authorization: _token } - }); + const userData = await api.get('VnUsers/getCurrentUserData'); if (userType === 'user') mainUser.value = userData.data; else supplantedUser.value = userData.data; -- 2.40.1 From 93c481aadf43084b994fae3a8f3e160e12ee76e5 Mon Sep 17 00:00:00 2001 From: taro Date: Wed, 19 Feb 2025 02:17:09 -0300 Subject: [PATCH 3/4] handle possible error case --- src/stores/user.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/stores/user.js b/src/stores/user.js index 7f9d8a54..992e6e06 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -250,6 +250,11 @@ export const useUserStore = defineStore('user', () => { try { const userData = await api.get('VnUsers/getCurrentUserData'); + if (!userData?.data) { + console.error('GET VnUsers/getCurrentUserData returned invalid data', userData); + return; + } + if (userType === 'user') mainUser.value = userData.data; else supplantedUser.value = userData.data; } catch (error) { -- 2.40.1 From 4ad4cb17e85cd19419d344f67abeb6118f1a1322 Mon Sep 17 00:00:00 2001 From: taro Date: Thu, 20 Feb 2025 04:57:23 -0300 Subject: [PATCH 4/4] refactor: remove unnecessary verification --- src/stores/user.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/stores/user.js b/src/stores/user.js index 992e6e06..7f9d8a54 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -250,11 +250,6 @@ export const useUserStore = defineStore('user', () => { try { const userData = await api.get('VnUsers/getCurrentUserData'); - if (!userData?.data) { - console.error('GET VnUsers/getCurrentUserData returned invalid data', userData); - return; - } - if (userType === 'user') mainUser.value = userData.data; else supplantedUser.value = userData.data; } catch (error) { -- 2.40.1