High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor: purchase store (#25734)
Jason Rasmussen5bf4e9595cf5
diff --git a/web/src/lib/components/shared-components/purchasing/purchase-content.svelte b/web/src/lib/components/shared-components/purchasing/purchase-content.svelteindex ee28e66bff..9bbffe53ef 100644--- a/web/src/lib/components/shared-components/purchasing/purchase-content.svelte+++ b/web/src/lib/components/shared-components/purchasing/purchase-content.svelte@@ -1,5 +1,5 @@<script lang="ts">- import { purchaseStore } from '$lib/stores/purchase.store';+ import { authManager } from '$lib/managers/auth-manager.svelte';import { handleError } from '$lib/utils/handle-error';import { activateProduct, getActivationKey } from '$lib/utils/license-utils';import { Button, Heading, LoadingSpinner } from '@immich/ui';@@ -26,7 +26,7 @@await activateProduct(productKey, activationKey);onActivate();- purchaseStore.setPurchaseStatus(true);+ authManager.isPurchased = true;} catch (error) {handleError(error, $t('purchase_failed_activation'));} finally {diff --git a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte b/web/src/lib/components/shared-components/side-bar/purchase-info.svelteindex 2d1c3d0f5e..d1a80cbfee 100644--- a/web/src/lib/components/shared-components/side-bar/purchase-info.svelte+++ b/web/src/lib/components/shared-components/side-bar/purchase-info.svelte@@ -2,9 +2,9 @@import { goto } from '$app/navigation';import { OpenQueryParam } from '$lib/constants';import Portal from '$lib/elements/Portal.svelte';+ import { authManager } from '$lib/managers/auth-manager.svelte';import PurchaseModal from '$lib/modals/PurchaseModal.svelte';import { Route } from '$lib/route';- import { purchaseStore } from '$lib/stores/purchase.store';import { preferences } from '$lib/stores/user.store';import { getAccountAge } from '$lib/utils/auth';import { handleError } from '$lib/utils/handle-error';@@ -22,8 +22,6 @@let showBuyButton = $state(getButtonVisibility());- const { isPurchased } = purchaseStore;-const openPurchaseModal = async () => {await modalManager.show(PurchaseModal);showMessage = false;@@ -72,7 +70,7 @@</script><div class="license-status ps-4 text-sm">- {#if $isPurchased && $preferences.purchase.showSupportBadge}+ {#if authManager.isPurchased && $preferences.purchase.showSupportBadge}<buttononclick={() => goto(Route.userSettings({ isOpen: OpenQueryParam.PURCHASE_SETTINGS }))}class="w-full mt-2"@@ -80,7 +78,7 @@><SupporterBadge size="small" effect="always" /></button>- {:else if !$isPurchased && showBuyButton && getAccountAge() > 14}+ {:else if !authManager.isPurchased && showBuyButton && getAccountAge() > 14}<buttontype="button"onclick={openPurchaseModal}diff --git a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte b/web/src/lib/components/user-settings-page/user-purchase-settings.svelteindex 5635cb0fa7..9c78db1dc7 100644--- a/web/src/lib/components/user-settings-page/user-purchase-settings.svelte+++ b/web/src/lib/components/user-settings-page/user-purchase-settings.svelte@@ -4,8 +4,8 @@import PurchaseContent from '$lib/components/shared-components/purchasing/purchase-content.svelte';import SettingSwitch from '$lib/components/shared-components/settings/setting-switch.svelte';import { dateFormats } from '$lib/constants';+ import { authManager } from '$lib/managers/auth-manager.svelte';import { locale } from '$lib/stores/preferences.store';- import { purchaseStore } from '$lib/stores/purchase.store';import { preferences, user } from '$lib/stores/user.store';import { handleError } from '$lib/utils/handle-error';import { setSupportBadgeVisibility } from '$lib/utils/purchase-utils';@@ -22,7 +22,6 @@import { mdiKey } from '@mdi/js';import { onMount } from 'svelte';import { t } from 'svelte-i18n';- const { isPurchased } = purchaseStore;let isServerProduct = $state(false);let serverPurchaseInfo: LicenseResponseDto | null = $state(null);@@ -53,7 +52,7 @@};onMount(async () => {- if (!$isPurchased) {+ if (!authManager.isPurchased) {return;}@@ -73,7 +72,7 @@}await deleteIndividualProductKey();- purchaseStore.setPurchaseStatus(false);+ authManager.isPurchased = false;} catch (error) {handleError(error, $t('errors.failed_to_remove_product_key'));}@@ -92,21 +91,21 @@}await deleteServerProductKey();- purchaseStore.setPurchaseStatus(false);+ authManager.isPurchased = false;} catch (error) {handleError(error, $t('errors.failed_to_remove_product_key'));}};const onProductActivated = async () => {- purchaseStore.setPurchaseStatus(true);+ authManager.isPurchased = true;await checkPurchaseInfo();};</script><section class="my-4"><div class="sm:ms-8" in:fade={{ duration: 500 }}>- {#if $isPurchased}+ {#if authManager.isPurchased}<!-- BADGE TOGGLE --><div class="mb-4"><SettingSwitchdiff --git a/web/src/lib/managers/auth-manager.svelte.ts b/web/src/lib/managers/auth-manager.svelte.tsindex e96f3c1449..317894b0ad 100644--- a/web/src/lib/managers/auth-manager.svelte.ts+++ b/web/src/lib/managers/auth-manager.svelte.ts@@ -3,12 +3,31 @@ import { page } from '$app/state';import { eventManager } from '$lib/managers/event-manager.svelte';import { Route } from '$lib/route';import { isSharedLinkRoute } from '$lib/utils/navigation';-import { logout } from '@immich/sdk';+import { getAboutInfo, logout, type UserAdminResponseDto } from '@immich/sdk';class AuthManager {+ isPurchased = $state(false);isSharedLink = $derived(isSharedLinkRoute(page.route?.id));params = $derived(this.isSharedLink ? { key: page.params.key, slug: page.params.slug } : {});+ constructor() {+ eventManager.on({+ AuthUserLoaded: (user) => this.onAuthUserLoaded(user),+ });+ }++ private async onAuthUserLoaded(user: UserAdminResponseDto) {+ if (user.license?.activatedAt) {+ authManager.isPurchased = true;+ return;+ }++ const serverInfo = await getAboutInfo().catch(() => undefined);+ if (serverInfo?.licensed) {+ authManager.isPurchased = true;+ }+ }+async logout() {let redirectUri;@@ -30,6 +49,7 @@ class AuthManager {globalThis.location.href = redirectUri;}} finally {+ this.isPurchased = false;eventManager.emit('AuthLogout');}}diff --git a/web/src/lib/stores/purchase.store.ts b/web/src/lib/stores/purchase.store.tsdeleted file mode 100644index 4b9c61eed7..0000000000--- a/web/src/lib/stores/purchase.store.ts+++ /dev/null@@ -1,16 +0,0 @@-import { readonly, writable } from 'svelte/store';--function createPurchaseStore() {- const isPurcharsed = writable(false);-- function setPurchaseStatus(status: boolean) {- isPurcharsed.set(status);- }-- return {- isPurchased: readonly(isPurcharsed),- setPurchaseStatus,- };-}--export const purchaseStore = createPurchaseStore();diff --git a/web/src/lib/stores/user.store.ts b/web/src/lib/stores/user.store.tsindex 331df7ad5f..3c1549c2cd 100644--- a/web/src/lib/stores/user.store.ts+++ b/web/src/lib/stores/user.store.ts@@ -1,5 +1,4 @@import { eventManager } from '$lib/managers/event-manager.svelte';-import { purchaseStore } from '$lib/stores/purchase.store';import { type UserAdminResponseDto, type UserPreferencesResponseDto } from '@immich/sdk';import { writable } from 'svelte/store';@@ -13,7 +12,6 @@ export const preferences = writable<UserPreferencesResponseDto>();export const resetSavedUser = () => {user.set(undefined as unknown as UserAdminResponseDto);preferences.set(undefined as unknown as UserPreferencesResponseDto);- purchaseStore.setPurchaseStatus(false);};eventManager.on({diff --git a/web/src/lib/utils/auth.ts b/web/src/lib/utils/auth.tsindex 1be65638e6..63c7d4e5c8 100644--- a/web/src/lib/utils/auth.ts+++ b/web/src/lib/utils/auth.ts@@ -1,10 +1,9 @@import { browser } from '$app/environment';import { eventManager } from '$lib/managers/event-manager.svelte';import { Route } from '$lib/route';-import { purchaseStore } from '$lib/stores/purchase.store';import { preferences as preferences$, user as user$ } from '$lib/stores/user.store';import { userInteraction } from '$lib/stores/user.svelte';-import { getAboutInfo, getMyPreferences, getMyUser, getStorage } from '@immich/sdk';+import { getMyPreferences, getMyUser, getStorage } from '@immich/sdk';import { redirect } from '@sveltejs/kit';import { DateTime } from 'luxon';import { get } from 'svelte/store';@@ -18,19 +17,12 @@ export const loadUser = async () => {try {let user = get(user$);let preferences = get(preferences$);- let serverInfo;if ((!user || !preferences) && hasAuthCookie()) {- [user, preferences, serverInfo] = await Promise.all([getMyUser(), getMyPreferences(), getAboutInfo()]);+ [user, preferences] = await Promise.all([getMyUser(), getMyPreferences()]);user$.set(user);preferences$.set(preferences);-eventManager.emit('AuthUserLoaded', user);-- // Check for license status- if (serverInfo.licensed || user.license?.activatedAt) {- purchaseStore.setPurchaseStatus(true);- }}return user;} catch {diff --git a/web/src/routes/(user)/buy/+page.svelte b/web/src/routes/(user)/buy/+page.svelteindex 305b994730..111548ba3b 100644--- a/web/src/routes/(user)/buy/+page.svelte+++ b/web/src/routes/(user)/buy/+page.svelte@@ -4,8 +4,8 @@import LicenseActivationSuccess from '$lib/components/shared-components/purchasing/purchase-activation-success.svelte';import LicenseContent from '$lib/components/shared-components/purchasing/purchase-content.svelte';import SupporterBadge from '$lib/components/shared-components/side-bar/supporter-badge.svelte';+ import { authManager } from '$lib/managers/auth-manager.svelte';import { Route } from '$lib/route';- import { purchaseStore } from '$lib/stores/purchase.store';import { Alert, Container, Stack } from '@immich/ui';import { mdiAlertCircleOutline } from '@mdi/js';import { t } from 'svelte-i18n';@@ -17,17 +17,16 @@let { data }: Props = $props();let showLicenseActivated = $state(false);- const { isPurchased } = purchaseStore;</script>-<UserPageLayout title={$t('buy')}>+<UserPageLayout title={data.meta.title}><Container size="medium" center><Stack gap={4} class="mt-4">{#if data.isActivated === false}<Alert icon={mdiAlertCircleOutline} color="danger" title={$t('purchase_failed_activation')} />{/if}- {#if $isPurchased}+ {#if authManager.isPurchased}<SupporterBadge logoSize="lg" centered />{/if}diff --git a/web/src/routes/(user)/buy/+page.ts b/web/src/routes/(user)/buy/+page.tsindex d0180b39ff..5f937c396e 100644--- a/web/src/routes/(user)/buy/+page.ts+++ b/web/src/routes/(user)/buy/+page.ts@@ -1,4 +1,4 @@-import { purchaseStore } from '$lib/stores/purchase.store';+import { authManager } from '$lib/managers/auth-manager.svelte';import { authenticate } from '$lib/utils/auth';import { getFormatter } from '$lib/utils/i18n';import { activateProduct, getActivationKey } from '$lib/utils/license-utils';@@ -21,7 +21,7 @@ export const load = (async ({ url }) => {const response = await activateProduct(licenseKey, activationKey);if (response.activatedAt !== '') {isActivated = true;- purchaseStore.setPurchaseStatus(true);+ authManager.isPurchased = true;}}} catch (error) {