Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Fix CI: add AuthTokens.user, export all generated types, remove unused token vars
Damian Legawiecb4e775b3a42d
diff --git a/packages/admin-sdk/src/admin-client.ts b/packages/admin-sdk/src/admin-client.tsindex eba1312975..b3d2aaa859 100644--- a/packages/admin-sdk/src/admin-client.ts+++ b/packages/admin-sdk/src/admin-client.ts@@ -5,6 +5,12 @@ import type { PaginatedResponse, ListParams } from '@spree/sdk-core';export interface AuthTokens {token: string;refresh_token?: string;+ user: {+ id: string;+ email: string;+ first_name: string | null;+ last_name: string | null;+ };}export interface LoginCredentials {diff --git a/packages/admin-sdk/src/types/index.ts b/packages/admin-sdk/src/types/index.tsindex fefc723d92..98fa2b4446 100644--- a/packages/admin-sdk/src/types/index.ts+++ b/packages/admin-sdk/src/types/index.ts@@ -10,11 +10,35 @@ export type {// Admin-specific generated typesexport type { default as Address } from './generated/Address';+export type { default as Adjustment } from './generated/Adjustment';+export type { default as AdminUser } from './generated/AdminUser';export type { default as Asset } from './generated/Asset';+export type { default as Category } from './generated/Category';+export type { default as CreditCard } from './generated/CreditCard';+export type { default as Customer } from './generated/Customer';+export type { default as DigitalLink } from './generated/DigitalLink';export type { default as Image } from './generated/Image';+export type { default as LineItem } from './generated/LineItem';+export type { default as Metafield } from './generated/Metafield';+export type { default as OptionType } from './generated/OptionType';+export type { default as OptionValue } from './generated/OptionValue';export type { default as Order } from './generated/Order';+export type { default as OrderPromotion } from './generated/OrderPromotion';+export type { default as Payment } from './generated/Payment';+export type { default as PaymentMethod } from './generated/PaymentMethod';+export type { default as PaymentSource } from './generated/PaymentSource';+export type { default as Price } from './generated/Price';export type { default as Product } from './generated/Product';+export type { default as Refund } from './generated/Refund';+export type { default as Reimbursement } from './generated/Reimbursement';+export type { default as ReturnAuthorization } from './generated/ReturnAuthorization';+export type { default as Shipment } from './generated/Shipment';export type { default as ShippingCategory } from './generated/ShippingCategory';+export type { default as ShippingMethod } from './generated/ShippingMethod';+export type { default as ShippingRate } from './generated/ShippingRate';+export type { default as StockItem } from './generated/StockItem';+export type { default as StockLocation } from './generated/StockLocation';export type { default as Store } from './generated/Store';+export type { default as StoreCredit } from './generated/StoreCredit';export type { default as TaxCategory } from './generated/TaxCategory';-export type { default as Category } from './generated/Category';+export type { default as Variant } from './generated/Variant';diff --git a/packages/admin/src/routes/_authenticated/orders/$orderId.tsx b/packages/admin/src/routes/_authenticated/orders/$orderId.tsxindex 755b130996..00f363c8e2 100644--- a/packages/admin/src/routes/_authenticated/orders/$orderId.tsx+++ b/packages/admin/src/routes/_authenticated/orders/$orderId.tsx@@ -43,7 +43,6 @@ import { Input } from '@/components/ui/input'import { Separator } from '@/components/ui/separator'import { Skeleton } from '@/components/ui/skeleton'import { Textarea } from '@/components/ui/textarea'-import { useAuth } from '@/hooks/use-auth'import { cn } from '@/lib/utils'export const Route = createFileRoute('/_authenticated/orders/$orderId')({@@ -155,7 +154,6 @@ function OrderDetailPage() {function OrderHeader({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const backUrl = order.completed_at ? '/orders' : '/orders/drafts'const cancelMutation = useOrderMutation(orderId, () =>@@ -244,7 +242,6 @@ function AddLineItemDialog({open: booleanonOpenChange: (open: boolean) => void}) {- const { token } = useAuth()const mutation = useOrderMutation(orderId, (params: { variant_id: string; quantity: number }) =>adminClient.orders.lineItems.create(orderId, params),)@@ -305,7 +302,6 @@ function EditQuantityDialog({open: booleanonOpenChange: (open: boolean) => void}) {- const { token } = useAuth()const mutation = useOrderMutation(orderId, (params: { quantity: number }) =>adminClient.orders.lineItems.update(orderId, lineItemId, params),)@@ -357,7 +353,6 @@ function EditQuantityDialog({function LineItemsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const items = order.line_items ?? []const [addOpen, setAddOpen] = useState(false)const [editItem, setEditItem] = useState<{ id: string; quantity: number } | null>(null)@@ -506,7 +501,6 @@ function EditTrackingDialog({open: booleanonOpenChange: (open: boolean) => void}) {- const { token } = useAuth()const mutation = useOrderMutation(orderId, (params: { tracking: string }) =>adminClient.orders.shipments.update(orderId, shipmentId, params),)@@ -552,7 +546,6 @@ function EditTrackingDialog({function ShipmentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const shipments = order.shipments ?? []const [editTracking, setEditTracking] = useState<{id: string@@ -697,7 +690,6 @@ function ShipmentsCard({ order }: { order: Order }) {function PaymentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const payments = order.payments ?? []const captureMutation = useOrderMutation(orderId, (paymentId: string) =>@@ -807,7 +799,6 @@ function AddAdjustmentDialog({open: booleanonOpenChange: (open: boolean) => void}) {- const { token } = useAuth()const mutation = useOrderMutation(orderId, (params: { label: string; amount: number }) =>adminClient.orders.adjustments.create(orderId, params),)@@ -866,7 +857,6 @@ function AddAdjustmentDialog({function AdjustmentsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const adjustments = (order.adjustments ?? []).filter((a) => a.source_type !== 'Spree::TaxRate' && a.source_type !== 'Spree::PromotionAction',)@@ -1093,7 +1083,6 @@ function EditAddressDialog({open: booleanonOpenChange: (open: boolean) => void}) {- const { token } = useAuth()const mutation = useOrderMutation(orderId, (params: Record<string, unknown>) =>adminClient.orders.update(orderId, { [type]: params } as any),)@@ -1274,7 +1263,6 @@ function CustomerCard({ order }: { order: Order }) {function SpecialInstructionsCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const [editing, setEditing] = useState(false)const mutation = useOrderMutation(orderId, (params: { special_instructions: string }) =>adminClient.orders.update(orderId, params),@@ -1330,7 +1318,6 @@ function SpecialInstructionsCard({ order }: { order: Order }) {function InternalNoteCard({ order }: { order: Order }) {const { orderId } = Route.useParams()- const { token } = useAuth()const [editing, setEditing] = useState(false)const mutation = useOrderMutation(orderId, (params: { internal_note: string }) =>adminClient.orders.update(orderId, params),diff --git a/packages/admin/src/routes/_authenticated/products/$productId.tsx b/packages/admin/src/routes/_authenticated/products/$productId.tsxindex 0574102a4e..fda14cf8ff 100644--- a/packages/admin/src/routes/_authenticated/products/$productId.tsx+++ b/packages/admin/src/routes/_authenticated/products/$productId.tsx@@ -1,4 +1,18 @@-import type { Image, Product } from '@spree/admin-sdk'+import type { Image, Product as BaseProduct, Variant as BaseVariant } from '@spree/admin-sdk'++// Extended types for fields not yet in generated types+type Variant = BaseVariant & {+ barcode?: string | null+ weight_unit?: string | null+ dimensions_unit?: string | null+}+type Product = Omit<BaseProduct, 'master_variant' | 'variants'> & {+ shipping_category_id?: string | null+ tax_category_id?: string | null+ meta_title?: string | null+ master_variant?: Variant+ variants?: Variant[]+}import { zodResolver } from '@hookform/resolvers/zod'import { createFileRoute, Link, useRouter } from '@tanstack/react-router'import {