diff --git a/src/ui/page/account/login/LoginPage.tsx b/src/ui/page/account/login/LoginPage.tsx index 3e54176..8c8a861 100644 --- a/src/ui/page/account/login/LoginPage.tsx +++ b/src/ui/page/account/login/LoginPage.tsx @@ -53,39 +53,27 @@ export default function LoginPage() { const loginPromise = accountNetwork.login(data); - toast.promise<{ message?: string }>( - () => new Promise(async (resolve, reject) => { - try { - loginPromise.then((res) => { - if (res.data.success) { - resolve({message: ''}); - } else { - reject(res.data.message); - } - }) - } catch (err) { - reject ("서버 에러 발생"); - } - }), + toast.promise( + loginPromise, { loading: "로그인 중입니다.", - success: "로그인이 완료되었습니다.", - error: (err) => `${err}` + success: (res) => { + setIsLoading(false); + if (res.data.success) { + const data = { + accessToken: res.data.accessToken!, + refreshToken: res.data.refreshToken! + }; + login({...data}); + moveToHomePage(); + return ""; + } else { + throw new Error(res.data.message); + } + }, + error: (err: Error) => err.message || "에러 발생" } ); - - loginPromise - .then((res) => { - if (res.data.success) { - const data = { - accessToken: res.data.accessToken!, - refreshToken: res.data.refreshToken! - } - login({ ...data }); - moveToHomePage(); - } - }) - .finally(() => setIsLoading(false)); } const TextSeparator = ({ text }: { text: string }) => {