@moonbase.sh/storefront-api 3.8.0 → 3.9.0

package/dist/index.cjs

@@ -46,6 +46,7 @@ __export(index_exports, {
   NotFoundError: () => NotFoundError,
   OfferUtils: () => OfferUtils,
   OrderStatus: () => OrderStatus,
+  PasswordSetupRequiredError: () => PasswordSetupRequiredError,
   Platform: () => Platform,
   StoreClosedError: () => StoreClosedError,
   SubscriptionCancellationReason: () => SubscriptionCancellationReason,
@@ -685,6 +686,12 @@ var CaptchaRequiredError = class extends MoonbaseError {
     this.name = "CaptchaRequiredError";
   }
 };
+var PasswordSetupRequiredError = class extends MoonbaseError {
+  constructor(detail, title, status) {
+    super(title != null ? title : "Password setup required", detail, status);
+    this.name = "PasswordSetupRequiredError";
+  }
+};
 
 // src/utils/problemDetails.ts
 var import_zod7 = require("zod");
@@ -708,6 +715,7 @@ function camelCase(str) {
   }).join("");
 }
 async function handleResponseProblem(response, logger) {
+  var _a;
   if (response.status === 404)
     throw new NotFoundError();
   if (response.status === 401) {
@@ -729,6 +737,8 @@ async function handleResponseProblem(response, logger) {
     throw new StoreClosedError(problemDetails.detail);
   if (problemDetails.errorType === "CaptchaRequired")
     throw new CaptchaRequiredError(problemDetails.detail, problemDetails.title);
+  if (problemDetails.errorType === "PasswordSetupRequired")
+    throw new PasswordSetupRequiredError(problemDetails.detail, problemDetails.title, (_a = problemDetails.status) != null ? _a : response.status);
   throw new MoonbaseError(
     problemDetails.title,
     problemDetails.detail,
@@ -747,6 +757,7 @@ __export(schemas_exports5, {
   identitySchema: () => identitySchema,
   ilokConnectedAccountSchema: () => ilokConnectedAccountSchema,
   pendingActivationSchema: () => pendingActivationSchema,
+  pendingPasswordProblemSchema: () => pendingPasswordProblemSchema,
   userAccountConfirmedSchema: () => userAccountConfirmedSchema,
   userAccountConfirmedStatusSchema: () => userAccountConfirmedStatusSchema,
   userSchema: () => userSchema
@@ -820,13 +831,18 @@ var pendingActivationSchema = import_zod8.z.object({
   status: import_zod8.z.literal("activation_pending"),
   email: import_zod8.z.string()
 });
+var pendingPasswordProblemSchema = import_zod8.z.object({
+  errorType: import_zod8.z.literal("PasswordSetupRequired"),
+  pendingPasswordToken: import_zod8.z.string()
+});
 
 // src/identity/endpoints.ts
 var IdentityEndpoints = class {
-  constructor(api, tokenStore, logger) {
+  constructor(api, tokenStore, logger, pendingPasswords) {
     this.api = api;
     this.tokenStore = tokenStore;
     this.logger = logger;
+    this.pendingPasswords = pendingPasswords;
   }
   async get() {
     const response = await this.api.authenticatedFetch("/api/customer/meta/user", userSchema);
@@ -882,8 +898,11 @@ var IdentityEndpoints = class {
         groupIds: normalizeGroupIds(options == null ? void 0 : options.groupIds)
       })
     });
-    if (response.status >= 400)
+    if (response.status >= 400) {
+      if (response.status === 409)
+        await this.keepPendingPassword(email, response.clone());
       await handleResponseProblem(response, this.logger);
+    }
     const data = await response.json();
     if (response.status === 202) {
       const parsed = pendingActivationSchema.parse(data);
@@ -899,6 +918,19 @@ var IdentityEndpoints = class {
     this.tokenStore.setUser(identity);
     return { status: "signed-in", user: userSchema.parse(identity) };
   }
+  /**
+   * The address already has an account with no password, so the server emailed it a link and
+   * handed back the password just typed, sealed, for that link to set once it is opened here.
+   * Never thrown: the caller still gets the `PasswordSetupRequiredError` from the response.
+   */
+  async keepPendingPassword(email, response) {
+    try {
+      const problem = pendingPasswordProblemSchema.safeParse(await response.json());
+      if (problem.success)
+        this.pendingPasswords.set(email, problem.data.pendingPasswordToken);
+    } catch (e) {
+    }
+  }
   /**
    * Signs the buyer out here at once, and ends the session on the server so its refresh
    * token stops working too. Resolves once the server has answered, and never rejects:
@@ -950,7 +982,13 @@ var IdentityEndpoints = class {
       await handleResponseProblem(response, this.logger);
   }
   async confirmAccount(email, code) {
-    const response = await this.api.fetch(`/api/customer/identity/confirm-account?email=${encodeURIComponent(email)}&code=${encodeURIComponent(code.replaceAll(" ", "+"))}&scheme=JWT`, userAccountConfirmedSchema, { method: "POST" });
+    const pendingPasswordToken = this.pendingPasswords.get(email);
+    const response = await this.api.fetch(`/api/customer/identity/confirm-account?email=${encodeURIComponent(email)}&code=${encodeURIComponent(code.replaceAll(" ", "+"))}&scheme=JWT`, userAccountConfirmedSchema, {
+      method: "POST",
+      body: pendingPasswordToken ? { pendingPasswordToken } : void 0
+    });
+    if (pendingPasswordToken)
+      this.pendingPasswords.remove(email);
     const result = response.data;
     if (result.status === "SignedIn") {
       if (!result.accessToken || !result.refreshToken) {
@@ -1147,7 +1185,7 @@ var ProductEndpoints = class {
 var import_zod14 = require("zod");
 
 // package.json
-var version = "3.8.0";
+var version = "3.9.0";
 
 // src/utils/client.ts
 function buildClientHeader(sdk) {
@@ -1155,6 +1193,11 @@ function buildClientHeader(sdk) {
 }
 
 // src/utils/api.ts
+function loggableBody(body) {
+  if (!body || typeof body !== "object" || Array.isArray(body))
+    return body;
+  return Object.fromEntries(Object.entries(body).map(([key, value]) => [key, /password|token/i.test(key) && value != null ? "[redacted]" : value]));
+}
 function objectToQuery(obj) {
   return Object.entries(obj != null ? obj : {}).filter(([_, value]) => value !== void 0).map(([key, value]) => `${key}=${encodeURIComponent(value instanceof Date ? value.toISOString() : value)}`).join("&");
 }
@@ -1176,7 +1219,7 @@ var MoonbaseApi = class {
     const contentType = (_a = options == null ? void 0 : options.contentType) != null ? _a : "application/json";
     this.logger.debug("Making request to Moonbase API...", {
       path,
-      body: options == null ? void 0 : options.body
+      body: loggableBody(options == null ? void 0 : options.body)
     });
     const startedAt = /* @__PURE__ */ new Date();
     const request = {
@@ -1825,6 +1868,50 @@ var InMemoryStore = class {
   }
 };
 
+// src/utils/pendingPasswords.ts
+var lifetime = 24 * 60 * 60 * 1e3;
+function normalizeEmail(email) {
+  return email.trim().toLowerCase();
+}
+var _PendingPasswordStore = class _PendingPasswordStore {
+  constructor(store) {
+    this.store = store != null ? store : isLocalStorageAvailable() ? new LocalStorageStore() : new InMemoryStore();
+  }
+  get(email) {
+    var _a, _b;
+    return (_b = (_a = this.read()[normalizeEmail(email)]) == null ? void 0 : _a.token) != null ? _b : null;
+  }
+  set(email, token) {
+    this.write({ ...this.read(), [normalizeEmail(email)]: { token, storedAt: Date.now() } });
+  }
+  remove(email) {
+    const entries = this.read();
+    delete entries[normalizeEmail(email)];
+    this.write(entries);
+  }
+  /** The entries still worth keeping. Drops the rest from storage as it goes. */
+  read() {
+    const stored = this.store.get(_PendingPasswordStore.storageKey);
+    if (!stored || typeof stored !== "object")
+      return {};
+    const now = Date.now();
+    const fresh = Object.fromEntries(Object.entries(stored).filter(
+      ([, entry]) => typeof (entry == null ? void 0 : entry.token) === "string" && typeof entry.storedAt === "number" && now - entry.storedAt < lifetime
+    ));
+    if (Object.keys(fresh).length !== Object.keys(stored).length)
+      this.write(fresh);
+    return fresh;
+  }
+  write(entries) {
+    if (Object.keys(entries).length > 0)
+      this.store.set(_PendingPasswordStore.storageKey, entries);
+    else
+      this.store.remove(_PendingPasswordStore.storageKey);
+  }
+};
+_PendingPasswordStore.storageKey = "moonbase_pending_passwords";
+var PendingPasswordStore = _PendingPasswordStore;
+
 // src/utils/tokenStore.ts
 var defaultAccessTokenLifetime = 15 * 60 * 1e3;
 var renewBeforeExpiry = 5 * 60 * 1e3;
@@ -1834,9 +1921,9 @@ function accessTokenLifetime(accessToken) {
   try {
     const payload = accessToken.split(".")[1].replaceAll("-", "+").replaceAll("_", "/");
     const claims = JSON.parse(atob(payload.padEnd(Math.ceil(payload.length / 4) * 4, "=")));
-    const lifetime = (Number(claims.exp) - Number(claims.iat)) * 1e3;
-    if (Number.isFinite(lifetime) && lifetime > 0 && lifetime <= 24 * 60 * 60 * 1e3)
-      return lifetime;
+    const lifetime2 = (Number(claims.exp) - Number(claims.iat)) * 1e3;
+    if (Number.isFinite(lifetime2) && lifetime2 > 0 && lifetime2 <= 24 * 60 * 60 * 1e3)
+      return lifetime2;
   } catch (e) {
   }
   return defaultAccessTokenLifetime;
@@ -2778,7 +2865,7 @@ var MoonbaseClient = class {
     this.tokenStore = new TokenStore(configuration);
     this.api = new MoonbaseApi(this.configuration.endpoint, this.tokenStore, this.logger, this.configuration.sdk);
     this.storefront = new StorefrontEndpoints(this.api, this.configuration);
-    this.identity = new IdentityEndpoints(this.api, this.tokenStore, this.logger);
+    this.identity = new IdentityEndpoints(this.api, this.tokenStore, this.logger, new PendingPasswordStore(configuration.store));
     this.communications = new CommunicationsEndpoints(this.api);
     this.groups = new GroupEndpoints(this.api);
     this.vouchers = new VoucherEndpoints(this.api);
@@ -2816,6 +2903,7 @@ var MoonbaseClient = class {
   NotFoundError,
   OfferUtils,
   OrderStatus,
+  PasswordSetupRequiredError,
   Platform,
   StoreClosedError,
   SubscriptionCancellationReason,

package/dist/index.d.cts

@@ -1214,6 +1214,33 @@ declare class GroupEndpoints {
     join(groupId: string): Promise<void>;
 }
 
+/**
+ * The password a customer chose at sign-up for an address that already had an account without
+ * one, kept until the link Moonbase emails comes back. The server hands it back sealed, as
+ * `pendingPasswordToken`, and confirming the account with it sets that password rather than
+ * asking for another.
+ *
+ * Kept in `localStorage`, so the link finds it in whichever tab of this site it opens in, and
+ * only in the browser that typed the password: whoever signs up with somebody else's address
+ * gets the token, but never the emailed code it needs. Like the token store, every operation
+ * degrades to memory when storage fails, in which case the link asks for the password again.
+ *
+ * Only ever filled from a sign-up response, never from a URL parameter or anything else a link
+ * can carry: a token planted from a link would let an attacker's password ride on the victim's
+ * own click.
+ */
+declare class PendingPasswordStore {
+    private readonly store;
+    static readonly storageKey = "moonbase_pending_passwords";
+    constructor(store?: IStore);
+    get(email: string): string | null;
+    set(email: string, token: string): void;
+    remove(email: string): void;
+    /** The entries still worth keeping. Drops the rest from storage as it goes. */
+    private read;
+    private write;
+}
+
 declare const moneySchema: z.ZodObject<{
     currency: z.ZodString;
     amount: z.ZodNumber;
@@ -2020,6 +2047,17 @@ declare const pendingActivationSchema: z.ZodObject<{
     email: string;
     status: "activation_pending";
 }>;
+/** Sign-up's 409 for an address whose account has no password yet. See `PendingPasswordStore`. */
+declare const pendingPasswordProblemSchema: z.ZodObject<{
+    errorType: z.ZodLiteral<"PasswordSetupRequired">;
+    pendingPasswordToken: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    errorType: "PasswordSetupRequired";
+    pendingPasswordToken: string;
+}, {
+    errorType: "PasswordSetupRequired";
+    pendingPasswordToken: string;
+}>;
 
 declare const schemas$9_addressSchema: typeof addressSchema;
 declare const schemas$9_communicationPreferencesSchema: typeof communicationPreferencesSchema;
@@ -2028,11 +2066,12 @@ declare const schemas$9_connectionUrlSchema: typeof connectionUrlSchema;
 declare const schemas$9_identitySchema: typeof identitySchema;
 declare const schemas$9_ilokConnectedAccountSchema: typeof ilokConnectedAccountSchema;
 declare const schemas$9_pendingActivationSchema: typeof pendingActivationSchema;
+declare const schemas$9_pendingPasswordProblemSchema: typeof pendingPasswordProblemSchema;
 declare const schemas$9_userAccountConfirmedSchema: typeof userAccountConfirmedSchema;
 declare const schemas$9_userAccountConfirmedStatusSchema: typeof userAccountConfirmedStatusSchema;
 declare const schemas$9_userSchema: typeof userSchema;
 declare namespace schemas$9 {
-  export { schemas$9_addressSchema as addressSchema, schemas$9_communicationPreferencesSchema as communicationPreferencesSchema, schemas$9_connectedAccountSchema as connectedAccountSchema, schemas$9_connectionUrlSchema as connectionUrlSchema, schemas$9_identitySchema as identitySchema, schemas$9_ilokConnectedAccountSchema as ilokConnectedAccountSchema, schemas$9_pendingActivationSchema as pendingActivationSchema, schemas$9_userAccountConfirmedSchema as userAccountConfirmedSchema, schemas$9_userAccountConfirmedStatusSchema as userAccountConfirmedStatusSchema, schemas$9_userSchema as userSchema };
+  export { schemas$9_addressSchema as addressSchema, schemas$9_communicationPreferencesSchema as communicationPreferencesSchema, schemas$9_connectedAccountSchema as connectedAccountSchema, schemas$9_connectionUrlSchema as connectionUrlSchema, schemas$9_identitySchema as identitySchema, schemas$9_ilokConnectedAccountSchema as ilokConnectedAccountSchema, schemas$9_pendingActivationSchema as pendingActivationSchema, schemas$9_pendingPasswordProblemSchema as pendingPasswordProblemSchema, schemas$9_userAccountConfirmedSchema as userAccountConfirmedSchema, schemas$9_userAccountConfirmedStatusSchema as userAccountConfirmedStatusSchema, schemas$9_userSchema as userSchema };
 }
 
 type CommunicationPreferences = z.infer<typeof communicationPreferencesSchema>;
@@ -2084,10 +2123,17 @@ declare class IdentityEndpoints {
     private api;
     private tokenStore;
     private logger;
-    constructor(api: MoonbaseApi, tokenStore: ITokenStore, logger: ILogger);
+    private pendingPasswords;
+    constructor(api: MoonbaseApi, tokenStore: ITokenStore, logger: ILogger, pendingPasswords: PendingPasswordStore);
     get(): Promise<User>;
     signIn(email: string, password: string): Promise<User>;
     signUp(name: string, email: string, password: string, address: Address | null | undefined, acceptedPrivacyPolicy: boolean, acceptedTermsAndConditions: boolean, communicationOptIn?: boolean, options?: SignUpOptions): Promise<SignUpResult>;
+    /**
+     * The address already has an account with no password, so the server emailed it a link and
+     * handed back the password just typed, sealed, for that link to set once it is opened here.
+     * Never thrown: the caller still gets the `PasswordSetupRequiredError` from the response.
+     */
+    private keepPendingPassword;
     /**
      * Signs the buyer out here at once, and ends the session on the server so its refresh
      * token stops working too. Resolves once the server has answered, and never rejects:
@@ -47317,6 +47363,20 @@ declare class MoonbaseError extends Error {
 declare class CaptchaRequiredError extends MoonbaseError {
     constructor(detail?: string, title?: string);
 }
+/**
+ * The address already has an account, but one without a password: the store gave the customer a
+ * license, or they bought something without one. Anyone can type any address into a form, so the
+ * password they typed is not set from here. Moonbase emails the address a link to finish instead.
+ * `message` is the API's own copy for the customer, safe to show as is.
+ *
+ * From `identity.signUp`, that link sets the password the customer just chose and signs them in,
+ * provided they open it in this same browser. Anywhere else, it asks them for a password again.
+ *
+ * A `MoonbaseError` like any other refusal, so code that already handles those keeps working.
+ */
+declare class PasswordSetupRequiredError extends MoonbaseError {
+    constructor(detail?: string, title?: string, status?: number);
+}
 
 /**
  * Cleans up merchant-authored group IDs before they go on the wire.
@@ -47424,18 +47484,18 @@ declare const problemDetailsSchema: z.ZodObject<{
     title: string;
     type?: string | undefined;
     status?: number | undefined;
+    errorType?: string | undefined;
     detail?: string | undefined;
     instance?: string | undefined;
     errors?: Record<string, string[]> | undefined;
-    errorType?: string | undefined;
 }, {
     title: string;
     type?: string | undefined;
     status?: number | undefined;
+    errorType?: string | undefined;
     detail?: string | undefined;
     instance?: string | undefined;
     errors?: Record<string, string[]> | undefined;
-    errorType?: string | undefined;
 }>;
 type ProblemDetails = z.infer<typeof problemDetailsSchema>;
 
@@ -47501,4 +47561,4 @@ declare class MoonbaseClient {
     orders: OrderEndpoints;
 }
 
-export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type ProductRelease, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, accessTokenLifetime, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };
+export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, PasswordSetupRequiredError, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type ProductRelease, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, accessTokenLifetime, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };

package/dist/index.d.ts

@@ -1214,6 +1214,33 @@ declare class GroupEndpoints {
     join(groupId: string): Promise<void>;
 }
 
+/**
+ * The password a customer chose at sign-up for an address that already had an account without
+ * one, kept until the link Moonbase emails comes back. The server hands it back sealed, as
+ * `pendingPasswordToken`, and confirming the account with it sets that password rather than
+ * asking for another.
+ *
+ * Kept in `localStorage`, so the link finds it in whichever tab of this site it opens in, and
+ * only in the browser that typed the password: whoever signs up with somebody else's address
+ * gets the token, but never the emailed code it needs. Like the token store, every operation
+ * degrades to memory when storage fails, in which case the link asks for the password again.
+ *
+ * Only ever filled from a sign-up response, never from a URL parameter or anything else a link
+ * can carry: a token planted from a link would let an attacker's password ride on the victim's
+ * own click.
+ */
+declare class PendingPasswordStore {
+    private readonly store;
+    static readonly storageKey = "moonbase_pending_passwords";
+    constructor(store?: IStore);
+    get(email: string): string | null;
+    set(email: string, token: string): void;
+    remove(email: string): void;
+    /** The entries still worth keeping. Drops the rest from storage as it goes. */
+    private read;
+    private write;
+}
+
 declare const moneySchema: z.ZodObject<{
     currency: z.ZodString;
     amount: z.ZodNumber;
@@ -2020,6 +2047,17 @@ declare const pendingActivationSchema: z.ZodObject<{
     email: string;
     status: "activation_pending";
 }>;
+/** Sign-up's 409 for an address whose account has no password yet. See `PendingPasswordStore`. */
+declare const pendingPasswordProblemSchema: z.ZodObject<{
+    errorType: z.ZodLiteral<"PasswordSetupRequired">;
+    pendingPasswordToken: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    errorType: "PasswordSetupRequired";
+    pendingPasswordToken: string;
+}, {
+    errorType: "PasswordSetupRequired";
+    pendingPasswordToken: string;
+}>;
 
 declare const schemas$9_addressSchema: typeof addressSchema;
 declare const schemas$9_communicationPreferencesSchema: typeof communicationPreferencesSchema;
@@ -2028,11 +2066,12 @@ declare const schemas$9_connectionUrlSchema: typeof connectionUrlSchema;
 declare const schemas$9_identitySchema: typeof identitySchema;
 declare const schemas$9_ilokConnectedAccountSchema: typeof ilokConnectedAccountSchema;
 declare const schemas$9_pendingActivationSchema: typeof pendingActivationSchema;
+declare const schemas$9_pendingPasswordProblemSchema: typeof pendingPasswordProblemSchema;
 declare const schemas$9_userAccountConfirmedSchema: typeof userAccountConfirmedSchema;
 declare const schemas$9_userAccountConfirmedStatusSchema: typeof userAccountConfirmedStatusSchema;
 declare const schemas$9_userSchema: typeof userSchema;
 declare namespace schemas$9 {
-  export { schemas$9_addressSchema as addressSchema, schemas$9_communicationPreferencesSchema as communicationPreferencesSchema, schemas$9_connectedAccountSchema as connectedAccountSchema, schemas$9_connectionUrlSchema as connectionUrlSchema, schemas$9_identitySchema as identitySchema, schemas$9_ilokConnectedAccountSchema as ilokConnectedAccountSchema, schemas$9_pendingActivationSchema as pendingActivationSchema, schemas$9_userAccountConfirmedSchema as userAccountConfirmedSchema, schemas$9_userAccountConfirmedStatusSchema as userAccountConfirmedStatusSchema, schemas$9_userSchema as userSchema };
+  export { schemas$9_addressSchema as addressSchema, schemas$9_communicationPreferencesSchema as communicationPreferencesSchema, schemas$9_connectedAccountSchema as connectedAccountSchema, schemas$9_connectionUrlSchema as connectionUrlSchema, schemas$9_identitySchema as identitySchema, schemas$9_ilokConnectedAccountSchema as ilokConnectedAccountSchema, schemas$9_pendingActivationSchema as pendingActivationSchema, schemas$9_pendingPasswordProblemSchema as pendingPasswordProblemSchema, schemas$9_userAccountConfirmedSchema as userAccountConfirmedSchema, schemas$9_userAccountConfirmedStatusSchema as userAccountConfirmedStatusSchema, schemas$9_userSchema as userSchema };
 }
 
 type CommunicationPreferences = z.infer<typeof communicationPreferencesSchema>;
@@ -2084,10 +2123,17 @@ declare class IdentityEndpoints {
     private api;
     private tokenStore;
     private logger;
-    constructor(api: MoonbaseApi, tokenStore: ITokenStore, logger: ILogger);
+    private pendingPasswords;
+    constructor(api: MoonbaseApi, tokenStore: ITokenStore, logger: ILogger, pendingPasswords: PendingPasswordStore);
     get(): Promise<User>;
     signIn(email: string, password: string): Promise<User>;
     signUp(name: string, email: string, password: string, address: Address | null | undefined, acceptedPrivacyPolicy: boolean, acceptedTermsAndConditions: boolean, communicationOptIn?: boolean, options?: SignUpOptions): Promise<SignUpResult>;
+    /**
+     * The address already has an account with no password, so the server emailed it a link and
+     * handed back the password just typed, sealed, for that link to set once it is opened here.
+     * Never thrown: the caller still gets the `PasswordSetupRequiredError` from the response.
+     */
+    private keepPendingPassword;
     /**
      * Signs the buyer out here at once, and ends the session on the server so its refresh
      * token stops working too. Resolves once the server has answered, and never rejects:
@@ -47317,6 +47363,20 @@ declare class MoonbaseError extends Error {
 declare class CaptchaRequiredError extends MoonbaseError {
     constructor(detail?: string, title?: string);
 }
+/**
+ * The address already has an account, but one without a password: the store gave the customer a
+ * license, or they bought something without one. Anyone can type any address into a form, so the
+ * password they typed is not set from here. Moonbase emails the address a link to finish instead.
+ * `message` is the API's own copy for the customer, safe to show as is.
+ *
+ * From `identity.signUp`, that link sets the password the customer just chose and signs them in,
+ * provided they open it in this same browser. Anywhere else, it asks them for a password again.
+ *
+ * A `MoonbaseError` like any other refusal, so code that already handles those keeps working.
+ */
+declare class PasswordSetupRequiredError extends MoonbaseError {
+    constructor(detail?: string, title?: string, status?: number);
+}
 
 /**
  * Cleans up merchant-authored group IDs before they go on the wire.
@@ -47424,18 +47484,18 @@ declare const problemDetailsSchema: z.ZodObject<{
     title: string;
     type?: string | undefined;
     status?: number | undefined;
+    errorType?: string | undefined;
     detail?: string | undefined;
     instance?: string | undefined;
     errors?: Record<string, string[]> | undefined;
-    errorType?: string | undefined;
 }, {
     title: string;
     type?: string | undefined;
     status?: number | undefined;
+    errorType?: string | undefined;
     detail?: string | undefined;
     instance?: string | undefined;
     errors?: Record<string, string[]> | undefined;
-    errorType?: string | undefined;
 }>;
 type ProblemDetails = z.infer<typeof problemDetailsSchema>;
 
@@ -47501,4 +47561,4 @@ declare class MoonbaseClient {
     orders: OrderEndpoints;
 }
 
-export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type ProductRelease, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, accessTokenLifetime, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };
+export { type Activation, ActivationMethod, type ActivationRequest, ActivationRequestFulfillmentType, ActivationRequestStatus, ActivationStatus, type Address, Architecture, type BundleLineItem, CaptchaRequiredError, type CartCatalog, type CartOrder, type CartTotal, type CartTotalCondition, CartUtils, type CommunicationPreferences, type CommunicationPreferencesInput, type CommunicationPreferencesView, type CompletedOrder, ConnectableAccountProvider, type ConnectedAccount, ConsoleLogger, CycleLength, type Discount, DiscountUtils, type Download, type DownloadManifest, type ILogger, type IRecurrence, type IStore, type ITokenStore, type Identity, type ImageFit, type ImageFormat, type ImageTransform, ImageUtils, InMemoryStore, type License, LicenseStatus, type LineItem, type LineItemTotal, LocalStorageStore, LogLevel, MarketingConsentType, type MilestoneProgress, type Money, type MoneyCollection, MoneyCollectionUtils, MoonbaseApi, MoonbaseClient, type MoonbaseConfiguration, MoonbaseError, NotAuthenticatedError, NotAuthorizedError, NotFoundError, type OfferCondition, type OfferConditionContext, type OfferProgress, type OfferScope, OfferUtils, type OpenOrder, type Order, OrderStatus, type OrderTotal, type OwnedProduct, type Page, PasswordSetupRequiredError, Platform, type PricingTier, type PricingVariation, type ProblemDetails, type ProductLineItem, type ProductRelease, type PromotionDisplay, type Quantifiable, type RawPropertyArray, type RawPropertyObject, type RawPropertyValue, type SignUpOptions, type SignUpResult, type SingleOrMultiple, StoreClosedError, type Storefront, type StorefrontBundle, type StorefrontOffer, type StorefrontOfferTarget, type StorefrontProduct, type StorefrontPromotion, type StorefrontPromotionCta, type StorefrontPromotionTarget, type SubscribeInput, type SubscribeResponse, type Subscription, type SubscriptionCancellationFeedback, SubscriptionCancellationReason, SubscriptionStatus, type TaxEstimate, TokenStore, type UrchinTrackingModule, type User, type UserAccountConfirmed, type UserAccountConfirmedStatus, type Vendor, type VendorCaptcha, type VendorFeatures, type Voucher, accessTokenLifetime, imageWidths, isLocalStorageAvailable, isPromotionDisplay, isTransformableImageUrl, maxImageDimension, normalizeGroupIds, objectToQuery, parseOffSiteReferrer, problemDetailsSchema, promotionDisplays, resolveUtm, schemas, utmToObject };

package/dist/index.js

@@ -621,6 +621,12 @@ var CaptchaRequiredError = class extends MoonbaseError {
     this.name = "CaptchaRequiredError";
   }
 };
+var PasswordSetupRequiredError = class extends MoonbaseError {
+  constructor(detail, title, status) {
+    super(title != null ? title : "Password setup required", detail, status);
+    this.name = "PasswordSetupRequiredError";
+  }
+};
 
 // src/utils/problemDetails.ts
 import { z as z7 } from "zod";
@@ -644,6 +650,7 @@ function camelCase(str) {
   }).join("");
 }
 async function handleResponseProblem(response, logger) {
+  var _a;
   if (response.status === 404)
     throw new NotFoundError();
   if (response.status === 401) {
@@ -665,6 +672,8 @@ async function handleResponseProblem(response, logger) {
     throw new StoreClosedError(problemDetails.detail);
   if (problemDetails.errorType === "CaptchaRequired")
     throw new CaptchaRequiredError(problemDetails.detail, problemDetails.title);
+  if (problemDetails.errorType === "PasswordSetupRequired")
+    throw new PasswordSetupRequiredError(problemDetails.detail, problemDetails.title, (_a = problemDetails.status) != null ? _a : response.status);
   throw new MoonbaseError(
     problemDetails.title,
     problemDetails.detail,
@@ -683,6 +692,7 @@ __export(schemas_exports5, {
   identitySchema: () => identitySchema,
   ilokConnectedAccountSchema: () => ilokConnectedAccountSchema,
   pendingActivationSchema: () => pendingActivationSchema,
+  pendingPasswordProblemSchema: () => pendingPasswordProblemSchema,
   userAccountConfirmedSchema: () => userAccountConfirmedSchema,
   userAccountConfirmedStatusSchema: () => userAccountConfirmedStatusSchema,
   userSchema: () => userSchema
@@ -756,13 +766,18 @@ var pendingActivationSchema = z8.object({
   status: z8.literal("activation_pending"),
   email: z8.string()
 });
+var pendingPasswordProblemSchema = z8.object({
+  errorType: z8.literal("PasswordSetupRequired"),
+  pendingPasswordToken: z8.string()
+});
 
 // src/identity/endpoints.ts
 var IdentityEndpoints = class {
-  constructor(api, tokenStore, logger) {
+  constructor(api, tokenStore, logger, pendingPasswords) {
     this.api = api;
     this.tokenStore = tokenStore;
     this.logger = logger;
+    this.pendingPasswords = pendingPasswords;
   }
   async get() {
     const response = await this.api.authenticatedFetch("/api/customer/meta/user", userSchema);
@@ -818,8 +833,11 @@ var IdentityEndpoints = class {
         groupIds: normalizeGroupIds(options == null ? void 0 : options.groupIds)
       })
     });
-    if (response.status >= 400)
+    if (response.status >= 400) {
+      if (response.status === 409)
+        await this.keepPendingPassword(email, response.clone());
       await handleResponseProblem(response, this.logger);
+    }
     const data = await response.json();
     if (response.status === 202) {
       const parsed = pendingActivationSchema.parse(data);
@@ -835,6 +853,19 @@ var IdentityEndpoints = class {
     this.tokenStore.setUser(identity);
     return { status: "signed-in", user: userSchema.parse(identity) };
   }
+  /**
+   * The address already has an account with no password, so the server emailed it a link and
+   * handed back the password just typed, sealed, for that link to set once it is opened here.
+   * Never thrown: the caller still gets the `PasswordSetupRequiredError` from the response.
+   */
+  async keepPendingPassword(email, response) {
+    try {
+      const problem = pendingPasswordProblemSchema.safeParse(await response.json());
+      if (problem.success)
+        this.pendingPasswords.set(email, problem.data.pendingPasswordToken);
+    } catch (e) {
+    }
+  }
   /**
    * Signs the buyer out here at once, and ends the session on the server so its refresh
    * token stops working too. Resolves once the server has answered, and never rejects:
@@ -886,7 +917,13 @@ var IdentityEndpoints = class {
       await handleResponseProblem(response, this.logger);
   }
   async confirmAccount(email, code) {
-    const response = await this.api.fetch(`/api/customer/identity/confirm-account?email=${encodeURIComponent(email)}&code=${encodeURIComponent(code.replaceAll(" ", "+"))}&scheme=JWT`, userAccountConfirmedSchema, { method: "POST" });
+    const pendingPasswordToken = this.pendingPasswords.get(email);
+    const response = await this.api.fetch(`/api/customer/identity/confirm-account?email=${encodeURIComponent(email)}&code=${encodeURIComponent(code.replaceAll(" ", "+"))}&scheme=JWT`, userAccountConfirmedSchema, {
+      method: "POST",
+      body: pendingPasswordToken ? { pendingPasswordToken } : void 0
+    });
+    if (pendingPasswordToken)
+      this.pendingPasswords.remove(email);
     const result = response.data;
     if (result.status === "SignedIn") {
       if (!result.accessToken || !result.refreshToken) {
@@ -1083,7 +1120,7 @@ var ProductEndpoints = class {
 import { z as z14 } from "zod";
 
 // package.json
-var version = "3.8.0";
+var version = "3.9.0";
 
 // src/utils/client.ts
 function buildClientHeader(sdk) {
@@ -1091,6 +1128,11 @@ function buildClientHeader(sdk) {
 }
 
 // src/utils/api.ts
+function loggableBody(body) {
+  if (!body || typeof body !== "object" || Array.isArray(body))
+    return body;
+  return Object.fromEntries(Object.entries(body).map(([key, value]) => [key, /password|token/i.test(key) && value != null ? "[redacted]" : value]));
+}
 function objectToQuery(obj) {
   return Object.entries(obj != null ? obj : {}).filter(([_, value]) => value !== void 0).map(([key, value]) => `${key}=${encodeURIComponent(value instanceof Date ? value.toISOString() : value)}`).join("&");
 }
@@ -1112,7 +1154,7 @@ var MoonbaseApi = class {
     const contentType = (_a = options == null ? void 0 : options.contentType) != null ? _a : "application/json";
     this.logger.debug("Making request to Moonbase API...", {
       path,
-      body: options == null ? void 0 : options.body
+      body: loggableBody(options == null ? void 0 : options.body)
     });
     const startedAt = /* @__PURE__ */ new Date();
     const request = {
@@ -1761,6 +1803,50 @@ var InMemoryStore = class {
   }
 };
 
+// src/utils/pendingPasswords.ts
+var lifetime = 24 * 60 * 60 * 1e3;
+function normalizeEmail(email) {
+  return email.trim().toLowerCase();
+}
+var _PendingPasswordStore = class _PendingPasswordStore {
+  constructor(store) {
+    this.store = store != null ? store : isLocalStorageAvailable() ? new LocalStorageStore() : new InMemoryStore();
+  }
+  get(email) {
+    var _a, _b;
+    return (_b = (_a = this.read()[normalizeEmail(email)]) == null ? void 0 : _a.token) != null ? _b : null;
+  }
+  set(email, token) {
+    this.write({ ...this.read(), [normalizeEmail(email)]: { token, storedAt: Date.now() } });
+  }
+  remove(email) {
+    const entries = this.read();
+    delete entries[normalizeEmail(email)];
+    this.write(entries);
+  }
+  /** The entries still worth keeping. Drops the rest from storage as it goes. */
+  read() {
+    const stored = this.store.get(_PendingPasswordStore.storageKey);
+    if (!stored || typeof stored !== "object")
+      return {};
+    const now = Date.now();
+    const fresh = Object.fromEntries(Object.entries(stored).filter(
+      ([, entry]) => typeof (entry == null ? void 0 : entry.token) === "string" && typeof entry.storedAt === "number" && now - entry.storedAt < lifetime
+    ));
+    if (Object.keys(fresh).length !== Object.keys(stored).length)
+      this.write(fresh);
+    return fresh;
+  }
+  write(entries) {
+    if (Object.keys(entries).length > 0)
+      this.store.set(_PendingPasswordStore.storageKey, entries);
+    else
+      this.store.remove(_PendingPasswordStore.storageKey);
+  }
+};
+_PendingPasswordStore.storageKey = "moonbase_pending_passwords";
+var PendingPasswordStore = _PendingPasswordStore;
+
 // src/utils/tokenStore.ts
 var defaultAccessTokenLifetime = 15 * 60 * 1e3;
 var renewBeforeExpiry = 5 * 60 * 1e3;
@@ -1770,9 +1856,9 @@ function accessTokenLifetime(accessToken) {
   try {
     const payload = accessToken.split(".")[1].replaceAll("-", "+").replaceAll("_", "/");
     const claims = JSON.parse(atob(payload.padEnd(Math.ceil(payload.length / 4) * 4, "=")));
-    const lifetime = (Number(claims.exp) - Number(claims.iat)) * 1e3;
-    if (Number.isFinite(lifetime) && lifetime > 0 && lifetime <= 24 * 60 * 60 * 1e3)
-      return lifetime;
+    const lifetime2 = (Number(claims.exp) - Number(claims.iat)) * 1e3;
+    if (Number.isFinite(lifetime2) && lifetime2 > 0 && lifetime2 <= 24 * 60 * 60 * 1e3)
+      return lifetime2;
   } catch (e) {
   }
   return defaultAccessTokenLifetime;
@@ -2714,7 +2800,7 @@ var MoonbaseClient = class {
     this.tokenStore = new TokenStore(configuration);
     this.api = new MoonbaseApi(this.configuration.endpoint, this.tokenStore, this.logger, this.configuration.sdk);
     this.storefront = new StorefrontEndpoints(this.api, this.configuration);
-    this.identity = new IdentityEndpoints(this.api, this.tokenStore, this.logger);
+    this.identity = new IdentityEndpoints(this.api, this.tokenStore, this.logger, new PendingPasswordStore(configuration.store));
     this.communications = new CommunicationsEndpoints(this.api);
     this.groups = new GroupEndpoints(this.api);
     this.vouchers = new VoucherEndpoints(this.api);
@@ -2751,6 +2837,7 @@ export {
   NotFoundError,
   OfferUtils,
   OrderStatus,
+  PasswordSetupRequiredError,
   Platform,
   StoreClosedError,
   SubscriptionCancellationReason,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/storefront-api",
   "type": "module",
-  "version": "3.8.0",
+  "version": "3.9.0",
   "description": "Package to let you build storefronts with Moonbase.sh as payment and delivery provider",
   "author": "Tobias Lønnerød Madsen <m@dsen.tv>",
   "license": "MIT",