@moonbase.sh/storefront-api 0.1.92 → 0.1.93

package/dist/index.cjs

@@ -195,19 +195,19 @@ var ActivationRequestEndpoints = class {
   }
   async get(requestId) {
     const response = await this.api.fetch(`/api/customer/activations/${requestId}`);
-    return activationRequestSchema.parse(response);
+    return activationRequestSchema.parse(response.data);
   }
   async isCompleted(requestId) {
     const response = await this.api.fetch(`/api/customer/activations/${requestId}/completed`);
-    return import_zod5.z.boolean().parse(response);
+    return import_zod5.z.boolean().parse(response.data);
   }
   async fulfillLicense(requestId) {
     const response = await this.api.authenticatedFetch(`/api/customer/activations/${requestId}/license`, "POST");
-    return activationRequestSchema.parse(response);
+    return activationRequestSchema.parse(response.data);
   }
   async fulfillTrial(requestId) {
     const response = await this.api.fetch(`/api/customer/activations/${requestId}/trial`, "POST");
-    return activationRequestSchema.parse(response);
+    return activationRequestSchema.parse(response.data);
   }
 };
 
@@ -300,7 +300,7 @@ var IdentityEndpoints = class {
   }
   async get() {
     const response = await this.api.authenticatedFetch("/api/customer/meta/user");
-    return userSchema.parse(response);
+    return userSchema.parse(response.data);
   }
   async signIn(email, password) {
     const response = await (0, import_cross_fetch.default)(`${this.api.baseUrl}/api/customer/identity/sign-in?email=${email}&scheme=JWT`, {
@@ -328,7 +328,7 @@ var IdentityEndpoints = class {
       acceptedPrivacyPolicy,
       acceptedTermsAndConditions
     });
-    const user = identityUserSchema.parse(response);
+    const user = identityUserSchema.parse(response.data);
     this.tokenStore.setUser(user);
     return user;
   }
@@ -412,13 +412,13 @@ var LicenseEndpoints = class {
   }
   async get(nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || "/api/customer/licenses");
-    return paged(licenseSchema).parse(response);
+    return paged(licenseSchema).parse(response.data);
   }
   async getActivations(licenseId, nextUrl) {
     const response = await this.api.authenticatedFetch(
       nextUrl || `/api/customer/licenses/${licenseId}/activations`
     );
-    return paged(activationSchema).parse(response);
+    return paged(activationSchema).parse(response.data);
   }
   async revokeActivation(licenseId, activationId) {
     await this.api.authenticatedFetch(`/api/customer/licenses/${licenseId}/activations/${activationId}/revoke`, "POST");
@@ -509,7 +509,7 @@ var OrderEndpoints = class {
   }
   async get(orderId) {
     const response = await this.api.fetch(`/api/customer/orders/${orderId}`);
-    return orderSchema.parse(response);
+    return orderSchema.parse(response.data);
   }
   async pushContent(order, checkout) {
     const response = await this.api.fetch(
@@ -520,12 +520,11 @@ var OrderEndpoints = class {
         items: order.items
       }
     );
-    return openOrderSchema.parse(response);
+    return openOrderSchema.parse(response.data);
   }
 };
 
 // src/products/endpoints.ts
-var import_cross_fetch2 = __toESM(require("cross-fetch"), 1);
 var import_zod10 = require("zod");
 var ProductEndpoints = class {
   constructor(api) {
@@ -533,30 +532,20 @@ var ProductEndpoints = class {
   }
   async getOwned(nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || "/api/customer/products");
-    return paged(productSummarySchema).parse(response);
+    return paged(productSummarySchema).parse(response.data);
   }
   async getLicenses(productId, nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || `/api/customer/products/${productId}/licenses`);
-    return paged(licenseSchema).parse(response);
+    return paged(licenseSchema).parse(response.data);
   }
   async getActivations(productId, nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || `/api/customer/products/${productId}/licenses/activations`);
-    return paged(activationSchema).parse(response);
+    return paged(activationSchema).parse(response.data);
   }
   async activate(deviceToken, activationMethod) {
-    const response = await (0, import_cross_fetch2.default)(`${this.api.baseUrl}/api/customer/products/activate?method=${activationMethod}`, {
-      method: "POST",
-      headers: {
-        "Accept": "application/json",
-        "Content-Type": "text/plain"
-      },
-      body: deviceToken
-    });
-    if (response.status >= 400)
-      await handleResponseProblem(response);
-    const data = await response.json();
+    const response = await this.api.authenticatedFetch(`/api/customer/products/activate?method=${activationMethod}`, "POST", deviceToken, "text/plain");
     return {
-      license: licenseSchema.parse(data),
+      license: licenseSchema.parse(response.data),
       url: import_zod10.z.string().parse(response.headers.get("location"))
     };
   }
@@ -569,46 +558,51 @@ var StorefrontEndpoints = class {
   }
   async get() {
     const response = await this.api.fetch("/api/customer/storefront");
-    return storefrontSchema.parse(response);
+    return storefrontSchema.parse(response.data);
   }
 };
 
 // src/utils/api.ts
-var import_cross_fetch3 = __toESM(require("cross-fetch"), 1);
+var import_cross_fetch2 = __toESM(require("cross-fetch"), 1);
 var MoonbaseApi = class {
   constructor(baseUrl, tokenStore) {
     this.baseUrl = baseUrl;
     this.tokenStore = tokenStore;
   }
-  async authenticatedFetch(path, method, body) {
+  async authenticatedFetch(path, method, body, contentType) {
     if (!this.tokenStore.hasAccessToken)
       throw new NotAuthenticatedError();
-    return await this.fetch(path, method, body);
+    return await this.fetch(path, method, body, contentType);
   }
-  async fetch(path, method, body) {
+  async fetch(path, method, body, contentType) {
     const accessToken = await this.tokenStore.getAccessToken();
-    const response = await (0, import_cross_fetch3.default)(this.baseUrl + path, {
+    contentType != null ? contentType : contentType = "application/json";
+    const response = await (0, import_cross_fetch2.default)(this.baseUrl + path, {
       method: method || "GET",
       mode: "cors",
       headers: {
         "Accept": "application/json",
-        "Content-Type": "application/json",
+        "Content-Type": contentType,
         // While this fetch can be anonymous, we add the token if we have it
         ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
         // Force CORS on all calls
         "x-mb-cors": "1"
       },
-      body: body ? JSON.stringify(body) : void 0
+      body: body ? contentType !== "application/json" ? body : JSON.stringify(body) : void 0
     });
     if (response.status >= 400)
       await handleResponseProblem(response);
     const contentLength = Number(response.headers.get("Content-Length")) || 0;
-    return contentLength > 0 ? await response.json() : null;
+    return {
+      data: contentLength > 0 ? await response.json() : null,
+      headers: response.headers,
+      status: response.status
+    };
   }
 };
 
 // src/utils/tokenStore.ts
-var import_cross_fetch4 = __toESM(require("cross-fetch"), 1);
+var import_cross_fetch3 = __toESM(require("cross-fetch"), 1);
 var _TokenStore = class _TokenStore {
   constructor(configuration) {
     this.configuration = configuration;
@@ -674,7 +668,7 @@ var _TokenStore = class _TokenStore {
   async refreshTokens() {
     if (!this.tokens)
       throw new Error("No tokens found to refresh");
-    const response = await (0, import_cross_fetch4.default)(`${this.configuration.endpoint}/api/customer/identity/refresh?token=${this.tokens.refreshToken}`, {
+    const response = await (0, import_cross_fetch3.default)(`${this.configuration.endpoint}/api/customer/identity/refresh?token=${this.tokens.refreshToken}`, {
       method: "POST",
       headers: {
         "Accept": "application/json",
@@ -724,14 +718,14 @@ var VoucherEndpoints = class {
   }
   async peek(code) {
     const response = await this.api.fetch(`/api/customer/vouchers?code=${encodeURIComponent(code)}`);
-    return voucherSchema.parse(response);
+    return voucherSchema.parse(response.data);
   }
   async redeem(code) {
     const response = await this.api.authenticatedFetch(
       `/api/customer/vouchers/redeem?code=${encodeURIComponent(code)}`,
       "POST"
     );
-    return voucherSchema.parse(response);
+    return voucherSchema.parse(response.data);
   }
 };
 

package/dist/index.d.cts

@@ -194,12 +194,17 @@ declare class TokenStore {
 }
 
 type HttpMethods = 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
+interface Response {
+    data: unknown;
+    headers: Headers;
+    status: number;
+}
 declare class MoonbaseApi {
     baseUrl: string;
     private tokenStore;
     constructor(baseUrl: string, tokenStore: TokenStore);
-    authenticatedFetch(path: string, method?: HttpMethods, body?: any): Promise<any>;
-    fetch(path: string, method?: HttpMethods, body?: any): Promise<any>;
+    authenticatedFetch(path: string, method?: HttpMethods, body?: any, contentType?: string): Promise<Response>;
+    fetch(path: string, method?: HttpMethods, body?: any, contentType?: string): Promise<Response>;
 }
 
 declare const activationRequestSchema: z.ZodObject<{

package/dist/index.d.ts

@@ -194,12 +194,17 @@ declare class TokenStore {
 }
 
 type HttpMethods = 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE';
+interface Response {
+    data: unknown;
+    headers: Headers;
+    status: number;
+}
 declare class MoonbaseApi {
     baseUrl: string;
     private tokenStore;
     constructor(baseUrl: string, tokenStore: TokenStore);
-    authenticatedFetch(path: string, method?: HttpMethods, body?: any): Promise<any>;
-    fetch(path: string, method?: HttpMethods, body?: any): Promise<any>;
+    authenticatedFetch(path: string, method?: HttpMethods, body?: any, contentType?: string): Promise<Response>;
+    fetch(path: string, method?: HttpMethods, body?: any, contentType?: string): Promise<Response>;
 }
 
 declare const activationRequestSchema: z.ZodObject<{

package/dist/index.js

@@ -150,19 +150,19 @@ var ActivationRequestEndpoints = class {
   }
   async get(requestId) {
     const response = await this.api.fetch(`/api/customer/activations/${requestId}`);
-    return activationRequestSchema.parse(response);
+    return activationRequestSchema.parse(response.data);
   }
   async isCompleted(requestId) {
     const response = await this.api.fetch(`/api/customer/activations/${requestId}/completed`);
-    return z5.boolean().parse(response);
+    return z5.boolean().parse(response.data);
   }
   async fulfillLicense(requestId) {
     const response = await this.api.authenticatedFetch(`/api/customer/activations/${requestId}/license`, "POST");
-    return activationRequestSchema.parse(response);
+    return activationRequestSchema.parse(response.data);
   }
   async fulfillTrial(requestId) {
     const response = await this.api.fetch(`/api/customer/activations/${requestId}/trial`, "POST");
-    return activationRequestSchema.parse(response);
+    return activationRequestSchema.parse(response.data);
   }
 };
 
@@ -255,7 +255,7 @@ var IdentityEndpoints = class {
   }
   async get() {
     const response = await this.api.authenticatedFetch("/api/customer/meta/user");
-    return userSchema.parse(response);
+    return userSchema.parse(response.data);
   }
   async signIn(email, password) {
     const response = await fetch(`${this.api.baseUrl}/api/customer/identity/sign-in?email=${email}&scheme=JWT`, {
@@ -283,7 +283,7 @@ var IdentityEndpoints = class {
       acceptedPrivacyPolicy,
       acceptedTermsAndConditions
     });
-    const user = identityUserSchema.parse(response);
+    const user = identityUserSchema.parse(response.data);
     this.tokenStore.setUser(user);
     return user;
   }
@@ -367,13 +367,13 @@ var LicenseEndpoints = class {
   }
   async get(nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || "/api/customer/licenses");
-    return paged(licenseSchema).parse(response);
+    return paged(licenseSchema).parse(response.data);
   }
   async getActivations(licenseId, nextUrl) {
     const response = await this.api.authenticatedFetch(
       nextUrl || `/api/customer/licenses/${licenseId}/activations`
     );
-    return paged(activationSchema).parse(response);
+    return paged(activationSchema).parse(response.data);
   }
   async revokeActivation(licenseId, activationId) {
     await this.api.authenticatedFetch(`/api/customer/licenses/${licenseId}/activations/${activationId}/revoke`, "POST");
@@ -464,7 +464,7 @@ var OrderEndpoints = class {
   }
   async get(orderId) {
     const response = await this.api.fetch(`/api/customer/orders/${orderId}`);
-    return orderSchema.parse(response);
+    return orderSchema.parse(response.data);
   }
   async pushContent(order, checkout) {
     const response = await this.api.fetch(
@@ -475,12 +475,11 @@ var OrderEndpoints = class {
         items: order.items
       }
     );
-    return openOrderSchema.parse(response);
+    return openOrderSchema.parse(response.data);
   }
 };
 
 // src/products/endpoints.ts
-import fetch2 from "cross-fetch";
 import { z as z10 } from "zod";
 var ProductEndpoints = class {
   constructor(api) {
@@ -488,30 +487,20 @@ var ProductEndpoints = class {
   }
   async getOwned(nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || "/api/customer/products");
-    return paged(productSummarySchema).parse(response);
+    return paged(productSummarySchema).parse(response.data);
   }
   async getLicenses(productId, nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || `/api/customer/products/${productId}/licenses`);
-    return paged(licenseSchema).parse(response);
+    return paged(licenseSchema).parse(response.data);
   }
   async getActivations(productId, nextUrl) {
     const response = await this.api.authenticatedFetch(nextUrl || `/api/customer/products/${productId}/licenses/activations`);
-    return paged(activationSchema).parse(response);
+    return paged(activationSchema).parse(response.data);
   }
   async activate(deviceToken, activationMethod) {
-    const response = await fetch2(`${this.api.baseUrl}/api/customer/products/activate?method=${activationMethod}`, {
-      method: "POST",
-      headers: {
-        "Accept": "application/json",
-        "Content-Type": "text/plain"
-      },
-      body: deviceToken
-    });
-    if (response.status >= 400)
-      await handleResponseProblem(response);
-    const data = await response.json();
+    const response = await this.api.authenticatedFetch(`/api/customer/products/activate?method=${activationMethod}`, "POST", deviceToken, "text/plain");
     return {
-      license: licenseSchema.parse(data),
+      license: licenseSchema.parse(response.data),
       url: z10.string().parse(response.headers.get("location"))
     };
   }
@@ -524,46 +513,51 @@ var StorefrontEndpoints = class {
   }
   async get() {
     const response = await this.api.fetch("/api/customer/storefront");
-    return storefrontSchema.parse(response);
+    return storefrontSchema.parse(response.data);
   }
 };
 
 // src/utils/api.ts
-import fetch3 from "cross-fetch";
+import fetch2 from "cross-fetch";
 var MoonbaseApi = class {
   constructor(baseUrl, tokenStore) {
     this.baseUrl = baseUrl;
     this.tokenStore = tokenStore;
   }
-  async authenticatedFetch(path, method, body) {
+  async authenticatedFetch(path, method, body, contentType) {
     if (!this.tokenStore.hasAccessToken)
       throw new NotAuthenticatedError();
-    return await this.fetch(path, method, body);
+    return await this.fetch(path, method, body, contentType);
   }
-  async fetch(path, method, body) {
+  async fetch(path, method, body, contentType) {
     const accessToken = await this.tokenStore.getAccessToken();
-    const response = await fetch3(this.baseUrl + path, {
+    contentType != null ? contentType : contentType = "application/json";
+    const response = await fetch2(this.baseUrl + path, {
       method: method || "GET",
       mode: "cors",
       headers: {
         "Accept": "application/json",
-        "Content-Type": "application/json",
+        "Content-Type": contentType,
         // While this fetch can be anonymous, we add the token if we have it
         ...accessToken ? { Authorization: `Bearer ${accessToken}` } : {},
         // Force CORS on all calls
         "x-mb-cors": "1"
       },
-      body: body ? JSON.stringify(body) : void 0
+      body: body ? contentType !== "application/json" ? body : JSON.stringify(body) : void 0
     });
     if (response.status >= 400)
       await handleResponseProblem(response);
     const contentLength = Number(response.headers.get("Content-Length")) || 0;
-    return contentLength > 0 ? await response.json() : null;
+    return {
+      data: contentLength > 0 ? await response.json() : null,
+      headers: response.headers,
+      status: response.status
+    };
   }
 };
 
 // src/utils/tokenStore.ts
-import fetch4 from "cross-fetch";
+import fetch3 from "cross-fetch";
 var _TokenStore = class _TokenStore {
   constructor(configuration) {
     this.configuration = configuration;
@@ -629,7 +623,7 @@ var _TokenStore = class _TokenStore {
   async refreshTokens() {
     if (!this.tokens)
       throw new Error("No tokens found to refresh");
-    const response = await fetch4(`${this.configuration.endpoint}/api/customer/identity/refresh?token=${this.tokens.refreshToken}`, {
+    const response = await fetch3(`${this.configuration.endpoint}/api/customer/identity/refresh?token=${this.tokens.refreshToken}`, {
       method: "POST",
       headers: {
         "Accept": "application/json",
@@ -679,14 +673,14 @@ var VoucherEndpoints = class {
   }
   async peek(code) {
     const response = await this.api.fetch(`/api/customer/vouchers?code=${encodeURIComponent(code)}`);
-    return voucherSchema.parse(response);
+    return voucherSchema.parse(response.data);
   }
   async redeem(code) {
     const response = await this.api.authenticatedFetch(
       `/api/customer/vouchers/redeem?code=${encodeURIComponent(code)}`,
       "POST"
     );
-    return voucherSchema.parse(response);
+    return voucherSchema.parse(response.data);
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@moonbase.sh/storefront-api",
   "type": "module",
-  "version": "0.1.92",
+  "version": "0.1.93",
   "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",