Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/app/(team)/join-team/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,20 @@ import { useRouter } from 'next/navigation';
import { ROUTES } from '@/constants/routes';
import JoinTeamForm from '@/app/(team)/_components/JoinTeamForm';
import { postGroupInvitation } from '@/lib/apis/group';
import { useMemberships } from '@/hooks/useMemberships';
import { INVITATION_ERROR_MAP } from '@/utils/errorMap';
import { useQuery } from '@tanstack/react-query';
import { getUser } from '@/lib/apis/user';

const jwtRegex = /^[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+\.[A-Za-z0-9-_]+$/;

export default function JoinTeamPage() {
const router = useRouter();
const { memberships } = useMemberships(true);

const { data: currentUser } = useQuery({
queryKey: ['currentUser'],
queryFn: () => getUser({}),
enabled: true,
});

const [link, setLink] = useState('');
const [error, setError] = useState<string>();
Expand All @@ -27,7 +33,8 @@ export default function JoinTeamPage() {
setError('유효한 링크가 아닙니다.');
return;
}
const email = memberships[0]?.userEmail;
const email = currentUser?.email;

if (!email) {
setError('사용자 정보를 불러올 수 없습니다.');
return;
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/Header/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export default function Header() {
if (!fetchedUser) throw new Error('유저 정보를 가져오지 못했습니다');
return fetchedUser;
},
enabled: isLogin && Boolean(selectedGroup),
enabled: isLogin,
});

const handleLogout = () => {
Expand Down