Merge pull request #70 from Foxy/beta

chore: release 1.16.0

Author: brettflorio

src/backend/API.ts

@@ -138,44 +138,73 @@ export class API extends Core.API<Graph> {
 
   private async __fetch(input: RequestInfo, init?: RequestInit): Promise<Response> {
     let token = JSON.parse(this.storage.getItem(API.ACCESS_TOKEN) ?? 'null') as StoredToken | null;
-    const request = new Request(input, init);
-
-    if (token !== null) {
-      const expiresAt = new Date(token.date_created).getTime() + token.expires_in * 1000;
-      const refreshAt = Date.now() + API.REFRESH_THRESHOLD;
-
-      if (expiresAt < refreshAt) {
-        this.storage.removeItem(API.ACCESS_TOKEN);
-        this.console.info('Removed old access token from the storage.');
-        token = null;
-      }
-    }
-
-    if (token === null) {
-      this.console.trace("Access token isn't present in the storage. Fetching a new one...");
+    let request = new Request(input, init);
+    let headers = request.headers;
 
+    const fetchNewAccessToken = async () => {
+      this.console.trace('Fetching a new access token...');
       const rawToken = await API.getToken(this, true).catch(err => {
         this.console.error(err.message);
         return null;
       });
 
       if (rawToken) {
-        token = { ...rawToken, date_created: new Date().toISOString() };
+        const token = { ...rawToken, date_created: new Date().toISOString() };
         this.storage.setItem(API.ACCESS_TOKEN, JSON.stringify(token));
         this.console.info('Access token updated.');
+        return token;
       } else {
         this.console.warn('Failed to fetch access token. Proceeding without authentication.');
+        return null;
       }
+    };
+
+    const setHeaders = (accessToken?: string) => {
+      if (!headers.get('Authorization') && accessToken) headers.set('Authorization', `Bearer ${accessToken}`);
+      if (!headers.get('Content-Type')) headers.set('Content-Type', 'application/json');
+      if (!headers.get('FOXY-API-VERSION')) headers.set('FOXY-API-VERSION', this.version);
+    };
+
+    if (token) {
+      const expiresAt = new Date(token.date_created).getTime() + token.expires_in * 1000;
+      const refreshAt = Date.now() + API.REFRESH_THRESHOLD;
+
+      if (expiresAt < refreshAt) {
+        this.storage.removeItem(API.ACCESS_TOKEN);
+        this.console.info('Removed old access token from the storage.');
+        token = await fetchNewAccessToken();
+      }
+    } else {
+      this.console.trace("Access token isn't present in the storage.");
+      token = await fetchNewAccessToken();
     }
 
-    const headers = request.headers;
+    setHeaders(token?.access_token);
     const method = init?.method?.toUpperCase() ?? 'GET';
+    this.console.trace(`${method} ${request.url}`);
+    let response = await fetch(request);
 
-    if (!headers.get('Authorization') && token) headers.set('Authorization', `Bearer ${token.access_token}`);
-    if (!headers.get('Content-Type')) headers.set('Content-Type', 'application/json');
-    if (!headers.get('FOXY-API-VERSION')) headers.set('FOXY-API-VERSION', this.version);
+    if (response.status === 401) {
+      const { error } = (await response.clone().json()) as { error: string };
 
-    this.console.trace(`${method} ${request.url}`);
-    return fetch(request);
+      if (error === 'invalid_token') {
+        this.console.info('Access token is invalid or expired.');
+
+        this.storage.removeItem(API.ACCESS_TOKEN);
+        this.console.info('Removed old access token from the storage.');
+
+        token = await fetchNewAccessToken();
+
+        if (token) {
+          request = new Request(input, init);
+          headers = request.headers;
+          setHeaders(token.access_token);
+          this.console.trace(`Retrying ${method} ${request.url}`);
+          response = await fetch(request);
+        }
+      }
+    }
+
+    return response;
   }
 }

src/backend/Graph/store.d.ts

@@ -99,10 +99,14 @@ export interface Store extends Graph {
     'fx:customer_portal_settings': CustomerPortalSettings;
     /** POST here to resend the daily subscription webhook notification for this store. */
     'fx:process_subscription_webhook': ProcessSubscriptionWebhook;
-    /** Add-to-cart URL for the Standard plan with yearly billing. */
-    'fx:activate_store_yearly_url': { curie: 'fx:activate_store_yearly_url' };
-    /** Add-to-cart URL for the Standard plan with monthly billing. */
-    'fx:activate_store_monthly_url': { curie: 'fx:activate_store_monthly_url' };
+    /** Add-to-cart URL for the Starter plan with yearly billing. */
+    'fx:activate_store_starter_yearly_url': { curie: 'fx:activate_store_starter_yearly_url' };
+    /** Add-to-cart URL for the Starter plan with monthly billing. */
+    'fx:activate_store_starter_monthly_url': { curie: 'fx:activate_store_starter_monthly_url' };
+    /** Add-to-cart URL for the Growth plan with yearly billing. */
+    'fx:activate_store_growth_yearly_url': { curie: 'fx:activate_store_growth_yearly_url' };
+    /** Add-to-cart URL for the Growth plan with monthly billing. */
+    'fx:activate_store_growth_monthly_url': { curie: 'fx:activate_store_growth_monthly_url' };
     /** Add-to-cart URL for the Advanced plan with yearly billing. */
     'fx:activate_store_advanced_yearly_url': { curie: 'fx:activate_store_advanced_yearly_url' };
     /** Add-to-cart URL for the Advanced plan with monthly billing. */

src/backend/Graph/subscription.d.ts

@@ -55,6 +55,8 @@ export interface Subscription extends Graph {
     is_active: boolean;
     /** If this subscription is using a third party subscription system such as PayPal Express, their identifier will be set here. */
     third_party_id: string;
+    /** The type of payment method used for this subscription. Can be `null` if payment method info is unavailable via this API. */
+    payment_type: 'plastic' | 'paypal' | 'ach' | 'amazon' | null;
     /** The date this resource was created. */
     date_created: string | null;
     /** The date this resource was last modified. */

src/backend/Graph/webhook.d.ts

@@ -34,7 +34,7 @@ export interface Webhook extends Graph {
     /** The JSON webhooks are encrypted in certain situations. This key is also used to generate a signature to verify the integrity of the payload. 1000 characters or less. */
     encryption_key: string | null;
     /** The type of resource to observe changes on. */
-    event_resource: ('subscription' | 'transaction' | 'customer')[];
+    event_resource: 'subscription' | 'transaction' | 'transaction_log' | 'customer';
     /** If set to `0`, events will not be triggered for this webhook. This can also be set to `0` automatically if there are too many consecutive failed attempts to send a payload to this endpoint. */
     is_active: 0 | 1;
     /** The date this resource was created. */

src/customer/Graph/item.d.ts

@@ -1,4 +1,5 @@
 import type { Graph } from '../../core';
+import type { ItemOptions } from './item_options';
 
 export interface Item extends Graph {
   curie: 'fx:item';
@@ -62,4 +63,8 @@ export interface Item extends Graph {
     /** The date this resource was last modified. */
     date_modified: string | null;
   };
+
+  zooms: {
+    item_options?: ItemOptions;
+  };
 }

src/customer/Graph/item_option.d.ts

@@ -0,0 +1,31 @@
+import type { Graph } from '../../core';
+import type { Item } from './item';
+import type { Transaction } from './transaction';
+
+export interface ItemOption extends Graph {
+  curie: 'fx:item_option';
+
+  links: {
+    /** This resource. */
+    'self': ItemOption;
+    /** Item this option is attached to. */
+    'fx:item': Item;
+    /** Related transaction resource. */
+    'fx:transaction': Transaction;
+  };
+
+  props: {
+    /** The name of this item option. */
+    name: string;
+    /** The value of this item option. */
+    value: string;
+    /** The price modifier for this item option. The price of the item in the cart will be adjusted by this amount because of this item option. */
+    price_mod: number;
+    /** The weight modifier for this item option. The weight of the item in the cart will be adjusted by this amount because of this item option. */
+    weight_mod: number;
+    /** The date this resource was created. */
+    date_created: string | null;
+    /** The date this resource was last modified. */
+    date_modified: string | null;
+  };
+}

src/customer/Graph/item_options.d.ts

@@ -0,0 +1,10 @@
+import type { CollectionGraphLinks, CollectionGraphProps } from '../../core/defaults';
+import type { Graph } from '../../core';
+import type { ItemOption } from './item_option';
+
+export interface ItemOptions extends Graph {
+  curie: 'fx:item_options';
+  links: CollectionGraphLinks<ItemOptions>;
+  props: CollectionGraphProps;
+  child: ItemOption;
+}

src/customer/Graph/subscription.d.ts

@@ -46,6 +46,8 @@ export interface Subscription extends Graph {
     is_active: boolean;
     /** If this subscription is using a third party subscription system such as PayPal Express, their identifier will be set here. */
     third_party_id: string;
+    /** The type of payment method used for this subscription. Can be `null` if payment method info is unavailable via this API. */
+    payment_type: 'plastic' | 'paypal' | 'ach' | 'amazon' | null;
     /** The date this resource was created. */
     date_created: string | null;
     /** The date this resource was last modified. */

src/customer/Graph/transaction_template.d.ts

@@ -74,7 +74,7 @@ export interface TransactionTemplate extends Graph {
     /** If this cart has any shippable subscription items which will process in the future, this will be the total amount of shipping costs for those items. */
     total_future_shipping: string;
     /** Total order amount of this cart including all items, taxes, shipping costs and discounts. */
-    total_order: string;
+    total_order: number;
     /** The 3 character ISO code for the currency. */
     currency_code: string;
     /** The currency symbol, such as $, £, €, etc. */

src/customer/Rels.d.ts

@@ -1,11 +1,15 @@
 export * from './Graph/attribute';
 export * from './Graph/attributes';
+export * from './Graph/custom_field';
+export * from './Graph/custom_fields';
 export * from './Graph/customer_address';
 export * from './Graph/customer_addresses';
 export * from './Graph/customer_portal_settings';
 export * from './Graph/default_billing_address';
 export * from './Graph/default_payment_method';
 export * from './Graph/default_shipping_address';
+export * from './Graph/item_option';
+export * from './Graph/item_options';
 export * from './Graph/item';
 export * from './Graph/items';
 export * from './Graph/last_transaction';