.
This commit is contained in:
1 parent
dfcfe9e4ad
commit
60928bc165
2 files changed
+43
-4
No files matched your search
@@ -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<MeResponse>('/me'),
|
||||
queryKey: ['me', authUserId, accountKey],
|
||||
queryFn: async () => {
|
||||
if (!account) {
|
||||
return apiFetch<MeResponse>('/me');
|
||||
}
|
||||
|
||||
const response = await instance.acquireTokenSilent({
|
||||
account,
|
||||
scopes: [MSAL_API_SCOPE],
|
||||
});
|
||||
return apiFetch<MeResponse>('/me', {
|
||||
headers: {
|
||||
Authorization: `Bearer ${response.accessToken}`,
|
||||
},
|
||||
});
|
||||
},
|
||||
enabled: Boolean(authUserId || isMsalReady),
|
||||
retry: false,
|
||||
});
|
||||
}
|
||||
@@ -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 ? (
|
||||
<div className="border border-base-content/10 bg-base-100 p-4">
|
||||
<h3 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
||||
권한 확인 중
|
||||
</h3>
|
||||
<p className="mt-1 text-xs text-base-content/40">
|
||||
관리자 권한을 확인한 뒤 경매 시작 버튼을 표시합니다.
|
||||
</p>
|
||||
</div>
|
||||
) : canManageAuction ? (
|
||||
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
|
||||
<div>
|
||||
<h3 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
|
||||
@@ -567,7 +578,7 @@ export default function MatchDetailPage() {
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
) : null}
|
||||
</>
|
||||
) : (
|
||||
<div className="space-y-4">
|
||||
|
||||
Reference in new issue
Block a user