Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Load subscription data from API before rendering replay and heatmap views
Mike Caoadba113b04c2
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsxindex c3b968b46..b771fc020 100644--- a/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsx+++ b/src/app/(main)/websites/[websiteId]/(reports)/heatmaps/HeatmapsPage.tsx@@ -1,5 +1,5 @@'use client';-import { Button, Column, Row, SearchField } from '@umami/react-zen';+import { Button, Column, Loading, Row, SearchField } from '@umami/react-zen';import { useState } from 'react';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';import { EmptyPlaceholder } from '@/components/common/EmptyPlaceholder';@@ -9,7 +9,6 @@ import { Flame } from '@/components/icons';import { FilterButtons } from '@/components/input/FilterButtons';import type { HeatmapMode } from '@/queries/sql';import { Heatmap } from './Heatmap';-import styles from './Heatmap.module.css';export function HeatmapsPage({ websiteId }: { websiteId: string }) {const [urlPathByMode, setUrlPathByMode] = useState<Record<HeatmapMode, string>>({@@ -21,13 +20,17 @@ export function HeatmapsPage({ websiteId }: { websiteId: string }) {const { isPhone } = useMobile();const website = useWebsite();const { t, labels, messages } = useMessages();- const { hasFeature, cloudMode } = useSubscription(website?.teamId);+ const { hasFeature, cloudMode, isLoading } = useSubscription(website?.teamId);const buttons = [{ id: 'click', label: 'Clicks' },{ id: 'scroll', label: 'Scroll' },];+ if (isLoading) {+ return <Loading placement="absolute" />;+ }+if (cloudMode && !hasFeature('replays')) {return (<Column gap="3">diff --git a/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsx b/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsxindex b34d3fb2f..5070588d1 100644--- a/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsx+++ b/src/app/(main)/websites/[websiteId]/replays/ReplaysPage.tsx@@ -1,5 +1,5 @@'use client';-import { Button, Column, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';+import { Button, Column, Loading, Tab, TabList, TabPanel, Tabs } from '@umami/react-zen';import { type Key, useState } from 'react';import { SessionModal } from '@/app/(main)/websites/[websiteId]/sessions/SessionModal';import { WebsiteControls } from '@/app/(main)/websites/[websiteId]/WebsiteControls';@@ -18,13 +18,17 @@ export function ReplaysPage({ websiteId }: { websiteId: string }) {const [tab, setTab] = useState(getItem(KEY_NAME) || 'replays');const website = useWebsite();const { t, labels, messages } = useMessages();- const { hasFeature, cloudMode } = useSubscription(website?.teamId);+ const { hasFeature, cloudMode, isLoading } = useSubscription(website?.teamId);const handleSelect = (value: Key) => {setItem(KEY_NAME, value);setTab(value);};+ if (isLoading) {+ return <Loading placement="absolute" />;+ }+if (cloudMode && !hasFeature('replays')) {return (<Column gap="3">diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsxindex 128ef106b..980f215be 100644--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteReplaySettings.tsx@@ -3,6 +3,7 @@ import {Column,Label,ListItem,+ Loading,Row,Select,Slider,@@ -21,7 +22,7 @@ const RECORDER_NAME = 'recorder.js';export function WebsiteReplaySettings({ websiteId }: { websiteId: string }) {const website = useWebsite();const { t, labels, messages } = useMessages();- const { hasFeature, cloudMode } = useSubscription(website?.teamId);+ const { hasFeature, cloudMode, isLoading } = useSubscription(website?.teamId);const { mutateAsync, touch, toast, isPending } = useUpdateQuery(`/websites/${websiteId}`);const config = getRecorderConfig(website?.replayConfig);@@ -111,6 +112,10 @@ export function WebsiteReplaySettings({ websiteId }: { websiteId: string }) {await saveRecorderConfig(getNextConfig());};+ if (isLoading) {+ return <Loading placement="absolute" />;+ }+if (cloudMode && !hasFeature('replays')) {return (<Column gap="4">diff --git a/src/app/api/auth/subscription/route.ts b/src/app/api/auth/subscription/route.tsnew file mode 100644index 000000000..d551a29c5--- /dev/null+++ b/src/app/api/auth/subscription/route.ts@@ -0,0 +1,44 @@+import { z } from 'zod';+import { fetchAccount, fetchTeam } from '@/lib/load';+import { parseRequest } from '@/lib/request';+import { normalizeSubscription } from '@/lib/subscription';+import { canViewTeam } from '@/permissions';++const headers = {+ 'Cache-Control': 'private, no-store, max-age=0',+};++export const dynamic = 'force-dynamic';++export async function GET(request: Request) {+ const schema = z.object({+ teamId: z.string().uuid().optional(),+ });++ const { auth, query, error } = await parseRequest(request, schema);++ if (error) {+ return error();+ }++ const { teamId } = query;++ if (teamId && !(await canViewTeam(auth, teamId))) {+ return Response.json(+ {+ error: {+ message: 'Unauthorized',+ code: 'unauthorized',+ status: 401,+ },+ },+ { status: 401, headers },+ );+ }++ const account = teamId+ ? ((await fetchTeam(teamId)) ?? (await fetchAccount(auth.user.id)))+ : await fetchAccount(auth.user.id);++ return Response.json(normalizeSubscription(account), { headers });+}diff --git a/src/app/api/auth/verify/route.ts b/src/app/api/auth/verify/route.tsindex 01c049fb6..b308b7b69 100644--- a/src/app/api/auth/verify/route.ts+++ b/src/app/api/auth/verify/route.ts@@ -1,4 +1,3 @@-import { fetchAccount, fetchTeam } from '@/lib/load';import { parseRequest } from '@/lib/request';import { json } from '@/lib/response';import { getAllUserTeams } from '@/queries/prisma';@@ -10,42 +9,7 @@ export async function POST(request: Request) {return error();}- const user = { ...auth.user };- const teams = await getAllUserTeams(user.id);+ const teams = await getAllUserTeams(auth.user.id);- if (process.env.CLOUD_MODE) {- const account = await fetchAccount(user.id);-- if (account) {- user.subscription = {- isPro: account.isPro || false,- isBusiness: account.isBusiness || false,- isNoBilling: account.isNoBilling || false,- hasSubscription: account.hasSubscription || false,- unlimitedWebsites: account.unlimitedWebsites || false,- };- }-- const teamsWithSubscription = await Promise.all(- teams.map(async (team: any) => {- const teamAccount = await fetchTeam(team.id);- return {- ...team,- subscription: teamAccount- ? {- isPro: teamAccount.isPro || false,- isBusiness: teamAccount.isBusiness || false,- isNoBilling: teamAccount.isNoBilling || false,- hasSubscription: teamAccount.hasSubscription || false,- unlimitedWebsites: teamAccount.unlimitedWebsites || false,- }- : null,- };- }),- );-- return json({ ...user, teams: teamsWithSubscription });- }-- return json({ ...user, teams });+ return json({ ...auth.user, teams });}diff --git a/src/components/hooks/useSubscription.ts b/src/components/hooks/useSubscription.tsindex 9ab287224..362420b07 100644--- a/src/components/hooks/useSubscription.ts+++ b/src/components/hooks/useSubscription.ts@@ -1,39 +1,33 @@+import { DEFAULT_SUBSCRIPTION, type Subscription } from '@/lib/subscription';import { useApp } from '@/store/app';+import { useApi } from './useApi';import { useConfig } from './useConfig';-export interface Subscription {- isPro: boolean;- isBusiness: boolean;- isNoBilling: boolean;- hasSubscription: boolean;- unlimitedWebsites: boolean;-}-const FEATURES = {replays: 'isBusiness',} as const;export type FeatureName = keyof typeof FEATURES;-const defaultSubscription: Subscription = {- isPro: false,- isBusiness: false,- isNoBilling: false,- hasSubscription: false,- unlimitedWebsites: false,-};-export function useSubscription(teamId?: string | null) {- const { user } = useApp();+ const userId = useApp(state => state.user?.id);const config = useConfig();-- const ownSubscription: Subscription = user?.subscription || defaultSubscription;- const teamSubscription: Subscription | null = teamId- ? (user?.teams?.find((t: any) => t.id === teamId)?.subscription ?? null)- : null;-- const subscription: Subscription = teamSubscription || ownSubscription;+ const { get, useQuery } = useApi();const cloudMode = config?.cloudMode || false;+ const {+ data: subscription = DEFAULT_SUBSCRIPTION,+ isLoading,+ isFetching,+ error,+ } = useQuery<Subscription>({+ queryKey: ['subscription', { teamId: teamId || null }],+ queryFn: () => get('/auth/subscription', teamId ? { teamId } : {}),+ enabled: cloudMode && !!userId,+ staleTime: 0,+ gcTime: 0,+ refetchOnMount: 'always',+ refetchOnWindowFocus: 'always',+ });function hasFeature(feature: FeatureName): boolean {if (!cloudMode || subscription.isNoBilling) {@@ -48,5 +42,8 @@ export function useSubscription(teamId?: string | null) {...subscription,cloudMode,hasFeature,+ isLoading: isLoading || isFetching,+ isFetching,+ error,};}diff --git a/src/lib/subscription.ts b/src/lib/subscription.tsindex 0b29f9a68..25f5f1b5e 100644--- a/src/lib/subscription.ts+++ b/src/lib/subscription.ts@@ -6,12 +6,38 @@ export interface SubscriptionAccount {unlimitedWebsites?: boolean | null;}+export interface Subscription {+ isPro: boolean;+ isBusiness: boolean;+ isNoBilling: boolean;+ hasSubscription: boolean;+ unlimitedWebsites: boolean;+}++export const DEFAULT_SUBSCRIPTION: Subscription = {+ isPro: false,+ isBusiness: false,+ isNoBilling: false,+ hasSubscription: false,+ unlimitedWebsites: false,+};+export const CLOUD_FREE_WEBSITE_LIMIT = 1;export const CLOUD_PRO_WEBSITE_LIMIT = 20;export const CLOUD_FREE_TEAM_LIMIT = 0;export const CLOUD_PRO_TEAM_LIMIT = 10;+export function normalizeSubscription(account?: SubscriptionAccount | null): Subscription {+ return {+ isPro: account?.isPro || false,+ isBusiness: account?.isBusiness || false,+ isNoBilling: account?.isNoBilling || false,+ hasSubscription: account?.hasSubscription || false,+ unlimitedWebsites: account?.unlimitedWebsites || false,+ };+}+export function getCloudWebsiteLimit(account?: SubscriptionAccount | null): number | null {if (!account?.hasSubscription) {return CLOUD_FREE_WEBSITE_LIMIT;