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
30 changes: 18 additions & 12 deletions src/app/(auth)/redirect/[method]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,25 @@ const Redirect = ({ params: { method } }: { params: { method: string } }) => {
.get<ResponseType>({
url: `users/login/${method}/callback?code=${code}`,
})
.then(({ tokenResponseDto: { access_token }, userInfoDto: { nickname, userId } }) => {
if (!nickname) {
setItem(sessionStorage, 'token', access_token);
setItem(sessionStorage, 'userId', userId.toString());
.then(
({
tokenResponseDto: { access_token, refresh_token },
userInfoDto: { nickname, userId },
}) => {
if (!nickname) {
setItem(sessionStorage, 'token', access_token);
setItem(sessionStorage, 'userId', userId.toString());

router.replace(`/signup/${method}`);
} else {
setItem(localStorage, 'token', access_token);
setItem(localStorage, `userId`, userId.toString());
setItem(localStorage, 'provider', method.toUpperCase());
router.replace('/');
}
});
router.replace(`/signup/${method}`);
} else {
setItem(localStorage, 'token', access_token);
setItem(localStorage, 'userId', userId.toString());
setItem(localStorage, 'provider', method.toUpperCase());
setItem(localStorage, 'refreshToken', refresh_token);
router.replace('/');
}
},
);
}, [code, method, router]);

return (
Expand Down
9 changes: 7 additions & 2 deletions src/app/_components/Provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import { ReactNode } from 'react';
import client from '@/apis/core';
import { clearItem, setItem } from '@/utils/storage';
import { clearItem, getItem, setItem } from '@/utils/storage';
import { initializeApp } from '@firebase/app';
import { QueryCache, QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
Expand Down Expand Up @@ -30,7 +30,12 @@ const Provider = ({
clearItem(localStorage);
} else if (error.response?.status === 1401) {
client
.get<RefreshTokenResponse>({ url: '/users/refresh/kakao' })
.get<RefreshTokenResponse>({
url: '/users/refresh/kakao',
headers: {
refreshToken: getItem(localStorage, 'refreshToken'),
},
})
.then((res) => setItem(localStorage, 'token', res.access_token));
}
}
Expand Down
22 changes: 14 additions & 8 deletions src/app/chat/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface ChatRoomInfo {
updatedAt: string;
lastMessage: ChatType;
participantCnt: number;
unReadMsgCnt: number;
}

const ChatList = () => {
Expand All @@ -40,14 +41,15 @@ const ChatList = () => {
}
};

const fetchChats = async ({ pageParam }: { pageParam: number }) => {
const fetchChats = async ({ pageParam }: { pageParam: string }) => {
const data = await client.get<ChatRoomInfo[]>({
url: `/chats/rooms/${userId}?${pageParam === 0 ? '' : `cursor=${pageParam}&`}pageSize=10`,
url: `/chats/rooms/${userId}?${pageParam === '0' ? '' : `cursor=${pageParam}&`}pageSize=10`,
headers: {
Authorization: `Bearer ${getItem(localStorage, 'token')}`,
provider: getItem(localStorage, 'provider'),
},
});
console.log(data);
setChatRooms([...chatRooms, ...data]);
if (data.length < 10) setStop(true);
return data;
Expand All @@ -56,14 +58,13 @@ const ChatList = () => {
const { hasNextPage, fetchNextPage, isFetchingNextPage } = useInfiniteQuery({
queryKey: ['moreChatList'],
queryFn: fetchChats,
initialPageParam: 0,
initialPageParam: '0',
getNextPageParam: () => {
if (stop || chatRooms.length === 0) return undefined;
return chatRooms[chatRooms.length - 1].roomId;
return chatRooms[chatRooms.length - 1].updatedAt;
},
enabled: !!userId,
});
console.log(hasNextPage);

useEffect(() => {
if (!getItem(localStorage, 'token')) router.replace('/signin');
Expand All @@ -72,10 +73,10 @@ const ChatList = () => {
return (
<ul className="flex flex-col gap-2">
{chatRooms?.length !== 0
? chatRooms?.map(({ mogakkoId, lastMessage, name, updatedAt }) => (
? chatRooms?.map(({ mogakkoId, lastMessage, name, updatedAt, unReadMsgCnt }) => (
<li
key={mogakkoId}
className="flex cursor-pointer items-center justify-between gap-2"
key={mogakkoId}
onClick={() => router.push(`chat/${mogakkoId}`)}
>
<Image
Expand All @@ -86,10 +87,15 @@ const ChatList = () => {
className="h-12 w-12 rounded-xl"
priority
/>
<div className="flex w-48 grow flex-col">
<div className="flex grow flex-col">
<p className="text-lg">{name}</p>
<p className="text-gray-500">{lastMessage.message}</p>
</div>
{unReadMsgCnt > 0 && (
<p className="flex h-4 w-4 items-center justify-center rounded-full bg-red-500 text-sm text-white">
{unReadMsgCnt}
</p>
)}
<p className="text-sm text-gray-500">{handleDate(updatedAt)}</p>
</li>
))
Expand Down
Loading