Skip to content

armgit / umami

Public Imported from GitHub
0

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.

refactor(2FA): use queries in `UserTwoFactorSettings`

Rudy B.d17900db4cb9
diff --git a/src/app/(main)/admin/users/[userId]/UserTwoFactorSettings.tsx b/src/app/(main)/admin/users/[userId]/UserTwoFactorSettings.tsx
index 864410f4c..716244339 100644
--- a/src/app/(main)/admin/users/[userId]/UserTwoFactorSettings.tsx
+++ b/src/app/(main)/admin/users/[userId]/UserTwoFactorSettings.tsx
@@ -1,27 +1,24 @@
'use client';
import { Column, Row, Switch, Text, Tooltip, TooltipTrigger } from '@umami/react-zen';
import { Badge } from '@/components/common/Badge';
-import { useMessages, useUpdateQuery, useTwoFactorStatusQuery } from '@/components/hooks';
-import { useApi } from '@/components/hooks/useApi';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
+import {
+ useMessages,
+ useUpdateQuery,
+ useTwoFactorStatusQuery,
+ useUserQuery,
+ useTwoFactorUserStatusQuery
+} from '@/components/hooks';
+import { useQueryClient } from '@tanstack/react-query';
export function UserTwoFactorSettings({ userId }: { userId: string }) {
const { t, labels, messages } = useMessages();
- const { get } = useApi();
const queryClient = useQueryClient();
const { data: globalStatus } = useTwoFactorStatusQuery(true);
const isGlobalRequired = globalStatus?.requiredReason === 'global';
- const { data: userTfaData } = useQuery({
- queryKey: ['user-2fa-status', userId],
- queryFn: () => get(`/admin/users/${userId}/2fa`),
- });
-
- const { data: userData } = useQuery({
- queryKey: ['user', userId],
- queryFn: () => get(`/users/${userId}`),
- });
+ const { data: userTfaData } = useTwoFactorUserStatusQuery(userId);
+ const { data: userData } = useUserQuery(userId);
const { mutateAsync: setUserRequired } = useUpdateQuery(`/admin/users/${userId}/2fa`);
diff --git a/src/components/hooks/index.ts b/src/components/hooks/index.ts
index 844497dc3..113c09ed8 100644
--- a/src/components/hooks/index.ts
+++ b/src/components/hooks/index.ts
@@ -33,6 +33,7 @@ export * from './queries/useLinkSharesQuery';
export * from './queries/useLinksQuery';
export * from './queries/useLoginQuery';
export * from './queries/useTwoFactorStatusQuery';
+export * from './queries/useTwoFactorUserStatus';
export * from './queries/useTwoFactorVerifyMutation';
export * from './queries/usePixelQuery';
export * from './queries/usePixelSharesQuery';
diff --git a/src/components/hooks/queries/useTwoFactorUserStatus.ts b/src/components/hooks/queries/useTwoFactorUserStatus.ts
new file mode 100644
index 000000000..d1d73168a
--- /dev/null
+++ b/src/components/hooks/queries/useTwoFactorUserStatus.ts
@@ -0,0 +1,12 @@
+import { useApi } from '../useApi';
+
+export function useTwoFactorUserStatusQuery(userId: string) {
+ const { get, useQuery } = useApi();
+
+ return useQuery({
+ queryKey: ['user-2fa-status', userId],
+ queryFn: () => get(`/admin/users/${userId}/2fa`),
+ refetchOnWindowFocus: true,
+ refetchOnReconnect: true,
+ });
+}