chore: interceptor is updated

frontend/src/AppRoutes/utils.ts

@@ -40,7 +40,7 @@ const afterLogin = async (
 		}),
 	]);
 
-	if (getUserResponse.statusCode === 200) {
+	if (getUserResponse.statusCode === 200 && getUserResponse.payload) {
 		store.dispatch<AppActions>({
 			type: LOGGED_IN,
 			payload: {

frontend/src/api/index.ts

@@ -35,7 +35,6 @@ const interceptorRejected = async (
 	try {
 		if (axios.isAxiosError(value) && value.response) {
 			const { response } = value;
-			console.log(response);
 			// reject the refresh token error
 			if (response.status === 401 && response.config.url !== '/login') {
 				const response = await loginApi({
@@ -43,32 +42,37 @@ const interceptorRejected = async (
 				});
 
 				if (response.statusCode === 200) {
-					await afterLogin(
+					const user = await afterLogin(
 						response.payload.userId,
 						response.payload.accessJwt,
 						response.payload.refreshJwt,
 					);
 
-					const reResponse = await axios(
-						`${value.config.baseURL}${value.config.url?.substring(1)}`,
-						{
-							method: value.config.method,
-							headers: {
-								...value.config.headers,
-								Authorization: `Bearer ${response.payload.accessJwt}`,
+					if (user) {
+						const reResponse = await axios(
+							`${value.config.baseURL}${value.config.url?.substring(1)}`,
+							{
+								method: value.config.method,
+								headers: {
+									...value.config.headers,
+									Authorization: `Bearer ${response.payload.accessJwt}`,
+								},
+								data: {
+									...JSON.parse(value.config.data || '{}'),
+								},
 							},
-							data: {
-								...JSON.parse(value.config.data || '{}'),
-							},
-						},
-					);
+						);
 
-					if (reResponse.status === 200) {
-						return await Promise.resolve(reResponse);
+						if (reResponse.status === 200) {
+							return await Promise.resolve(reResponse);
+						}
+						Logout();
+
+						return await Promise.reject(reResponse);
 					}
 					Logout();
 
-					return await Promise.reject(reResponse);
+					return await Promise.reject(value);
 				}
 				Logout();
 			}
@@ -80,7 +84,7 @@ const interceptorRejected = async (
 		}
 		return await Promise.reject(value);
 	} catch (error) {
-		return Promise.reject(value);
+		return await Promise.reject(error);
 	}
 };
 

frontend/src/api/user/getUser.ts

@@ -17,7 +17,7 @@ const getUser = async (
 		return {
 			statusCode: 200,
 			error: null,
-			message: response.data.status,
+			message: 'Success',
 			payload: response.data,
 		};
 	} catch (error) {