@doswiftly/cli 0.2.5 → 1.0.0

package/templates/storefront-nextjs-shadcn/components/account/address-form.tsx

@@ -11,11 +11,11 @@ export interface AddressFormData {
   firstName: string;
   lastName: string;
   company?: string;
-  address1: string;
-  address2?: string;
+  streetLine1: string;
+  streetLine2?: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone?: string;
   isDefault?: boolean;
@@ -48,11 +48,11 @@ export function AddressForm({
       firstName: "",
       lastName: "",
       company: "",
-      address1: "",
-      address2: "",
+      streetLine1: "",
+      streetLine2: "",
       city: "",
-      province: "",
-      zip: "",
+      state: "",
+      postalCode: "",
       country: "Poland",
       phone: "",
       isDefault: false,
@@ -78,17 +78,17 @@ export function AddressForm({
     if (!formData.lastName.trim()) {
       newErrors.lastName = t("validation.lastNameRequired");
     }
-    if (!formData.address1.trim()) {
-      newErrors.address1 = t("validation.addressRequired");
+    if (!formData.streetLine1.trim()) {
+      newErrors.streetLine1 = t("validation.addressRequired");
     }
     if (!formData.city.trim()) {
       newErrors.city = t("validation.cityRequired");
     }
-    if (!formData.province.trim()) {
-      newErrors.province = t("validation.provinceRequired");
+    if (!formData.state.trim()) {
+      newErrors.state = t("validation.provinceRequired");
     }
-    if (!formData.zip.trim()) {
-      newErrors.zip = t("validation.zipRequired");
+    if (!formData.postalCode.trim()) {
+      newErrors.postalCode = t("validation.zipRequired");
     }
     if (!formData.country.trim()) {
       newErrors.country = t("validation.countryRequired");
@@ -175,37 +175,37 @@ export function AddressForm({
         {/* Address 1 */}
         <div>
           <label
-            htmlFor="address1"
+            htmlFor="streetLine1"
             className="block text-sm font-medium text-foreground mb-1"
           >
-            {t("address.address1")} *
+            {t("address.streetLine1")} *
           </label>
           <Input
-            id="address1"
+            id="streetLine1"
             type="text"
-            value={formData.address1}
-            onChange={(e) => handleChange("address1", e.target.value)}
+            value={formData.streetLine1}
+            onChange={(e) => handleChange("streetLine1", e.target.value)}
             disabled={isLoading}
-            className={errors.address1 ? "border-red-500" : ""}
+            className={errors.streetLine1 ? "border-red-500" : ""}
           />
-          {errors.address1 && (
-            <p className="mt-1 text-sm text-red-600">{errors.address1}</p>
+          {errors.streetLine1 && (
+            <p className="mt-1 text-sm text-red-600">{errors.streetLine1}</p>
           )}
         </div>
 
         {/* Address 2 */}
         <div>
           <label
-            htmlFor="address2"
+            htmlFor="streetLine2"
             className="block text-sm font-medium text-foreground mb-1"
           >
-            {`${t("address.address2")} (${tc("optional")})`}
+            {`${t("address.streetLine2")} (${tc("optional")})`}
           </label>
           <Input
-            id="address2"
+            id="streetLine2"
             type="text"
-            value={formData.address2 || ""}
-            onChange={(e) => handleChange("address2", e.target.value)}
+            value={formData.streetLine2 || ""}
+            onChange={(e) => handleChange("streetLine2", e.target.value)}
             disabled={isLoading}
           />
         </div>
@@ -235,42 +235,42 @@ export function AddressForm({
           {/* Province */}
           <div>
             <label
-              htmlFor="province"
+              htmlFor="state"
               className="block text-sm font-medium text-foreground mb-1"
             >
-              {t("address.province")} *
+              {t("address.state")} *
             </label>
             <Input
-              id="province"
+              id="state"
               type="text"
-              value={formData.province}
-              onChange={(e) => handleChange("province", e.target.value)}
+              value={formData.state}
+              onChange={(e) => handleChange("state", e.target.value)}
               disabled={isLoading}
-              className={errors.province ? "border-red-500" : ""}
+              className={errors.state ? "border-red-500" : ""}
             />
-            {errors.province && (
-              <p className="mt-1 text-sm text-red-600">{errors.province}</p>
+            {errors.state && (
+              <p className="mt-1 text-sm text-red-600">{errors.state}</p>
             )}
           </div>
 
           {/* Postal Code */}
           <div>
             <label
-              htmlFor="zip"
+              htmlFor="postalCode"
               className="block text-sm font-medium text-foreground mb-1"
             >
-              {t("address.zip")} *
+              {t("address.postalCode")} *
             </label>
             <Input
-              id="zip"
+              id="postalCode"
               type="text"
-              value={formData.zip}
-              onChange={(e) => handleChange("zip", e.target.value)}
+              value={formData.postalCode}
+              onChange={(e) => handleChange("postalCode", e.target.value)}
               disabled={isLoading}
-              className={errors.zip ? "border-red-500" : ""}
+              className={errors.postalCode ? "border-red-500" : ""}
             />
-            {errors.zip && (
-              <p className="mt-1 text-sm text-red-600">{errors.zip}</p>
+            {errors.postalCode && (
+              <p className="mt-1 text-sm text-red-600">{errors.postalCode}</p>
             )}
           </div>
         </div>

package/templates/storefront-nextjs-shadcn/components/account/address-list.tsx

@@ -11,11 +11,11 @@ export interface Address {
   firstName: string;
   lastName: string;
   company?: string;
-  address1: string;
-  address2?: string;
+  streetLine1: string;
+  streetLine2?: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone?: string;
   isDefault: boolean;
@@ -45,7 +45,7 @@ export function AddressList({
 
   const handleDelete = (id: string, address: Address) => {
     if (
-      confirm(t("deleteAddressConfirm", { address: address.address1 }))
+      confirm(t("deleteAddressConfirm", { address: address.streetLine1 }))
     ) {
       onDelete?.(id);
     }
@@ -114,12 +114,12 @@ export function AddressList({
               {address.company && (
                 <p className="text-muted-foreground">{address.company}</p>
               )}
-              <p className="text-muted-foreground">{address.address1}</p>
-              {address.address2 && (
-                <p className="text-muted-foreground">{address.address2}</p>
+              <p className="text-muted-foreground">{address.streetLine1}</p>
+              {address.streetLine2 && (
+                <p className="text-muted-foreground">{address.streetLine2}</p>
               )}
               <p className="text-muted-foreground">
-                {address.city}, {address.province} {address.zip}
+                {address.city}, {address.state} {address.postalCode}
               </p>
               <p className="text-muted-foreground">{address.country}</p>
               {address.phone && (

package/templates/storefront-nextjs-shadcn/components/account/customer-info.fragment.graphql

@@ -14,7 +14,7 @@ fragment CustomerInfoFields on Customer {
   lastName
   displayName
   phone
-  emailVerified
+  isEmailVerified
   ordersCount
   totalSpent {
     amount
@@ -24,11 +24,11 @@ fragment CustomerInfoFields on Customer {
     id
     firstName
     lastName
-    address1
-    address2
+    streetLine1
+    streetLine2
     city
-    province
-    zip
+    state
+    postalCode
     country
     phone
   }

package/templates/storefront-nextjs-shadcn/components/account/order-details.tsx

@@ -20,11 +20,11 @@ export interface OrderAddress {
   firstName: string;
   lastName: string;
   company?: string;
-  address1: string;
-  address2?: string;
+  streetLine1: string;
+  streetLine2?: string;
   city: string;
-  province: string;
-  zip: string;
+  state: string;
+  postalCode: string;
   country: string;
   phone?: string;
 }
@@ -111,12 +111,12 @@ export function OrderDetails({ order, className }: OrderDetailsProps) {
         {address.company && (
           <p className="text-muted-foreground">{address.company}</p>
         )}
-        <p className="text-muted-foreground">{address.address1}</p>
-        {address.address2 && (
-          <p className="text-muted-foreground">{address.address2}</p>
+        <p className="text-muted-foreground">{address.streetLine1}</p>
+        {address.streetLine2 && (
+          <p className="text-muted-foreground">{address.streetLine2}</p>
         )}
         <p className="text-muted-foreground">
-          {address.city}, {address.province} {address.zip}
+          {address.city}, {address.state} {address.postalCode}
         </p>
         <p className="text-muted-foreground">{address.country}</p>
         {address.phone && (

package/templates/storefront-nextjs-shadcn/components/account/order-history.tsx

@@ -97,7 +97,7 @@ export function OrderHistory({ orders, className }: OrderHistoryProps) {
                 <div className="space-y-1 text-sm text-muted-foreground">
                   <p>{t("placedOn")} {formatDate(order.processedAt)}</p>
                   <p>
-                    {t("itemCount", { count: order.lineItemsCount })}
+                    {t("itemCount", { count: order.itemCount })}
                   </p>
                 </div>
               </div>
@@ -105,7 +105,7 @@ export function OrderHistory({ orders, className }: OrderHistoryProps) {
                 <div className="text-right">
                   <p className="text-sm text-muted-foreground">{t("orderTotal")}</p>
                   <p className="text-lg font-semibold text-foreground">
-                    {formatAmount(order.totalPrice.amount, order.totalPrice.currencyCode)}
+                    {formatAmount(order.totals.total.amount, order.totals.total.currencyCode)}
                   </p>
                 </div>
                 <ChevronRight className="h-5 w-5 text-muted-foreground" />

package/templates/storefront-nextjs-shadcn/components/account/order-summary.fragment.graphql

@@ -11,21 +11,23 @@ fragment OrderSummaryFields on Order {
   id
   orderNumber
   status
-  financialStatus
+  paymentStatus
   fulfillmentStatus
   processedAt
-  lineItemsCount
-  totalPrice {
-    amount
-    currencyCode
-  }
-  subtotalPrice {
-    amount
-    currencyCode
-  }
-  totalShipping {
-    amount
-    currencyCode
+  itemCount
+  totals {
+    total {
+      amount
+      currencyCode
+    }
+    subtotal {
+      amount
+      currencyCode
+    }
+    totalShipping {
+      amount
+      currencyCode
+    }
   }
   shippingAddress {
     firstName

package/templates/storefront-nextjs-shadcn/components/cart/cart-line.fragment.graphql

@@ -18,11 +18,11 @@ fragment CartLineFields on CartLine {
   productTitle
   productHandle
   productType
-  merchandise {
+  variant {
     id
     title
-    available
-    quantityAvailable
+    isAvailable
+    availableStock
     price {
       amount
       currencyCode
@@ -38,15 +38,15 @@ fragment CartLineFields on CartLine {
     }
   }
   cost {
-    amountPerQuantity {
+    pricePerUnit {
       amount
       currencyCode
     }
-    totalAmount {
+    total {
       amount
       currencyCode
     }
-    compareAtAmountPerQuantity {
+    compareAtPricePerUnit {
       amount
       currencyCode
     }

package/templates/storefront-nextjs-shadcn/components/discount/discount-code-input.tsx

@@ -22,7 +22,7 @@ import { Alert, AlertDescription } from "@/components/ui/alert";
 import { formatPrice } from "@doswiftly/storefront-sdk";
 
 export interface DiscountValidationResult {
-  valid: boolean;
+  isValid: boolean;
   code?: string;
   discountType?: "PERCENTAGE" | "FIXED_AMOUNT" | "FREE_SHIPPING";
   discountValue?: number;
@@ -101,7 +101,7 @@ export function DiscountCodeInput({
         const result = await onValidate(trimmedCode);
         setValidationResult(result);
 
-        if (!result.valid) {
+        if (!result.isValid) {
           setError(result.errorMessage || t("invalidCode"));
         }
       } catch (e: unknown) {
@@ -111,7 +111,7 @@ export function DiscountCodeInput({
       }
     } else {
       // No validation function, assume valid
-      setValidationResult({ valid: true, code: trimmedCode });
+      setValidationResult({ isValid: true, code: trimmedCode });
     }
   }, [code, appliedCodes, onValidate]);
 
@@ -119,12 +119,12 @@ export function DiscountCodeInput({
     const trimmedCode = code.trim().toUpperCase();
 
     // If not yet validated, validate first
-    if (!validationResult?.valid) {
+    if (!validationResult?.isValid) {
       await handleValidate();
       return;
     }
 
-    if (validationResult.valid) {
+    if (validationResult.isValid) {
       await onApply(trimmedCode);
       // Reset state after successful apply
       setCode("");
@@ -148,7 +148,7 @@ export function DiscountCodeInput({
 
   // Format discount value for display
   const getDiscountPreview = () => {
-    if (!validationResult?.valid) return null;
+    if (!validationResult?.isValid) return null;
 
     if (validationResult.estimatedSavings) {
       return t("savings", { savings: formatPrice(validationResult.estimatedSavings) });
@@ -185,7 +185,7 @@ export function DiscountCodeInput({
             disabled={disabled || isLoading}
             className={cn(
               "pl-9 pr-8 uppercase",
-              validationResult?.valid && "border-green-500 focus-visible:ring-green-500",
+              validationResult?.isValid && "border-green-500 focus-visible:ring-green-500",
               error && "border-destructive focus-visible:ring-destructive"
             )}
           />
@@ -203,11 +203,11 @@ export function DiscountCodeInput({
           type="button"
           onClick={handleApply}
           disabled={disabled || isLoading || !code.trim()}
-          variant={validationResult?.valid ? "default" : "secondary"}
+          variant={validationResult?.isValid ? "default" : "secondary"}
         >
           {isLoading ? (
             <Loader2 className="h-4 w-4 animate-spin" />
-          ) : validationResult?.valid ? (
+          ) : validationResult?.isValid ? (
             <>
               <Check className="mr-2 h-4 w-4" />
               {tc("apply")}
@@ -219,7 +219,7 @@ export function DiscountCodeInput({
       </div>
 
       {/* Validation result - success preview */}
-      {validationResult?.valid && (
+      {validationResult?.isValid && (
         <Alert className="border-green-500 bg-green-50 dark:bg-green-950/20">
           <Check className="h-4 w-4 text-green-600" />
           <AlertDescription className="text-green-700 dark:text-green-400">

package/templates/storefront-nextjs-shadcn/components/gift-card/gift-card-input.tsx

@@ -24,7 +24,7 @@ type GiftCardStatus = "ACTIVE" | "USED" | "EXPIRED" | "DISABLED";
  * Gift card validation result
  */
 export interface GiftCardValidationResult {
-  valid: boolean;
+  isValid: boolean;
   code: string;
   availableBalance?: {
     amount: string;
@@ -144,7 +144,7 @@ export function GiftCardInput({
       const result = await onValidate(code);
       setValidation(result);
 
-      if (!result.valid && result.error) {
+      if (!result.isValid && result.error) {
         setError(result.error.message);
       }
     } catch (err: unknown) {
@@ -158,7 +158,7 @@ export function GiftCardInput({
    * Apply the validated gift card
    */
   const handleApply = useCallback(() => {
-    if (validation?.valid) {
+    if (validation?.isValid) {
       onApply(code, validation);
       setCode("");
       setValidation(null);
@@ -172,7 +172,7 @@ export function GiftCardInput({
     (e: React.KeyboardEvent) => {
       if (e.key === "Enter") {
         e.preventDefault();
-        if (validation?.valid) {
+        if (validation?.isValid) {
           handleApply();
         } else {
           handleValidate();
@@ -201,13 +201,13 @@ export function GiftCardInput({
         </div>
         <Button
           type="button"
-          variant={validation?.valid ? "default" : "outline"}
-          onClick={validation?.valid ? handleApply : handleValidate}
+          variant={validation?.isValid ? "default" : "outline"}
+          onClick={validation?.isValid ? handleApply : handleValidate}
           disabled={disabled || isValidating || !code}
         >
           {isValidating ? (
             <Loader2 className="h-4 w-4 animate-spin" />
-          ) : validation?.valid ? (
+          ) : validation?.isValid ? (
             <>
               <Check className="mr-2 h-4 w-4" />
               {tc("apply")}
@@ -223,12 +223,12 @@ export function GiftCardInput({
         <div
           className={cn(
             "rounded-lg p-3 text-sm",
-            validation.valid
+            validation.isValid
               ? "bg-green-50 dark:bg-green-900/20 text-green-800 dark:text-green-200"
               : "bg-red-50 dark:bg-red-900/20 text-red-800 dark:text-red-200"
           )}
         >
-          {validation.valid ? (
+          {validation.isValid ? (
             <div className="flex items-center justify-between">
               <div className="flex items-center gap-2">
                 <Check className="h-4 w-4" />

package/templates/storefront-nextjs-shadcn/components/order/delivery-estimate.tsx

@@ -9,7 +9,7 @@ export interface DeliveryEstimateProps {
   latestDate?: string;
   address?: {
     city: string;
-    province: string;
+    state: string;
     country: string;
   };
   className?: string;
@@ -97,7 +97,7 @@ export function DeliveryEstimate({
             <div className="flex items-start gap-2 text-sm text-muted-foreground">
               <MapPin className="h-4 w-4 mt-0.5 flex-shrink-0" />
               <span>
-                Delivering to {address.city}, {address.province},{" "}
+                Delivering to {address.city}, {address.state},{" "}
                 {address.country}
               </span>
             </div>

package/templates/storefront-nextjs-shadcn/components/product/product-card.tsx

@@ -45,7 +45,7 @@ export function ProductCard({
     (tag) => tag.toLowerCase() === "new" || tag.toLowerCase() === "nowość"
   );
 
-  const isOutOfStock = !product.availableForSale;
+  const isOutOfStock = !product.isAvailable;
   const isGiftCard = product.productType === "GIFT_CARD";
 
   return (

package/templates/storefront-nextjs-shadcn/components/seo/product-json-ld.ts

@@ -84,7 +84,7 @@ export function buildProductJsonLd(
     url: productUrl,
     priceCurrency: variant.price.currencyCode,
     price: variant.price.amount,
-    availability: variant.availableForSale
+    availability: variant.isAvailable
       ? "https://schema.org/InStock"
       : "https://schema.org/OutOfStock",
     ...(variant.sku && { sku: variant.sku }),

package/templates/storefront-nextjs-shadcn/hooks/use-auth-sync.ts

@@ -1,42 +1,60 @@
 'use client';
 
 import { useEffect } from 'react';
-import { useRouter } from 'next/navigation';
 import { useAuthStore, useAuthHydrated } from '@doswiftly/storefront-sdk/react';
-import { createAuthTokenClient } from '@doswiftly/storefront-sdk';
-
-const { clearToken } = createAuthTokenClient();
 
 /**
- * Detects and fixes auth state desync between httpOnly cookie and Zustand store.
+ * Hydrate Zustand auth store z httpOnly cookie po mount klienta.
+ *
+ * Po Iteracji 2 (XSS fix) `accessToken` NIE persistuje w localStorage —
+ * token żyje tylko w-memory + httpOnly cookie (browser auto-sent w GraphQL
+ * requests). Po refresh page klient nie zna `customer` info bez round-trip.
  *
- * When server says authenticated (cookie exists → initialIsAuthenticated: true)
- * but store has no accessToken after persist hydration (localStorage empty/cleared),
- * the client can't make authenticated GraphQL requests.
+ * Hook wywołuje `/api/auth/whoami` (BFF endpoint reads cookie server-side,
+ * forward Bearer do backend, return customer + isAuthenticated). Następnie
+ * setAuth() aktualizuje store. Auth-protected queries (`enabled: isAuthenticated`)
+ * unblockują się po hydration.
  *
- * Fix: clear the stale cookie, reset auth state, redirect to login.
- * The user re-authenticates once, which correctly populates both cookie AND localStorage.
+ * Token NIE jest body response — kontynuuje życie w cookie. Klient operuje
+ * na samym `customer` info (display name, avatar etc.) i `isAuthenticated`
+ * gate; każdy GraphQL request automatycznie forward'uje cookie.
  */
 export function useAuthSync() {
-  const router = useRouter();
-  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
-  const accessToken = useAuthStore((s) => s.accessToken);
+  const setAuth = useAuthStore((s) => s.setAuth);
   const clearAuth = useAuthStore((s) => s.clearAuth);
+  const isAuthenticated = useAuthStore((s) => s.isAuthenticated);
+  const customer = useAuthStore((s) => s.customer);
   const authHydrated = useAuthHydrated();
 
   useEffect(() => {
     if (!authHydrated) return;
 
-    // Desync: cookie exists (isAuthenticated: true from server) but no token in store
-    if (isAuthenticated && !accessToken) {
-      // Reset store state immediately
-      clearAuth();
-      // Clear stale cookie THEN redirect — must await so proxy sees cleared cookie
-      clearToken()
-        .catch(() => {})
-        .finally(() => {
-          router.push('/auth/login');
-        });
-    }
-  }, [authHydrated, isAuthenticated, accessToken, clearAuth, router]);
+    // Skip jeśli store już zhydrate'owany z customer info (po świeżym login flow
+    // setAuth populuje store; cookie + store w sync, no-op).
+    if (isAuthenticated && customer) return;
+
+    let cancelled = false;
+
+    void fetch('/api/auth/whoami', { credentials: 'include' })
+      .then((res) => res.json())
+      .then((data: { isAuthenticated: boolean; customer: { id: string; email: string; firstName?: string; lastName?: string; phone?: string } | null }) => {
+        if (cancelled) return;
+
+        if (data.isAuthenticated && data.customer) {
+          // Token nie wraca w body — store dostaje tylko customer info.
+          // Empty `''` accessToken sygnalizuje "auth via cookie" (in-memory state OK,
+          // GraphQL requests używają cookie auto-sent przez fetch credentials: include).
+          setAuth(data.customer, '');
+        } else {
+          clearAuth();
+        }
+      })
+      .catch(() => {
+        // Network error — leave store as-is, retry on next mount
+      });
+
+    return () => {
+      cancelled = true;
+    };
+  }, [authHydrated, isAuthenticated, customer, setAuth, clearAuth]);
 }

package/templates/storefront-nextjs-shadcn/hooks/use-cart-actions.ts

@@ -42,7 +42,7 @@ export function useCartActions() {
     ) => {
       await api.getState().addToCart([
         {
-          merchandiseId: variantId,
+          variantId: variantId,
           quantity,
           ...(attributeSelections && attributeSelections.length > 0
             ? { attributeSelections }