mirror/ezbookkeeping
1
0
Fork 0
mirror of https://github.com/mayswind/ezbookkeeping.git synced 2026-05-19 09:14:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
MaysWind
2023-06-24 17:02:57 +08:00
parent a9338ed822
commit fb7790ba4a
36 changed files with 644 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/stores/index.js
+16 -10
View File
@@ -1,5 +1,6 @@
import { defineStore } from 'pinia';
import { useSettingsStore } from './setting.js';
import { useUserStore } from './user.js';
import { useAccountsStore } from './account.js';
import { useTransactionCategoriesStore } from './transactionCategory.js';
@@ -11,7 +12,6 @@ import { useExchangeRatesStore } from './exchangeRates.js';
import userState from '@/lib/userstate.js';
import services from '@/lib/services.js';
import settings from '@/lib/settings.js';
import logger from '@/lib/logger.js';
import { isObject, isString } from '@/lib/common.js';
@@ -43,6 +43,8 @@ export const useRootStore = defineStore('root', {
userStore.resetUserInfo();
},
authorize({ loginName, password }) {
const settingsStore = useSettingsStore();
return new Promise((resolve, reject) => {
services.authorize({
loginName: loginName,
@@ -60,13 +62,13 @@ export const useRootStore = defineStore('root', {
return;
}
if (settings.isEnableApplicationLock() || userState.getUserAppLockState()) {
if (settingsStore.appSettings.applicationLock || userState.getUserAppLockState()) {
const appLockState = userState.getUserAppLockState();
if (!appLockState || appLockState.username !== data.result.user.username) {
userState.clearTokenAndUserInfo(true);
settings.setEnableApplicationLock(false);
settings.setEnableApplicationLockWebAuthn(false);
settingsStore.setEnableApplicationLock(false);
settingsStore.setEnableApplicationLockWebAuthn(false);
userState.clearWebAuthnConfig();
}
}
@@ -93,6 +95,8 @@ export const useRootStore = defineStore('root', {
});
},
authorize2FA({ token, passcode, recoveryCode }) {
const settingsStore = useSettingsStore();
return new Promise((resolve, reject) => {
let promise = null;
@@ -119,13 +123,13 @@ export const useRootStore = defineStore('root', {
return;
}
if (settings.isEnableApplicationLock() || userState.getUserAppLockState()) {
if (settingsStore.appSettings.applicationLock || userState.getUserAppLockState()) {
const appLockState = userState.getUserAppLockState();
if (!appLockState || appLockState.username !== data.result.user.username) {
userState.clearTokenAndUserInfo(true);
settings.setEnableApplicationLock(false);
settings.setEnableApplicationLockWebAuthn(false);
settingsStore.setEnableApplicationLock(false);
settingsStore.setEnableApplicationLockWebAuthn(false);
userState.clearWebAuthnConfig();
}
}
@@ -152,6 +156,8 @@ export const useRootStore = defineStore('root', {
});
},
register({ user }) {
const settingsStore = useSettingsStore();
return new Promise((resolve, reject) => {
services.register({
username: user.username,
@@ -169,9 +175,9 @@ export const useRootStore = defineStore('root', {
return;
}
if (settings.isEnableApplicationLock()) {
settings.setEnableApplicationLock(false);
settings.setEnableApplicationLockWebAuthn(false);
if (settingsStore.appSettings.applicationLock) {
settingsStore.setEnableApplicationLock(false);
settingsStore.setEnableApplicationLockWebAuthn(false);
userState.clearWebAuthnConfig();
}