@peektravel/app-utilities 0.7.0 → 0.7.2

package/README.md

@@ -276,8 +276,9 @@ app.post("/waiver-webhook", (req, res) => {
 app.post("/install-webhook", async (req, res) => {
   let event: InstallWebhook;
   try {
-    // Verifies the signed token, then merges in the JSON body:
-    event = parseInstallWebhook(req.token, req.body, process.env.PEEK_INTERNAL_SECRET!);
+    // Token rides in the `x-peek-auth` header (a `Bearer ` prefix is stripped for you):
+    const token = req.header("x-peek-auth") ?? "";
+    event = parseInstallWebhook(token, req.body, process.env.PEEK_INTERNAL_SECRET!);
   } catch {
     return res.sendStatus(401); // bad signature / issuer / audience / expired
   }
@@ -301,16 +302,27 @@ is the receiver's job**. `parseWaiverWebhook` also takes an optional
 below.
 
 `parseInstallWebhook(token, body, secret)` is different: the delivery carries a
-signed `app_registry_v2` JWT plus a JSON body. It validates the HMAC signature,
+signed `app_registry_v2` JWT plus a JSON body. Peek sends the token in the
+`x-peek-auth` header — pass that value straight in (`token` accepts it with or
+without a `Bearer ` prefix). It validates the HMAC signature,
 expiry, issuer, and `"Joken"` audience (the same checks as `verifyPeekAuthToken`,
 throwing the underlying `jsonwebtoken` error — or `InvalidPeekTokenError` when a
 present `user` block has no `id`), then returns one flat, JSON-safe
 `InstallWebhook`: `installId`, `accountId` (**also called the partner ID**),
-`accountName`, `platform`, `isTest`, `status`, `rawStatus`, `displayVersion`, and
-a **nullable** `user`. The **verified token** is authoritative for `installId` /
-`accountId` / `status` / `displayVersion` / `user`; the unsigned body supplies
-only `accountName` / `platform` / `isTest`. This webhook is the only source of
-`accountId` in the package, since no GraphQL read returns it. `status` and
+`accountName`, `platform`, `isTest`, `timezone`, `apiUrl`, `status`, `rawStatus`,
+`displayVersion`, and a **nullable** `user`. The **JSON body is the source of the
+event data**; the fields it shares with the token (`installId` / `accountId` /
+`status` / `displayVersion` / `user`) fall back to the **verified token** when
+the body omits them. The token authenticates the whole delivery, so the body is
+trusted within a verified request. This webhook is the only source of
+`accountId`, `timezone`, and `apiUrl` in the package, since no GraphQL read
+returns them — **persist them per install**. `apiUrl` is the install's app
+endpoint: use it **as given** (don't reconstruct it from `appId`) — pass it as the
+access service's `apiUrl`, or hand the whole install to
+`createAccessServiceForInstall(install, { jwtSecret, issuer })`, which picks the
+service by `platform` and wires the endpoint for you. Every event is a **full
+snapshot** — an `update_installed` carries the same fields as the original
+`installed`, so upsert by `installId` and take the latest `apiUrl`. `status` and
 `platform` are **nullable** — a value this version doesn't recognise stays `null`
 (wire value on `rawStatus`) instead of being coerced, so a newer registry can't be
 mistaken for an older one. (The older `verifyInstallWebhook(token, secret)` is

package/dist/index.cjs

@@ -2044,7 +2044,8 @@ var GraphQLClient = class {
     );
   }
   endpoint(endpointName) {
-    const { baseUrl, appId, endpointPathPrefix } = this.options;
+    const { apiUrl, baseUrl, appId, endpointPathPrefix } = this.options;
+    if (apiUrl) return apiUrl;
     const prefix = endpointPathPrefix ? `${endpointPathPrefix}/` : "";
     return `${baseUrl}/${appId}/${prefix}${endpointName}`;
   }
@@ -2061,8 +2062,13 @@ var GraphQLClient = class {
 };
 var PEEK_TOKEN_ISSUER = "app_registry_v2";
 var PEEK_TOKEN_AUDIENCE = "Joken";
+var BEARER_PREFIX = "bearer ";
+function stripBearer(token) {
+  const trimmed = token.trim();
+  return trimmed.toLowerCase().startsWith(BEARER_PREFIX) ? trimmed.slice(BEARER_PREFIX.length).trim() : trimmed;
+}
 function verifyPeekJwt(token, secret) {
-  return jwt__namespace.verify(token, secret, {
+  return jwt__namespace.verify(stripBearer(token), secret, {
     issuer: PEEK_TOKEN_ISSUER,
     audience: PEEK_TOKEN_AUDIENCE
   });
@@ -3556,25 +3562,27 @@ var PeekAccessService = class {
   bookingService;
   reviewService;
   constructor(config) {
+    const hasApiUrl = !!config.apiUrl;
     const isV2 = config.mode === "v2";
     requireNonEmpty(config.installId, "installId", "PeekAccessService");
     requireNonEmpty(config.jwtSecret, "jwtSecret", "PeekAccessService");
     requireNonEmpty(config.issuer, "issuer", "PeekAccessService");
-    requireNonEmpty(config.appId, "appId", "PeekAccessService");
-    if (!isV2) requireNonEmpty(config.gatewayKey ?? "", "gatewayKey", "PeekAccessService");
+    if (!hasApiUrl) requireNonEmpty(config.appId ?? "", "appId", "PeekAccessService");
+    if (!hasApiUrl && !isV2) requireNonEmpty(config.gatewayKey ?? "", "gatewayKey", "PeekAccessService");
     this.jwtSecret = config.jwtSecret;
     const logger = config.logger ?? noopLogger;
     const tokens = createTokenManager(config);
     const defaultBaseUrl = isV2 ? DEFAULT_V2_BASE_URL : DEFAULT_BASE_URL;
     this.client = new GraphQLClient({
-      baseUrl: config.baseUrl ?? defaultBaseUrl,
-      appId: config.appId,
+      apiUrl: config.apiUrl,
+      baseUrl: hasApiUrl ? void 0 : config.baseUrl ?? defaultBaseUrl,
+      appId: hasApiUrl ? void 0 : config.appId,
       gatewayKey: config.gatewayKey,
       getToken: () => tokens.getToken(),
       retryDelaysMs: config.retryDelaysMs ?? DEFAULT_RETRY_DELAYS_MS,
       logger,
       fetchFn: config.fetch ?? globalThis.fetch,
-      endpointPathPrefix: isV2 ? V2_EXTENDABLE_SLUG : void 0
+      endpointPathPrefix: !hasApiUrl && isV2 ? V2_EXTENDABLE_SLUG : void 0
     });
     this.productServiceOptions = {
       itemOptionsPageSize: config.itemOptionsPageSize
@@ -3586,9 +3594,10 @@ var PeekAccessService = class {
    * decoded claims.
    *
    * Validates the HMAC signature (using this service's `jwtSecret`), the token
-   * expiry, the `"app_registry_v2"` issuer, and the `"Joken"` audience. Throws
-   * from the `jsonwebtoken` library on any failure — callers should catch to
-   * distinguish error kinds:
+   * expiry, the `"app_registry_v2"` issuer, and the `"Joken"` audience. Pass the
+   * raw `x-peek-auth` request header value — a leading `Bearer ` prefix, if
+   * present, is stripped for you. Throws from the `jsonwebtoken` library on any
+   * failure — callers should catch to distinguish error kinds:
    *
    * - `JsonWebTokenError` — signature invalid, wrong issuer/audience, or token
    *   malformed
@@ -4001,7 +4010,8 @@ var RestClient = class {
     );
   }
   endpoint(path) {
-    const { baseUrl, appId, extendableSlug } = this.options;
+    const { apiUrl, baseUrl, appId, extendableSlug } = this.options;
+    if (apiUrl) return `${apiUrl}/${path}`;
     return `${baseUrl}/${appId}/${extendableSlug}/${path}`;
   }
   buildHeaders() {
@@ -4018,15 +4028,17 @@ var CngAccessService = class {
   client;
   productService;
   constructor(config) {
+    const hasApiUrl = !!config.apiUrl;
     requireNonEmpty(config.installId, "installId", "CngAccessService");
     requireNonEmpty(config.jwtSecret, "jwtSecret", "CngAccessService");
     requireNonEmpty(config.issuer, "issuer", "CngAccessService");
-    requireNonEmpty(config.appId, "appId", "CngAccessService");
+    if (!hasApiUrl) requireNonEmpty(config.appId ?? "", "appId", "CngAccessService");
     const logger = config.logger ?? noopLogger;
     const tokens = createTokenManager(config);
     this.client = new RestClient({
-      baseUrl: config.baseUrl ?? DEFAULT_BASE_URL2,
-      appId: config.appId,
+      apiUrl: config.apiUrl,
+      baseUrl: hasApiUrl ? void 0 : config.baseUrl ?? DEFAULT_BASE_URL2,
+      appId: hasApiUrl ? void 0 : config.appId,
       extendableSlug: CNG_EXTENDABLE_SLUG,
       getToken: () => tokens.getToken(),
       retryDelaysMs: config.retryDelaysMs ?? DEFAULT_RETRY_DELAYS_MS,
@@ -4132,7 +4144,8 @@ var RestClient2 = class {
     );
   }
   endpoint(path) {
-    const { baseUrl, appId, extendableSlug } = this.options;
+    const { apiUrl, baseUrl, appId, extendableSlug } = this.options;
+    if (apiUrl) return `${apiUrl}/${path}`;
     return `${baseUrl}/${appId}/${extendableSlug}/${path}`;
   }
   buildHeaders() {
@@ -4149,15 +4162,17 @@ var AcmeAccessService = class {
   client;
   productService;
   constructor(config) {
+    const hasApiUrl = !!config.apiUrl;
     requireNonEmpty(config.installId, "installId", "AcmeAccessService");
     requireNonEmpty(config.jwtSecret, "jwtSecret", "AcmeAccessService");
     requireNonEmpty(config.issuer, "issuer", "AcmeAccessService");
-    requireNonEmpty(config.appId, "appId", "AcmeAccessService");
+    if (!hasApiUrl) requireNonEmpty(config.appId ?? "", "appId", "AcmeAccessService");
     const logger = config.logger ?? noopLogger;
     const tokens = createTokenManager(config);
     this.client = new RestClient2({
-      baseUrl: config.baseUrl ?? DEFAULT_BASE_URL3,
-      appId: config.appId,
+      apiUrl: config.apiUrl,
+      baseUrl: hasApiUrl ? void 0 : config.baseUrl ?? DEFAULT_BASE_URL3,
+      appId: hasApiUrl ? void 0 : config.appId,
       extendableSlug: ACME_EXTENDABLE_SLUG,
       getToken: () => tokens.getToken(),
       retryDelaysMs: config.retryDelaysMs ?? DEFAULT_RETRY_DELAYS_MS,
@@ -4181,6 +4196,23 @@ var AcmeAccessService = class {
   }
 };
 
+// src/access-service-factory.ts
+function createAccessServiceForInstall(install, config) {
+  const shared = { ...config, installId: install.installId, apiUrl: install.apiUrl };
+  switch (install.platform) {
+    case "peek":
+      return new PeekAccessService(shared);
+    case "cng":
+      return new CngAccessService(shared);
+    case "acme":
+      return new AcmeAccessService(shared);
+    default:
+      throw new Error(
+        `createAccessServiceForInstall: unknown or missing platform "${install.platform}" for install "${install.installId}"`
+      );
+  }
+}
+
 // src/internal/peek/bookings/booking-webhook.ts
 var PAYLOAD_BOOKING_KEY = "booking";
 var VALUE_OPEN_TOKEN = "value {";
@@ -4304,20 +4336,27 @@ function toPeekPlatform(raw) {
 // src/internal/peek/installs/install-webhook.ts
 function parseInstallWebhook(token, body, secret) {
   const payload = verifyPeekJwt(token, secret);
-  const account = extractInstallWebhookBody(body).account ?? {};
-  const rawStatus = payload.status ?? "";
+  const parsed = extractInstallWebhookBody(body);
+  const account = parsed.account ?? {};
+  const rawStatus = parsed.status || payload.status || "";
   return {
-    installId: payload.sub ?? "",
-    accountId: payload.account?.id ?? "",
+    installId: parsed.install_id || payload.sub || "",
+    accountId: account.id || payload.account?.id || "",
     accountName: account.name || "",
     platform: toPeekPlatform(account.platform || ""),
     isTest: Boolean(account.is_test),
+    timezone: account.timezone || "",
+    apiUrl: parsed.api?.url || "",
     status: toInstallStatus(rawStatus),
     rawStatus,
-    displayVersion: payload.display_version ?? "",
-    user: payload.user ? mapPeekTokenUser(payload.user) : null
+    displayVersion: parsed.display_version || payload.display_version || "",
+    user: resolveInstallUser(parsed.modified_by, payload.user)
   };
 }
+function resolveInstallUser(bodyUser, tokenUser) {
+  if (bodyUser?.id) return mapPeekTokenUser(bodyUser);
+  return tokenUser ? mapPeekTokenUser(tokenUser) : null;
+}
 function verifyInstallWebhook(token, secret) {
   const payload = verifyPeekJwt(token, secret);
   return {
@@ -4358,6 +4397,7 @@ exports.ResellerService = ResellerService;
 exports.ResourcePoolService = ResourcePoolService;
 exports.ReviewService = ReviewService;
 exports.TimeslotService = TimeslotService;
+exports.createAccessServiceForInstall = createAccessServiceForInstall;
 exports.noopLogger = noopLogger;
 exports.parseBookingWebhook = parseBookingWebhook;
 exports.parseInstallWebhook = parseInstallWebhook;