@tallyui/connector-vendure 3.0.0-next.0 → 3.0.0-next.2

package/README.md

@@ -2,6 +2,6 @@
 
 ## Errors
 
-Requests with expired or rejected credentials reject with `ConnectorUnauthorizedError` (`code: 'unauthorized'`), defined in `@tallyui/core` and re-exported by this connector. The app should sign in again.
+Requests with expired or rejected credentials reject with `ConnectorUnauthorizedError`, defined in `@tallyui/core` and re-exported by this connector. `error.status` is `401` (`code: 'unauthorized'`, sign in again) or `403` (`code: 'forbidden'`, signed in but not allowed: the pull retries on the store schedule; don't sign out); a signed-out Vendure session is always `401`.
 
 Sign-in itself rejects with `SignInError`.

package/dist/index.d.ts

@@ -85,7 +85,7 @@ declare const vendureStockReconcile: StockReconcileAdapter;
 /**
  * Reads the active channel's currency and tax-inclusivity (ADR-049), and the
  * default tax zone's enabled, non-customer-group rates keyed by tax category
- * id, in integer ppm rounded once. Read-only (ADR-048). Ignores `choice`:
+ * id, in integer ppm rounded once, with their rate names for grouping. Read-only (ADR-048). Ignores `choice`:
  * Vendure's channel is already chosen by the `vendure-token` header sent
  * with every request, so there is no `pricingContext` either.
  */

package/dist/index.js

@@ -29,9 +29,9 @@ async function signedOut(context) {
 }
 async function forbiddenError(context, forbidden) {
   const out = await signedOut(context);
-  if (out === true) return new ConnectorUnauthorizedError(`Vendure GraphQL error: ${forbidden[0].message}`);
+  if (out === true) return new ConnectorUnauthorizedError(`Vendure GraphQL error: ${forbidden[0].message}`, 401);
   const what = forbidden.map(({ message, path }) => path?.length ? `${path.join(".")}: ${message}` : message).join("; ");
-  if (out === false) return new Error(`Vendure GraphQL error: FORBIDDEN: the store refused this request although the session is signed in (a permission is missing): ${what}`);
+  if (out === false) return new ConnectorUnauthorizedError(`Vendure GraphQL error: FORBIDDEN: the store refused this request although the session is signed in (a permission is missing): ${what}`, 403);
   return new Error(`Vendure GraphQL error: FORBIDDEN: ${what} (the session check failed, so this may be transient)`);
 }
 
@@ -47,8 +47,8 @@ async function readVendureCapabilities(baseUrl, headers, init = {}) {
   }
   if (res.status === 401 || res.status === 403) {
     const out = await signedOut({ connectorId: "vendure", baseUrl, headers, signal: init.signal });
-    if (out === true) throw new ConnectorUnauthorizedError2(`Vendure refused ${CAPABILITIES_PATH}: the session is signed out`, res.status);
-    if (out === false) throw new Error(`Vendure refused ${CAPABILITIES_PATH} although the session is signed in: the CreateOrder permission is missing (HTTP ${res.status})`);
+    if (out === true) throw new ConnectorUnauthorizedError2(`Vendure refused ${CAPABILITIES_PATH}: the session is signed out`, 401);
+    if (out === false) throw new ConnectorUnauthorizedError2(`Vendure refused ${CAPABILITIES_PATH} although the session is signed in: the CreateOrder permission is missing (HTTP ${res.status})`, 403);
     return void 0;
   }
   if (res.status === 404) return { orderCreate: 1 };
@@ -57,7 +57,7 @@ async function readVendureCapabilities(baseUrl, headers, init = {}) {
   try {
     body = await res.json();
   } catch {
-    return { orderCreate: 1 };
+    return void 0;
   }
   return parseInfoCapabilities(body, (reason) => console.warn(`@tallyui/connector-vendure: ${reason}`));
 }
@@ -824,7 +824,7 @@ var CHANNEL_AND_CATEGORIES_QUERY = `
 var TAX_RATES_QUERY = `
   query StoreSettingsTaxRates($zoneId: String!) {
     taxRates(options: { take: 1000, filter: { zoneId: { eq: $zoneId } } }) {
-      items { enabled value category { id } customerGroup { id } }
+      items { name enabled value category { id } customerGroup { id } }
     }
   }
 `;
@@ -846,11 +846,18 @@ var vendureStoreSettings = async (context, _choice) => {
     rateItems = ratesBody.data?.taxRates?.items ?? [];
   }
   const byCategory = /* @__PURE__ */ new Map();
+  const namesByCategory = /* @__PURE__ */ new Map();
   for (const rate of rateItems) {
     if (!rate.enabled || rate.customerGroup || !rate.category) continue;
     byCategory.set(rate.category.id, Math.round(rate.value * 1e4));
+    if (typeof rate.name === "string" && rate.name) namesByCategory.set(rate.category.id, rate.name);
+    else namesByCategory.delete(rate.category.id);
   }
   const defaultCategory = categories.find((c) => c.isDefault) ?? categories[0];
+  const taxRateCodes = {};
+  const defaultName = defaultCategory && namesByCategory.get(defaultCategory.id);
+  if (defaultName) taxRateCodes.default = defaultName;
+  for (const [categoryId, name] of namesByCategory) taxRateCodes[categoryId] = name;
   const taxRatesPpm = {
     default: defaultCategory ? byCategory.get(defaultCategory.id) ?? 0 : 0
   };
@@ -859,7 +866,8 @@ var vendureStoreSettings = async (context, _choice) => {
   return {
     currency: channel.defaultCurrencyCode,
     pricesIncludeTax: channel.pricesIncludeTax,
-    taxRatesPpm
+    taxRatesPpm,
+    ...Object.keys(taxRateCodes).length > 0 && { taxRateCodes }
   };
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tallyui/connector-vendure",
-  "version": "3.0.0-next.0",
+  "version": "3.0.0-next.2",
   "type": "module",
   "description": "Vendure connector for Tally UI",
   "main": "./dist/index.js",
@@ -26,11 +26,11 @@
     "directory": "connectors/vendure"
   },
   "peerDependencies": {
-    "@tallyui/core": "^3.0.0-next.0"
+    "@tallyui/core": "^3.0.0-next.2"
   },
   "devDependencies": {
-    "@tallyui/database": "3.0.0-next.0",
-    "@tallyui/pos": "3.0.0-next.0",
+    "@tallyui/database": "3.0.0-next.2",
+    "@tallyui/pos": "3.0.0-next.2",
     "rxdb": "17.5.0"
   },
   "scripts": {

package/src/capabilities.ts

@@ -7,12 +7,12 @@ export const CAPABILITIES_PATH = '/tally/v1/info';
 
 /**
  * Reads the store's contract capabilities (ADR-062) and `taxRounding` (#287) with the
- * connector's own headers. A 2xx gives `parseInfoCapabilities`; a 404 or a non-JSON body
- * means no plugin and gives `{ orderCreate: 1 }`; a network failure, a 5xx or any other
- * non-2xx is unknown and gives `undefined`. The route answers a dead session and a missing
+ * connector's own headers. A 404 means an old plugin and gives the default; a network failure,
+ * non-2xx other than 404/401/403, non-JSON 2xx or malformed `taxRounding` is unknown and gives
+ * `undefined`. The route answers a dead session and a missing
  * `CreateOrder` permission alike with 403, so a 401/403 asks who is signed in (#279): nobody
- * throws `ConnectorUnauthorizedError`, an administrator throws a plain Error naming the
- * permission, and a failed check is unknown.
+ * throws `ConnectorUnauthorizedError` 401, an administrator throws `ConnectorUnauthorizedError`
+ * 403 naming the permission, and a failed check is unknown.
  */
 export async function readVendureCapabilities(
   baseUrl: string,
@@ -28,8 +28,9 @@ export async function readVendureCapabilities(
   }
   if (res.status === 401 || res.status === 403) {
     const out = await signedOut({ connectorId: 'vendure', baseUrl, headers, signal: init.signal });
-    if (out === true) throw new ConnectorUnauthorizedError(`Vendure refused ${CAPABILITIES_PATH}: the session is signed out`, res.status);
-    if (out === false) throw new Error(`Vendure refused ${CAPABILITIES_PATH} although the session is signed in: the CreateOrder permission is missing (HTTP ${res.status})`);
+    // The probe confirms sign-out; the route's 403 also covers missing permissions.
+    if (out === true) throw new ConnectorUnauthorizedError(`Vendure refused ${CAPABILITIES_PATH}: the session is signed out`, 401);
+    if (out === false) throw new ConnectorUnauthorizedError(`Vendure refused ${CAPABILITIES_PATH} although the session is signed in: the CreateOrder permission is missing (HTTP ${res.status})`, 403);
     return undefined;
   }
   if (res.status === 404) return { orderCreate: 1 };
@@ -38,7 +39,7 @@ export async function readVendureCapabilities(
   try {
     body = await res.json();
   } catch {
-    return { orderCreate: 1 };
+    return undefined;
   }
   return parseInfoCapabilities(body, (reason) => console.warn(`@tallyui/connector-vendure: ${reason}`));
 }

package/src/replication/products.ts

@@ -81,7 +81,8 @@ export async function gql(
   if (!res.ok) {
     const body = await res.json().catch(() => undefined) as GqlBody | undefined;
     const message = body?.errors?.[0]?.message;
-    if (res.status === 401 || res.status === 403) throw new ConnectorUnauthorizedError(`Vendure API error: ${res.status}${message ? `: ${message}` : ''}`, res.status);
+    // Vendure answers FORBIDDEN with HTTP 200; an HTTP 401/403 comes from a proxy or firewall and is taken at face value.
+    if (res.status === 401 || res.status === 403) throw new ConnectorUnauthorizedError(`Vendure API error: ${res.status}${message ? `: ${message}` : ''}`, res.status as 401 | 403);
     throw new Error(`Vendure API error: ${res.status}${message ? `: ${message}` : ''}`);
   }
   const body = await res.json() as GqlBody;

package/src/session-probe.ts

@@ -26,14 +26,15 @@ export async function signedOut(context: SyncContext): Promise<boolean | undefin
 }
 
 /**
- * The error for a `FORBIDDEN` answer: only a signed-out session signs the till out. The plain
- * errors name everything refused, in the answer's order (each GraphQL `path`, e.g. `product.variants`),
+ * The error for a `FORBIDDEN` answer: a signed-out session is 401, a confirmed missing permission
+ * is 403, and a failed probe is a plain Error. Errors name everything refused in answer order (each GraphQL `path`, e.g. `product.variants`),
  * for the store owner's log. One probe answers for the whole response.
  */
 export async function forbiddenError(context: SyncContext, forbidden: Array<{ message?: string; path?: ReadonlyArray<string | number> }>): Promise<Error> {
   const out = await signedOut(context);
-  if (out === true) return new ConnectorUnauthorizedError(`Vendure GraphQL error: ${forbidden[0].message}`);
+  // The probe confirmed a signed-out session even though Vendure answered FORBIDDEN.
+  if (out === true) return new ConnectorUnauthorizedError(`Vendure GraphQL error: ${forbidden[0].message}`, 401);
   const what = forbidden.map(({ message, path }) => (path?.length ? `${path.join('.')}: ${message}` : message)).join('; ');
-  if (out === false) return new Error(`Vendure GraphQL error: FORBIDDEN: the store refused this request although the session is signed in (a permission is missing): ${what}`);
+  if (out === false) return new ConnectorUnauthorizedError(`Vendure GraphQL error: FORBIDDEN: the store refused this request although the session is signed in (a permission is missing): ${what}`, 403);
   return new Error(`Vendure GraphQL error: FORBIDDEN: ${what} (the session check failed, so this may be transient)`);
 }

package/src/store-settings.ts

@@ -13,14 +13,14 @@ const CHANNEL_AND_CATEGORIES_QUERY = `
 const TAX_RATES_QUERY = `
   query StoreSettingsTaxRates($zoneId: String!) {
     taxRates(options: { take: 1000, filter: { zoneId: { eq: $zoneId } } }) {
-      items { enabled value category { id } customerGroup { id } }
+      items { name enabled value category { id } customerGroup { id } }
     }
   }
 `;
 
 type ActiveChannel = { defaultCurrencyCode: string; pricesIncludeTax: boolean; defaultTaxZone: { id: string } | null };
 type TaxCategory = { id: string; isDefault: boolean };
-type TaxRateItem = { enabled: boolean; value: number; category: { id: string } | null; customerGroup: { id: string } | null };
+type TaxRateItem = { name?: string; enabled: boolean; value: number; category: { id: string } | null; customerGroup: { id: string } | null };
 
 /** `gql` throws a plain `Error` for a non-OK response or a GraphQL `errors` body; both become `StoreSettingsError('failed')` here. */
 async function query(context: SyncContext, source: string, variables?: Record<string, unknown>): Promise<any> {
@@ -34,7 +34,7 @@ async function query(context: SyncContext, source: string, variables?: Record<st
 /**
  * Reads the active channel's currency and tax-inclusivity (ADR-049), and the
  * default tax zone's enabled, non-customer-group rates keyed by tax category
- * id, in integer ppm rounded once. Read-only (ADR-048). Ignores `choice`:
+ * id, in integer ppm rounded once, with their rate names for grouping. Read-only (ADR-048). Ignores `choice`:
  * Vendure's channel is already chosen by the `vendure-token` header sent
  * with every request, so there is no `pricingContext` either.
  */
@@ -51,10 +51,13 @@ export const vendureStoreSettings = async (context: SyncContext, _choice?: Store
   }
 
   const byCategory = new Map<string, number>();
+  const namesByCategory = new Map<string, string>();
   for (const rate of rateItems) {
     if (!rate.enabled || rate.customerGroup || !rate.category) continue;
     // Rounded once, here, at the connector's edge (a backend decimal percentage -> integer ppm).
     byCategory.set(rate.category.id, Math.round(rate.value * 10_000));
+    if (typeof rate.name === 'string' && rate.name) namesByCategory.set(rate.category.id, rate.name);
+    else namesByCategory.delete(rate.category.id);
   }
 
   // Vendure's own fallback for a variant created without a category
@@ -65,6 +68,10 @@ export const vendureStoreSettings = async (context: SyncContext, _choice?: Store
   // at all), `default` is 0 — that is what Vendure itself charges in that
   // case, never a silent guess.
   const defaultCategory = categories.find((c) => c.isDefault) ?? categories[0];
+  const taxRateCodes: Record<string, string> = {};
+  const defaultName = defaultCategory && namesByCategory.get(defaultCategory.id);
+  if (defaultName) taxRateCodes.default = defaultName;
+  for (const [categoryId, name] of namesByCategory) taxRateCodes[categoryId] = name;
   const taxRatesPpm: { default: number; [taxClass: string]: number } = {
     default: defaultCategory ? byCategory.get(defaultCategory.id) ?? 0 : 0,
   };
@@ -77,5 +84,6 @@ export const vendureStoreSettings = async (context: SyncContext, _choice?: Store
     currency: channel.defaultCurrencyCode,
     pricesIncludeTax: channel.pricesIncludeTax,
     taxRatesPpm,
+    ...(Object.keys(taxRateCodes).length > 0 && { taxRateCodes }),
   };
 };

package/src/sync/products.ts

@@ -152,7 +152,8 @@ async function gql(
     signal: context.signal,
   });
 
-  if (res.status === 401 || res.status === 403) throw new ConnectorUnauthorizedError(`Vendure API error: ${res.status}`, res.status);
+  // Vendure answers FORBIDDEN with HTTP 200; an HTTP 401/403 comes from a proxy or firewall and is taken at face value.
+  if (res.status === 401 || res.status === 403) throw new ConnectorUnauthorizedError(`Vendure API error: ${res.status}`, res.status as 401 | 403);
   if (!res.ok) throw new Error(`Vendure API error: ${res.status}`);
   const body: { data?: any; errors?: Array<{ message?: string; path?: Array<string | number>; extensions?: { code?: string } }> } = await res.json();
   const forbidden = body.errors?.filter((error) => error.extensions?.code === 'FORBIDDEN') ?? [];