fix: hook 대신 API 함수에서 에러를 처리하도록 수정

Author: MU-Software

packages/shop/src/apis/index.ts

@@ -44,18 +44,31 @@ namespace ShopAPIs {
 
   /**
    * 로그아웃합니다.
-   * @throws 401 - 로그아웃이 성공할 시에도 항상 401 에러가 발생합니다.
    */
-  export const signOut = (client: ShopAPIClient) => () =>
-    client.delete<ShopSchemas.UserSignedInStatus>("authn/social/browser/v1/auth/session");
+  export const signOut = (client: ShopAPIClient) => async () => {
+    try {
+      await client.delete<ShopSchemas.UserSignedInStatus>("authn/social/browser/v1/auth/session");
+    } catch (error) {
+    }
+    return Promise.resolve({});
+  }
 
   /**
    * 로그인 정보를 조회합니다.
    * @returns 로그인 정보
-   * @throws 401 - 로그인 정보가 없습니다.
    */
-  export const retrieveUserInfo = (client: ShopAPIClient) => () =>
-    client.get<ShopSchemas.UserSignedInStatus>("authn/social/browser/v1/auth/session");
+  export const retrieveUserInfo = (client: ShopAPIClient) => async () => {
+    try {
+      const response = await client.get<ShopSchemas.UserSignedInStatus>("authn/social/browser/v1/auth/session");
+      if (response.meta.is_authenticated) {
+        return response;
+      } else {
+        throw new Error("User is not authenticated");
+      }
+    } catch (error) {
+    }
+    return Promise.resolve(null);
+  }
 
   /**
    * 노출 중인 모든 상품의 목록을 가져옵니다.

packages/shop/src/hooks/index.ts

@@ -8,22 +8,23 @@ import ShopContext from '../contexts';
 import ShopSchemas from "../schemas";
 
 const QUERY_KEYS = {
-  USER: ["query", "user"],
-  PRODUCT_LIST: ["query", "products"],
-  CART_INFO: ["query", "cart"],
-  ORDER_LIST: ["query", "orders"],
+  BASE: ["query", "shop"],
+  USER: ["query", "shop", "user"],
+  PRODUCT_LIST: ["query", "shop", "products"],
+  CART_INFO: ["query", "shop", "cart"],
+  ORDER_LIST: ["query", "shop", "orders"],
 };
 
 const MUTATION_KEYS = {
-  USER_SIGN_IN_EMAIL: ["mutation", "user", "sign_in", "email"],
-  USER_SIGN_IN_SNS: ["mutation", "user", "sign_in", "sns"],
-  USER_SIGN_OUT: ["mutation", "user", "sign_out"],
-  CART_ITEM_APPEND: ["mutation", "cart", "item", "append"],
-  CART_ITEM_REMOVE: ["mutation", "cart", "item", "remove"],
-  CART_ORDER_START: ["mutation", "cart_order", "start"],
-  ONE_ITEM_ORDER_START: ["mutation", "one_item_order", "start"],
-  ALL_ORDER_REFUND: ["mutation", "all_order_refund"],
-  ONE_ITEM_REFUND: ["mutation", "one_item_refund"],
+  USER_SIGN_IN_EMAIL: ["mutation", "shop", "user", "sign_in", "email"],
+  USER_SIGN_IN_SNS: ["mutation", "shop", "user", "sign_in", "sns"],
+  USER_SIGN_OUT: ["mutation", "shop", "user", "sign_out"],
+  CART_ITEM_APPEND: ["mutation", "shop", "cart", "item", "append"],
+  CART_ITEM_REMOVE: ["mutation", "shop", "cart", "item", "remove"],
+  CART_ORDER_START: ["mutation", "shop", "cart_order", "start"],
+  ONE_ITEM_ORDER_START: ["mutation", "shop", "one_item_order", "start"],
+  ALL_ORDER_REFUND: ["mutation", "shop", "all_order_refund"],
+  ONE_ITEM_REFUND: ["mutation", "shop", "one_item_refund"],
 };
 
 namespace ShopHooks {
@@ -43,59 +44,29 @@ namespace ShopHooks {
   export const useUserStatus = () =>
     useSuspenseQuery({
       queryKey: QUERY_KEYS.USER,
-      queryFn: async () => {
-        try {
-          const userInfo = await clientDecorator(ShopAPIs.retrieveUserInfo)();
-          return userInfo.meta.is_authenticated === true ? userInfo : null;
-        } catch (e) {
-          return null;
-        }
-      },
+      queryFn: clientDecorator(ShopAPIs.retrieveUserInfo),
+      retry: 3,
     });
 
   export const useSignInWithEmailMutation = () =>
     useMutation({
       mutationKey: MUTATION_KEYS.USER_SIGN_IN_EMAIL,
       mutationFn: clientDecorator(ShopAPIs.signInWithEmail),
-      meta: {
-        invalidates: [
-          QUERY_KEYS.USER,
-          QUERY_KEYS.CART_INFO,
-          QUERY_KEYS.ORDER_LIST,
-        ],
-      },
+      meta: { invalidates: [ QUERY_KEYS.BASE ] },
     });
 
   export const useSignInWithSNSMutation = () =>
     useMutation({
       mutationKey: MUTATION_KEYS.USER_SIGN_IN_SNS,
       mutationFn: clientDecorator(ShopAPIs.signInWithSNS),
-      meta: {
-        invalidates: [
-          QUERY_KEYS.USER,
-          QUERY_KEYS.CART_INFO,
-          QUERY_KEYS.ORDER_LIST,
-        ],
-      },
+      meta: { invalidates: [ QUERY_KEYS.BASE ] },
     });
 
   export const useSignOutMutation = () =>
     useMutation({
       mutationKey: MUTATION_KEYS.USER_SIGN_OUT,
-      mutationFn: async () => {
-        try {
-          return await clientDecorator(ShopAPIs.signOut)();
-        } catch (e) {
-          return null;
-        }
-      },
-      meta: {
-        invalidates: [
-          QUERY_KEYS.USER,
-          QUERY_KEYS.CART_INFO,
-          QUERY_KEYS.ORDER_LIST,
-        ],
-      },
+      mutationFn: clientDecorator(ShopAPIs.signOut),
+      meta: { invalidates: [ QUERY_KEYS.BASE ] },
     });
 
   export const useProducts = (qs?: ShopSchemas.ProductListQueryParams) =>