From 60928bc165efa0c29a5d629acb33ef6b62b28635 Mon Sep 17 00:00:00 2001 From: dahyeon Date: Sun, 26 Apr 2026 05:38:58 -0700 Subject: [PATCH] . --- apps/web/src/api/hooks.ts | 32 ++++++++++++++++++++++++-- apps/web/src/pages/MatchDetailPage.tsx | 15 ++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/apps/web/src/api/hooks.ts b/apps/web/src/api/hooks.ts index 22bc1f82..3f96aa8a 100644 --- a/apps/web/src/api/hooks.ts +++ b/apps/web/src/api/hooks.ts @@ -1,6 +1,12 @@ +import { InteractionStatus } from '@azure/msal-browser'; +import { useMsal } from '@azure/msal-react'; import { useQuery } from '@tanstack/react-query'; import { DEFAULT_COMMUNITY_ID, useAuthUserId } from '../config'; import { apiFetch } from '../lib/api'; +import { + isMsalConfigured, + MSAL_API_SCOPE, +} from '../lib/auth/msal.config'; import type { ApiAuction, ApiCommunity, @@ -93,10 +99,32 @@ export function useDdragonManifest(locale = 'ko_KR') { export function useMe() { const authUserId = useAuthUserId(); + const { accounts, inProgress, instance } = useMsal(); + const account = isMsalConfigured + ? (instance.getActiveAccount() ?? accounts[0] ?? null) + : null; + const accountKey = account?.homeAccountId ?? null; + const isMsalReady = + !isMsalConfigured || inProgress === InteractionStatus.None; return useQuery({ - queryKey: ['me', authUserId], - queryFn: () => apiFetch('/me'), + queryKey: ['me', authUserId, accountKey], + queryFn: async () => { + if (!account) { + return apiFetch('/me'); + } + + const response = await instance.acquireTokenSilent({ + account, + scopes: [MSAL_API_SCOPE], + }); + return apiFetch('/me', { + headers: { + Authorization: `Bearer ${response.accessToken}`, + }, + }); + }, + enabled: Boolean(authUserId || isMsalReady), retry: false, }); } diff --git a/apps/web/src/pages/MatchDetailPage.tsx b/apps/web/src/pages/MatchDetailPage.tsx index 58b35be1..e60de37b 100644 --- a/apps/web/src/pages/MatchDetailPage.tsx +++ b/apps/web/src/pages/MatchDetailPage.tsx @@ -384,6 +384,8 @@ export default function MatchDetailPage() { const si = statusBadge(match.status); const canManageAuction = currentUser?.role === 'owner' || currentUser?.role === 'admin'; + const isCheckingPermissions = + meQuery.isLoading || (meQuery.isFetching && !meQuery.data); const auctionNotStarted = auctionQuery.error instanceof ApiError && auctionQuery.error.status === 404; const showAuctionLink = Boolean(auctionQuery.data); @@ -502,7 +504,16 @@ export default function MatchDetailPage() { isJoining={joinMatchMutation.isPending} /> - {canManageAuction && ( + {isCheckingPermissions ? ( +
+

+ 권한 확인 중 +

+

+ 관리자 권한을 확인한 뒤 경매 시작 버튼을 표시합니다. +

+
+ ) : canManageAuction ? (

@@ -567,7 +578,7 @@ export default function MatchDetailPage() {

)}
- )} + ) : null} ) : (