@sayren/mcp 0.6.0 → 0.8.0

package/template/src/routes/auth.callback.ts

@@ -1,6 +1,7 @@
 import { ApiError } from "@sayren/storefront-sdk";
 import { IdpCallbackError } from "@sayren/storefront-sdk/auth";
 import { createFileRoute } from "@tanstack/react-router";
+import queryString from "query-string";
 import { authFor } from "../lib/api.server";
 import { clearCartToken, readCartToken } from "../lib/cart-session.server";
 import { readToken, signIn } from "../lib/session.server";
@@ -19,15 +20,20 @@ export const Route = createFileRoute("/auth/callback")({
         const url = new URL(request.url);
         const stored = readSocialLogin();
         clearSocialLogin();
-        const go = (location: string) =>
-          new Response(null, { status: 302, headers: { Location: location } });
-        const fail = (reason: string) => go(`/login?error=${encodeURIComponent(reason)}`);
+        // 화면 밖(서버 라우트)의 주소는 query-string으로 만든다 — 값 인코딩을 손으로 하지 않는다
+        const go = (path: string, query?: Record<string, string>) =>
+          new Response(null, {
+            status: 302,
+            // 복귀 경로(`stored.redirectTo`)는 이미 완성된 주소라 그대로 쓴다
+            headers: { Location: query ? queryString.stringifyUrl({ url: path, query }) : path },
+          });
+        const fail = (reason: string) => go("/login", { error: reason });
         if (!stored) return fail("state_mismatch");
 
         // 계정 연결 — 로그인한 구매자에 공급자 계정을 붙이고 계정 화면으로 돌아간다
         if (stored.linkProvider) {
           const accessToken = readToken();
-          if (!accessToken) return go("/login?redirectTo=%2Faccount");
+          if (!accessToken) return go("/login", { redirectTo: "/account" });
           try {
             await authFor().linkIdpCallback(accessToken, stored.linkProvider, {
               code: url.searchParams.get("code"),
@@ -36,12 +42,10 @@ export const Route = createFileRoute("/auth/callback")({
               expectedState: stored.state,
               codeVerifier: stored.codeVerifier,
             });
-            return go(`/account?linked=${stored.linkProvider}`);
+            return go("/account", { linked: stored.linkProvider });
           } catch (error) {
-            if (error instanceof IdpCallbackError)
-              return go(`/account?error=${encodeURIComponent(error.reason)}`);
-            if (error instanceof ApiError)
-              return go(`/account?error=${encodeURIComponent(error.code)}`);
+            if (error instanceof IdpCallbackError) return go("/account", { error: error.reason });
+            if (error instanceof ApiError) return go("/account", { error: error.code });
             throw error;
           }
         }

package/template/src/routes/cart.tsx

@@ -7,6 +7,7 @@ import { SubmitButton } from "../components/submit-button";
 import { apiFor } from "../lib/api.server";
 import { readCartToken, writeCartToken } from "../lib/cart-session.server";
 import { formatPrice } from "../lib/format";
+import { pageTitle } from "../lib/page-title";
 import { readToken } from "../lib/session.server";
 
 const getCart = createServerFn({ method: "GET" }).handler(async () => {
@@ -15,7 +16,10 @@ const getCart = createServerFn({ method: "GET" }).handler(async () => {
   // 비회원이 아직 장바구니를 만든 적이 없으면 서버에 물어볼 것이 없다
   if (!accessToken && !cartToken) {
     return {
-      cart: { items: [], summary: { productAmount: 0, deliveryFee: 0, totalAmount: 0 } },
+      cart: {
+        items: [],
+        summary: { productAmount: 0, deliveryFee: 0, totalAmount: 0, requiresShipping: true },
+      },
       loginRequired: false,
     };
   }
@@ -54,7 +58,7 @@ const changeCart = createServerFn({ method: "POST" })
 
 export const Route = createFileRoute("/cart")({
   loader: () => getCart(),
-  head: () => ({ meta: [{ title: "장바구니" }] }),
+  head: ({ matches }) => ({ meta: [{ title: pageTitle(matches, "장바구니") }] }),
   component: CartPage,
 });
 
@@ -164,10 +168,13 @@ function CartPage() {
             <dt className="text-muted">상품 금액</dt>
             <dd>{formatPrice(cart.summary.productAmount)}</dd>
           </div>
-          <div className="flex justify-between">
-            <dt className="text-muted">배송비</dt>
-            <dd>{formatPrice(cart.summary.deliveryFee)}</dd>
-          </div>
+          {/* 배송이 필요 없는 상품(이용권·방문 수령 등)만 담았으면 배송비가 없다 */}
+          {cart.summary.requiresShipping ? (
+            <div className="flex justify-between">
+              <dt className="text-muted">배송비</dt>
+              <dd>{formatPrice(cart.summary.deliveryFee)}</dd>
+            </div>
+          ) : null}
           <div className="flex justify-between border-line border-t pt-1 font-bold">
             <dt>결제 금액</dt>
             <dd>{formatPrice(cart.summary.totalAmount)}</dd>

package/template/src/routes/checkout.complete.tsx

@@ -3,6 +3,7 @@ import { createServerFn } from "@tanstack/react-start";
 import { z } from "zod";
 import { apiFor } from "../lib/api.server";
 import { formatPrice } from "../lib/format";
+import { pageTitle } from "../lib/page-title";
 import { readToken } from "../lib/session.server";
 
 const completeSearch = z.object({ orderId: z.string().optional().catch(undefined) });
@@ -23,7 +24,7 @@ export const Route = createFileRoute("/checkout/complete")({
   validateSearch: completeSearch,
   loaderDeps: ({ search }) => search,
   loader: ({ deps }) => getCompletedOrder({ data: deps }),
-  head: () => ({ meta: [{ title: "주문 완료" }] }),
+  head: ({ matches }) => ({ meta: [{ title: pageTitle(matches, "주문 완료") }] }),
   component: CheckoutComplete,
 });