From 9d0fbfb5fa506d84c57e93a03367d16d4b949bd8 Mon Sep 17 00:00:00 2001 From: Alex Zhang Date: Wed, 8 Jan 2025 17:23:54 -0800 Subject: [PATCH] fix login --- client/src/app/api/login/route.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/client/src/app/api/login/route.ts b/client/src/app/api/login/route.ts index 52112b2..30fd728 100644 --- a/client/src/app/api/login/route.ts +++ b/client/src/app/api/login/route.ts @@ -3,7 +3,7 @@ import { setCookie } from '@/lib/services/CookieService'; import { LoginRequest } from '@/lib/types/apiRequests'; import { LoginResponse } from '@/lib/types/apiResponses'; import { CookieType } from '@/lib/types/enums'; -import { getMessagesFromError } from '@/lib/utils'; +import { getErrorMessage, getMessagesFromError } from '@/lib/utils'; import axios, { AxiosError } from 'axios'; import { NextRequest, NextResponse } from 'next/server'; @@ -19,15 +19,12 @@ export async function POST(request: NextRequest) { const body = await request.json(); const { email, password } = body; const response = await login(email, password); - setCookie(CookieType.ACCESS_TOKEN, response.token); - setCookie(CookieType.USER, JSON.stringify(response.user)); + await setCookie(CookieType.ACCESS_TOKEN, response.token); + await setCookie(CookieType.USER, JSON.stringify(response.user)); return response; } catch (error) { if (error instanceof AxiosError) { - return NextResponse.json( - { error: error.response?.data.error.message }, - { status: error.status || 500 } - ); + return NextResponse.json({ error: getErrorMessage(error) }, { status: error.status || 500 }); } return NextResponse.json({ error: error }, { status: 500 }); }