Skip to content

Open source personal finance application

refactor: validate user settings and rates with Zod at load time

Ilya Komichev43748d40dbce
diff --git a/app/components/app/useInitApp.ts b/app/components/app/useInitApp.ts
index af01b562..59ab1708 100644
--- a/app/components/app/useInitApp.ts
+++ b/app/components/app/useInitApp.ts
@@ -1,18 +1,18 @@
import localforage from 'localforage'
import type { Categories } from '~/components/categories/types'
-import type { Rates } from '~/components/currencies/types'
-import type { LocaleSlug } from '~/components/locale/types'
import type { Trns } from '~/components/trns/types'
import type { User } from '~/components/user/useUserStore'
import type { Wallets } from '~/components/wallets/types'
import { useCategoriesStore } from '~/components/categories/useCategoriesStore'
+import { ratesSchema } from '~/components/currencies/types'
import { useCurrenciesStore } from '~/components/currencies/useCurrenciesStore'
import { setOfflineQueueUserId } from '~/components/offline/helpers'
import { replayOfflineQueue } from '~/components/offline/replay'
import { STORAGE_KEYS } from '~/components/offline/storageKeys'
import { useTrnsStore } from '~/components/trns/useTrnsStore'
+import { userSettingsSchema } from '~/components/user/types'
import { useUserStore } from '~/components/user/useUserStore'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
import { blockPersist, unblockPersist } from '~/composables/useStoreSync'
@@ -39,22 +39,28 @@ export function useInitApp() {
})
async function loadDataFromCache() {
- const [user, userSettings, currencies, categories, wallets, trns] = await Promise.all([
+ const [user, rawUserSettings, rawCurrencies, categories, wallets, trns] = await Promise.all([
localforage.getItem<User | null>(STORAGE_KEYS.user),
- localforage.getItem<{ baseCurrency?: string, locale?: LocaleSlug }>(STORAGE_KEYS.userSettings),
- localforage.getItem<{ rates?: Rates }>(STORAGE_KEYS.currencies),
+ localforage.getItem(STORAGE_KEYS.userSettings),
+ localforage.getItem<{ rates?: unknown }>(STORAGE_KEYS.currencies),
localforage.getItem<Categories | null>(STORAGE_KEYS.categories),
localforage.getItem<Wallets | null>(STORAGE_KEYS.wallets),
localforage.getItem<Trns | null>(STORAGE_KEYS.trns),
])
userStore.setUser(user ?? null)
- if (userSettings?.baseCurrency)
- userStore.setUserBaseCurrency(userSettings.baseCurrency)
- if (userSettings?.locale)
- userStore.setUserLocale(userSettings.locale)
- if (currencies?.rates)
- currenciesStore.setRates(currencies.rates)
+
+ const userSettings = userSettingsSchema.safeParse(rawUserSettings)
+ if (userSettings.success) {
+ userStore.setUserBaseCurrency(userSettings.data.baseCurrency)
+ if (userSettings.data.locale)
+ userStore.setUserLocale(userSettings.data.locale)
+ }
+
+ const rates = ratesSchema.safeParse(rawCurrencies?.rates)
+ if (rates.success)
+ currenciesStore.setRates(rates.data)
+
walletsStore.setWallets(wallets ?? null)
categoriesStore.setCategories(categories ?? null)
trnsStore.setTrns(trns ?? null)
diff --git a/app/components/currencies/useCurrenciesStore.ts b/app/components/currencies/useCurrenciesStore.ts
index b581bf6a..c3d81d1b 100644
--- a/app/components/currencies/useCurrenciesStore.ts
+++ b/app/components/currencies/useCurrenciesStore.ts
@@ -3,6 +3,7 @@ import { defineStore } from 'pinia'
import type { Rates } from '~/components/currencies/types'
+import { ratesSchema } from '~/components/currencies/types'
import { STORAGE_KEYS } from '~/components/offline/storageKeys'
import { useUserStore } from '~/components/user/useUserStore'
import { isPersistBlocked } from '~/composables/useStoreSync'
@@ -23,8 +24,13 @@ export const useCurrenciesStore = defineStore('currencies', () => {
// Get latest rates from Convex
const latestRates = await client.query(api.rates.getLatest, {})
- if (latestRates?.rates)
- setRates(latestRates.rates as Rates)
+ if (latestRates?.rates) {
+ const parsed = ratesSchema.safeParse(latestRates.rates)
+ if (parsed.success)
+ setRates(parsed.data)
+ else
+ logger.error('invalid rates from Convex', parsed.error)
+ }
}
catch (e) {
logger.error('init failed', e)
diff --git a/app/components/user/useUserStore.ts b/app/components/user/useUserStore.ts
index cebf1072..6e6dc16a 100644
--- a/app/components/user/useUserStore.ts
+++ b/app/components/user/useUserStore.ts
@@ -10,6 +10,7 @@ import { isReplaying } from '~/components/offline/replay'
import { STORAGE_KEYS } from '~/components/offline/storageKeys'
import { useTrnsFormStore } from '~/components/trnForm/useTrnsFormStore'
import { useTrnsStore } from '~/components/trns/useTrnsStore'
+import { userSettingsSchema } from '~/components/user/types'
import { useWalletsStore } from '~/components/wallets/useWalletsStore'
import { clearAuthCookie, setSessionInitialized } from '~/composables/useAuthCookie'
import { blockPersist, handleMutationResult, isPersistBlocked } from '~/composables/useStoreSync'
@@ -139,20 +140,28 @@ export const useUserStore = defineStore('user', () => {
if (!settings)
return
- baseCurrency.value = settings.baseCurrency || 'USD'
- if (settings.locale) {
- locale.value = settings.locale as LocaleSlug
- useNuxtApp().$i18n.setLocale(settings.locale as LocaleSlug)
+ const parsed = userSettingsSchema.safeParse(settings)
+ if (parsed.success) {
+ baseCurrency.value = parsed.data.baseCurrency
+ if (parsed.data.locale) {
+ locale.value = parsed.data.locale
+ useNuxtApp().$i18n.setLocale(parsed.data.locale)
+ }
}
- // Apply pending offline ops (local changes win over server)
+ // Apply pending offline ops (local changes win over server).
+ // Ops are partial — only override the fields they contain.
const pendingOps = await getOfflineOpsByEntity('userSettings')
+ const partialSchema = userSettingsSchema.partial()
for (const op of pendingOps) {
- if (op.data?.baseCurrency)
- baseCurrency.value = op.data.baseCurrency as CurrencyCode
- if (op.data?.locale) {
- locale.value = op.data.locale as LocaleSlug
- useNuxtApp().$i18n.setLocale(op.data.locale as LocaleSlug)
+ const parsedOp = partialSchema.safeParse(op.data)
+ if (!parsedOp.success)
+ continue
+ if (parsedOp.data.baseCurrency)
+ baseCurrency.value = parsedOp.data.baseCurrency
+ if (parsedOp.data.locale) {
+ locale.value = parsedOp.data.locale
+ useNuxtApp().$i18n.setLocale(parsedOp.data.locale)
}
}