A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(app): resume Operator Pass checkout after payment returns
Hampusf54fa65fe810
diff --git a/fluxer_app/src/features/premium/components/PremiumCheckoutReturnWatcher.tsx b/fluxer_app/src/features/premium/components/PremiumCheckoutReturnWatcher.tsxindex 5e0a005c0..78e1a1cc4 100644--- a/fluxer_app/src/features/premium/components/PremiumCheckoutReturnWatcher.tsx+++ b/fluxer_app/src/features/premium/components/PremiumCheckoutReturnWatcher.tsx@@ -1,11 +1,17 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport RuntimeConfig from '@app/features/app/state/RuntimeConfig';+import {offerAuthenticatorCalmly} from '@app/features/auth/components/modals/AuthenticatorOfferModal';import Accounts from '@app/features/auth/state/Accounts';+import * as OperatorPassCommands from '@app/features/premium/commands/OperatorPassCommands';+import * as OperatorPassModalCommands from '@app/features/premium/commands/OperatorPassModalCommands';import * as PlutoniumPageCommands from '@app/features/premium/commands/PlutoniumPageCommands';import * as PremiumCommands from '@app/features/premium/commands/PremiumCommands';+import {isOperatorPassAvailable} from '@app/features/premium/utils/OperatorPassUtils';import {consumeCompletedPremiumCheckoutReturnIntent,+ consumeOperatorPassCheckoutReturnIntent,+ getCurrentOperatorPassCount,getCurrentPremiumActive,getPendingPremiumCheckoutReturnIntent,} from '@app/features/premium/utils/PremiumCheckoutReturnIntent';@@ -17,6 +23,11 @@ import {useCallback, useEffect, useRef} from 'react';const REFRESH_COOLDOWN_MS = 2000;+function reopenOperatorPassCheckout(): void {+ if (!isOperatorPassAvailable()) return;+ OperatorPassModalCommands.reopenCheckoutModalAfterReturn();+}+interface ActivePremiumCheckoutReturnWatcherProps {readonly currentUserId: string;readonly showPremiumFeatures: boolean;@@ -27,18 +38,28 @@ const ActivePremiumCheckoutReturnWatcher = observer(function ActivePremiumCheckoshowPremiumFeatures,}: ActivePremiumCheckoutReturnWatcherProps) {const isPremium = getCurrentPremiumActive();+ const operatorPassCount = getCurrentOperatorPassCount();const isFocused = WindowState.focused;const isVisible = WindowState.visible;const refreshInFlightRef = useRef(false);const lastRefreshAtRef = useRef(0);const maybeRefreshPremiumState = useCallback(() => {if (!showPremiumFeatures) return;- if (!getPendingPremiumCheckoutReturnIntent()) return;+ const intent = getPendingPremiumCheckoutReturnIntent();+ if (!intent) return;const now = Date.now();if (refreshInFlightRef.current || now - lastRefreshAtRef.current < REFRESH_COOLDOWN_MS) return;lastRefreshAtRef.current = now;refreshInFlightRef.current = true;- void PremiumCommands.refreshPremiumState()+ const refresh =+ intent.source === 'operator_pass'+ ? OperatorPassCommands.fetchState().then((state) => {+ if (consumeOperatorPassCheckoutReturnIntent(state)) {+ reopenOperatorPassCheckout();+ }+ })+ : PremiumCommands.refreshPremiumState();+ void refresh.catch(() => undefined).finally(() => {refreshInFlightRef.current = false;@@ -51,9 +72,16 @@ const ActivePremiumCheckoutReturnWatcher = observer(function ActivePremiumChecko}, [isFocused, isVisible, maybeRefreshPremiumState, showPremiumFeatures]);useEffect(() => {if (!showPremiumFeatures) return;- if (!isPremium || !consumeCompletedPremiumCheckoutReturnIntent()) return;+ if (!isPremium && operatorPassCount === 0) return;+ const intent = consumeCompletedPremiumCheckoutReturnIntent();+ if (!intent) return;+ if (intent.source === 'operator_pass') {+ reopenOperatorPassCheckout();+ return;+ }PlutoniumPageCommands.openPlutoniumPage();- }, [isPremium, currentUserId, showPremiumFeatures]);+ void offerAuthenticatorCalmly();+ }, [isPremium, operatorPassCount, currentUserId, showPremiumFeatures]);return null;});diff --git a/fluxer_app/src/features/premium/components/pages/PremiumCallbackPage.tsx b/fluxer_app/src/features/premium/components/pages/PremiumCallbackPage.tsxindex d7cee6aa1..0f109f168 100644--- a/fluxer_app/src/features/premium/components/pages/PremiumCallbackPage.tsx+++ b/fluxer_app/src/features/premium/components/pages/PremiumCallbackPage.tsx@@ -1,7 +1,9 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport {useLocation} from '@app/features/platform/components/router/RouterReact';+import {OperatorPassCheckoutSuccess} from '@app/features/premium/components/operator_pass/OperatorPassCheckoutSuccess';import styles from '@app/features/premium/components/pages/PremiumCallbackPage.module.css';+import {isOperatorPassAvailable} from '@app/features/premium/utils/OperatorPassUtils';import {shouldShowPremiumFeatures} from '@app/features/premium/utils/PremiumUtils';import {Trans} from '@lingui/react/macro';import {CheckCircleIcon, XCircleIcon} from '@phosphor-icons/react';@@ -20,6 +22,7 @@ const PremiumCallbackPage = observer(() => {if (!shouldShowPremiumFeatures()) {return null;}+ const isOperatorPass = isOperatorPassAvailable() && queryParams.get('product') === 'operator_pass';const isSuccess = status === 'success';const isCancel = status === 'cancel';const isClosedBillingPortal = status === 'closed-billing-portal';@@ -32,14 +35,21 @@ const PremiumCallbackPage = observer(() => {weight="fill"data-flx="premium.premium-callback-page.success-icon"/>- <div className={styles.content} data-flx="premium.premium-callback-page.content">- <h1 className={styles.title} data-flx="premium.premium-callback-page.title">- <Trans>Payment successful</Trans>- </h1>- <p className={styles.description} data-flx="premium.premium-callback-page.description">- <Trans>Your payment was successful. You can now close this tab and return to the app.</Trans>- </p>- </div>+ {isOperatorPass ? (+ <OperatorPassCheckoutSuccess+ sessionId={queryParams.get('session_id')}+ data-flx="premium.premium-callback-page.operator-pass-success"+ />+ ) : (+ <div className={styles.content} data-flx="premium.premium-callback-page.content">+ <h1 className={styles.title} data-flx="premium.premium-callback-page.title">+ <Trans>Payment successful</Trans>+ </h1>+ <p className={styles.description} data-flx="premium.premium-callback-page.description">+ <Trans>Your payment was successful. You can now close this tab and return to the app.</Trans>+ </p>+ </div>+ )}</>)}{isCancel && (diff --git a/fluxer_app/src/features/premium/utils/PremiumCheckoutReturnIntent.ts b/fluxer_app/src/features/premium/utils/PremiumCheckoutReturnIntent.tsindex 7e038a40a..404d8e497 100644--- a/fluxer_app/src/features/premium/utils/PremiumCheckoutReturnIntent.ts+++ b/fluxer_app/src/features/premium/utils/PremiumCheckoutReturnIntent.ts@@ -1,14 +1,16 @@// SPDX-License-Identifier: AGPL-3.0-or-laterimport {getProtectedSessionStorage} from '@app/features/platform/state/ProtectedWebStorage';+import OperatorPassHoldings from '@app/features/premium/state/OperatorPassHoldings';import PremiumState from '@app/features/premium/state/PremiumState';import Users from '@app/features/user/state/Users';import {isRecord} from '@fluxer/record_utils/src/RecordGuards';+import type {OperatorPassStateResponse} from '@fluxer/schema/src/domains/operator_pass/OperatorPassSchemas';const STORAGE_KEY = 'PremiumCheckoutReturnIntent';const INTENT_TTL_MS = 30 * 60 * 1000;-export type PremiumCheckoutReturnSource = 'plutonium';+export type PremiumCheckoutReturnSource = 'plutonium' | 'operator_pass';interface PremiumCheckoutReturnIntent {id: string;@@ -16,7 +18,8 @@ interface PremiumCheckoutReturnIntent {userId: string | null;createdAt: number;expiresAt: number;- startedPremium: boolean;+ startedComplete: boolean;+ startedPassCount: number;}function getStorage(): Storage | null {@@ -34,11 +37,12 @@ function parsePremiumCheckoutReturnIntent(raw: string): PremiumCheckoutReturnInt}if (typeof parsed.id !== 'string' ||- parsed.source !== 'plutonium' ||+ (parsed.source !== 'plutonium' && parsed.source !== 'operator_pass') ||(typeof parsed.userId !== 'string' && parsed.userId !== null) ||typeof parsed.createdAt !== 'number' ||typeof parsed.expiresAt !== 'number' ||- typeof parsed.startedPremium !== 'boolean'+ typeof parsed.startedComplete !== 'boolean' ||+ typeof parsed.startedPassCount !== 'number') {return null;}@@ -48,7 +52,8 @@ function parsePremiumCheckoutReturnIntent(raw: string): PremiumCheckoutReturnIntuserId: parsed.userId,createdAt: parsed.createdAt,expiresAt: parsed.expiresAt,- startedPremium: parsed.startedPremium,+ startedComplete: parsed.startedComplete,+ startedPassCount: parsed.startedPassCount,};}@@ -59,6 +64,14 @@ export function getCurrentPremiumActive(): boolean {return premiumState?.effective.is_premium ?? currentUser.isPremium();}+export function getCurrentOperatorPassCount(): number {+ return OperatorPassHoldings.count ?? (Users.currentUser?.operatorPassSince != null ? 1 : 0);+}++function isCheckoutReturnComplete(source: PremiumCheckoutReturnSource, startedPassCount: number): boolean {+ return source === 'operator_pass' ? getCurrentOperatorPassCount() > startedPassCount : getCurrentPremiumActive();+}+function readIntent(): PremiumCheckoutReturnIntent | null {const storage = getStorage();if (!storage) return null;@@ -81,12 +94,16 @@ function readIntent(): PremiumCheckoutReturnIntent | null {}}-export function recordPremiumCheckoutReturnIntent(source: PremiumCheckoutReturnSource): void {+export function recordPremiumCheckoutReturnIntent(+ source: PremiumCheckoutReturnSource,+ options: {passCount?: number} = {},+): void {const storage = getStorage();if (!storage) return;const currentUser = Users.currentUser;- const startedPremium = getCurrentPremiumActive();- if (startedPremium) {+ const startedPassCount = options.passCount ?? getCurrentOperatorPassCount();+ const startedComplete = source === 'plutonium' && getCurrentPremiumActive();+ if (startedComplete) {storage.removeItem(STORAGE_KEY);return;}@@ -97,14 +114,15 @@ export function recordPremiumCheckoutReturnIntent(source: PremiumCheckoutReturnSuserId: currentUser?.id ?? null,createdAt: now,expiresAt: now + INTENT_TTL_MS,- startedPremium,+ startedComplete,+ startedPassCount,};storage.setItem(STORAGE_KEY, JSON.stringify(intent));}export function getPendingPremiumCheckoutReturnIntent(): PremiumCheckoutReturnIntent | null {const intent = readIntent();- if (!intent || intent.startedPremium) return null;+ if (!intent || intent.startedComplete) return null;const currentUserId = Users.currentUser?.id ?? null;if (intent.userId && intent.userId !== currentUserId) {clearPremiumCheckoutReturnIntent();@@ -115,11 +133,19 @@ export function getPendingPremiumCheckoutReturnIntent(): PremiumCheckoutReturnInexport function consumeCompletedPremiumCheckoutReturnIntent(): PremiumCheckoutReturnIntent | null {const intent = getPendingPremiumCheckoutReturnIntent();- if (!intent || !getCurrentPremiumActive()) return null;+ if (!intent || !isCheckoutReturnComplete(intent.source, intent.startedPassCount)) return null;clearPremiumCheckoutReturnIntent();return intent;}+export function consumeOperatorPassCheckoutReturnIntent(state: OperatorPassStateResponse): boolean {+ const intent = getPendingPremiumCheckoutReturnIntent();+ if (intent?.source !== 'operator_pass') return false;+ if ((state.holder?.count ?? 0) <= intent.startedPassCount) return false;+ clearPremiumCheckoutReturnIntent();+ return true;+}+function clearPremiumCheckoutReturnIntent(): void {getStorage()?.removeItem(STORAGE_KEY);}