@shopify/shopify-api 6.0.0-rc7 → 6.0.0-rc9

package/lib/session/session.js

@@ -1,7 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Session = void 0;
+var tslib_1 = require("tslib");
 var scopes_1 = require("../auth/scopes");
+var propertiesToSave = [
+    'id',
+    'shop',
+    'state',
+    'isOnline',
+    'scope',
+    'accessToken',
+    'expires',
+    'onlineAccessInfo',
+];
 /**
  * Stores App information from logged in merchants so they can make authenticated requests to the Admin API.
  */
@@ -9,6 +20,58 @@ var Session = /** @class */ (function () {
     function Session(params) {
         Object.assign(this, params);
     }
+    Session.fromPropertyArray = function (entries) {
+        var obj = Object.fromEntries(entries
+            .filter(function (_a) {
+            var _b = tslib_1.__read(_a, 2), _key = _b[0], value = _b[1];
+            return value !== null && value !== undefined;
+        })
+            // Sanitize keys
+            .map(function (_a) {
+            var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
+            switch (key.toLowerCase()) {
+                case 'isonline':
+                    return ['isOnline', value];
+                case 'accesstoken':
+                    return ['accessToken', value];
+                case 'onlineaccessinfo':
+                    return ['onlineAccessInfo', value];
+                default:
+                    return [key.toLowerCase(), value];
+            }
+        })
+            // Sanitize values
+            .map(function (_a) {
+            var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
+            switch (key) {
+                case 'isOnline':
+                    if (typeof value === 'string') {
+                        return [key, value.toString().toLowerCase() === 'true'];
+                    }
+                    else if (typeof value === 'number') {
+                        return [key, Boolean(value)];
+                    }
+                    return [key, value];
+                case 'scope':
+                    return [key, value.toString()];
+                case 'expires':
+                    return [key, value ? new Date(Number(value) * 1000) : undefined];
+                case 'onlineAccessInfo':
+                    return [
+                        key,
+                        {
+                            associated_user: {
+                                id: Number(value),
+                            },
+                        },
+                    ];
+                default:
+                    return [key, value];
+            }
+        }));
+        Object.setPrototypeOf(obj, Session.prototype);
+        return obj;
+    };
     Session.prototype.isActive = function (scopes) {
         var scopesObject = scopes instanceof scopes_1.AuthScopes ? scopes : new scopes_1.AuthScopes(scopes);
         var scopesUnchanged = scopesObject.equals(this.scope);
@@ -19,6 +82,75 @@ var Session = /** @class */ (function () {
         }
         return false;
     };
+    Session.prototype.toObject = function () {
+        var object = {
+            id: this.id,
+            shop: this.shop,
+            state: this.state,
+            isOnline: this.isOnline,
+        };
+        if (this.scope) {
+            object.scope = this.scope;
+        }
+        if (this.expires) {
+            object.expires = this.expires;
+        }
+        if (this.accessToken) {
+            object.accessToken = this.accessToken;
+        }
+        if (this.onlineAccessInfo) {
+            object.onlineAccessInfo = this.onlineAccessInfo;
+        }
+        return object;
+    };
+    Session.prototype.equals = function (other) {
+        if (!other)
+            return false;
+        var mandatoryPropsMatch = this.id === other.id &&
+            this.shop === other.shop &&
+            this.state === other.state &&
+            this.isOnline === other.isOnline;
+        if (!mandatoryPropsMatch)
+            return false;
+        var copyA = this.toPropertyArray();
+        copyA.sort(function (_a, _b) {
+            var _c = tslib_1.__read(_a, 1), k1 = _c[0];
+            var _d = tslib_1.__read(_b, 1), k2 = _d[0];
+            return (k1 < k2 ? -1 : 1);
+        });
+        var copyB = other.toPropertyArray();
+        copyB.sort(function (_a, _b) {
+            var _c = tslib_1.__read(_a, 1), k1 = _c[0];
+            var _d = tslib_1.__read(_b, 1), k2 = _d[0];
+            return (k1 < k2 ? -1 : 1);
+        });
+        return JSON.stringify(copyA) === JSON.stringify(copyB);
+    };
+    Session.prototype.toPropertyArray = function () {
+        return (Object.entries(this)
+            .filter(function (_a) {
+            var _b = tslib_1.__read(_a, 2), key = _b[0], value = _b[1];
+            return propertiesToSave.includes(key) &&
+                value !== undefined &&
+                value !== null;
+        })
+            // Prepare values for db storage
+            .map(function (_a) {
+            var _b;
+            var _c = tslib_1.__read(_a, 2), key = _c[0], value = _c[1];
+            switch (key) {
+                case 'expires':
+                    return [
+                        key,
+                        value ? Math.floor(value.getTime() / 1000) : undefined,
+                    ];
+                case 'onlineAccessInfo':
+                    return [key, (_b = value === null || value === void 0 ? void 0 : value.associated_user) === null || _b === void 0 ? void 0 : _b.id];
+                default:
+                    return [key, value];
+            }
+        }));
+    };
     return Session;
 }());
 exports.Session = Session;

package/lib/session/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["session.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAI1C;;GAEG;AACH;IAUE,iBAAY,MAAqB;QAC/B,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9B,CAAC;IAEM,0BAAQ,GAAf,UAAgB,MAAsC;QACpD,IAAM,YAAY,GAChB,MAAM,YAAY,mBAAU,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,mBAAU,CAAC,MAAM,CAAC,CAAC;QAEjE,IAAM,eAAe,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACxD,IACE,eAAe;YACf,IAAI,CAAC,WAAW;YAChB,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,IAAI,EAAE,CAAC,EAC7C;YACA,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IACH,cAAC;AAAD,CAAC,AA5BD,IA4BC;AA5BY,0BAAO"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["session.ts"],"names":[],"mappings":"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"}

package/lib/session/types.d.ts

@@ -1,10 +1,5 @@
-import { AuthScopes } from '../auth/scopes';
-import { AdapterArgs, NormalizedRequest } from '../../runtime/http';
+import { AdapterArgs } from '../../runtime/http';
 import { OnlineAccessInfo } from '../auth/oauth/types';
-import { createRestClientClass } from '../clients/rest/rest_client';
-import { createGraphqlClientClass } from '../clients/graphql/graphql_client';
-import { ClientType } from '../base-types';
-import type { shopifySession } from '.';
 export interface SessionParams {
     readonly id: string;
     shop: string;
@@ -15,9 +10,6 @@ export interface SessionParams {
     accessToken?: string;
     onlineAccessInfo?: OnlineAccessInfo;
 }
-export interface SessionInterface extends SessionParams {
-    isActive(scopes: AuthScopes | string | string[]): boolean;
-}
 export interface JwtPayload {
     iss: string;
     dest: string;
@@ -29,37 +21,7 @@ export interface JwtPayload {
     jti: string;
     sid: string;
 }
-export interface SessionGetCurrentParams extends AdapterArgs {
-    isOnline: boolean;
-}
-export interface SessionDeleteCurrentParams extends AdapterArgs {
-    isOnline: boolean;
-}
-export interface SessionGetOfflineParams {
-    shop: string;
-    includeExpired?: boolean;
-}
-export interface SessionDeleteOfflineParams {
-    shop: string;
-}
-export interface GetCurrentSessionIdParams {
-    request: NormalizedRequest;
-    isOnline: boolean;
-}
-export interface WithSessionParams extends AdapterArgs {
-    clientType: ClientType;
+export interface GetCurrentSessionIdParams extends AdapterArgs {
     isOnline: boolean;
 }
-interface WithSessionBaseResponse {
-    session: SessionInterface;
-}
-export interface RestWithSession extends WithSessionBaseResponse {
-    client: InstanceType<ReturnType<typeof createRestClientClass>>;
-}
-export interface GraphqlWithSession extends WithSessionBaseResponse {
-    client: InstanceType<ReturnType<typeof createGraphqlClientClass>>;
-}
-export declare type WithSessionResponse = RestWithSession | GraphqlWithSession;
-export declare type ShopifySession = ReturnType<typeof shopifySession>;
-export {};
 //# sourceMappingURL=types.d.ts.map

package/lib/session/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAC,WAAW,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAC,wBAAwB,EAAC,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,GAAG,CAAC;AAEtC,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACrD,QAAQ,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC;CAC3D;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,uBAAwB,SAAQ,WAAW;IAC1D,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,0BAA2B,SAAQ,WAAW;IAC7D,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,iBAAkB,SAAQ,WAAW;IACpD,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,UAAU,uBAAuB;IAC/B,OAAO,EAAE,gBAAgB,CAAC;CAC3B;AAED,MAAM,WAAW,eAAgB,SAAQ,uBAAuB;IAC9D,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,kBAAmB,SAAQ,uBAAuB;IACjE,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC;CACnE;AAED,oBAAY,mBAAmB,GAAG,eAAe,GAAG,kBAAkB,CAAC;AAEvE,oBAAY,cAAc,GAAG,UAAU,CAAC,OAAO,cAAc,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,WAAW,EAAC,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAC,gBAAgB,EAAC,MAAM,qBAAqB,CAAC;AAErD,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,yBAA0B,SAAQ,WAAW;IAC5D,QAAQ,EAAE,OAAO,CAAC;CACnB"}

package/lib/types.d.ts

@@ -1,6 +1,38 @@
-export * from '../rest/types';
-export * from './base-types';
-export * from './session/types';
-export * from './auth/types';
-export * from './webhooks/types';
+export declare enum LogSeverity {
+    Error = 0,
+    Warning = 1,
+    Info = 2,
+    Debug = 3
+}
+export declare enum ApiVersion {
+    January22 = "2022-01",
+    April22 = "2022-04",
+    July22 = "2022-07",
+    October22 = "2022-10",
+    Unstable = "unstable"
+}
+export declare const LATEST_API_VERSION = ApiVersion.October22;
+export declare enum ShopifyHeader {
+    AccessToken = "X-Shopify-Access-Token",
+    StorefrontAccessToken = "X-Shopify-Storefront-Access-Token",
+    Hmac = "X-Shopify-Hmac-Sha256",
+    Topic = "X-Shopify-Topic",
+    Domain = "X-Shopify-Shop-Domain"
+}
+export declare enum ClientType {
+    Rest = "rest",
+    Graphql = "graphql"
+}
+export declare const gdprTopics: string[];
+export declare enum BillingInterval {
+    OneTime = "ONE_TIME",
+    Every30Days = "EVERY_30_DAYS",
+    Annual = "ANNUAL"
+}
+export declare type RecurringBillingIntervals = Exclude<BillingInterval, BillingInterval.OneTime>;
+export declare enum BillingReplacementBehavior {
+    ApplyImmediately = "APPLY_IMMEDIATELY",
+    ApplyOnNextBillingCycle = "APPLY_ON_NEXT_BILLING_CYCLE",
+    Standard = "STANDARD"
+}
 //# sourceMappingURL=types.d.ts.map

package/lib/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAE9B,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,oBAAY,WAAW;IACrB,KAAK,IAAA;IACL,OAAO,IAAA;IACP,IAAI,IAAA;IACJ,KAAK,IAAA;CACN;AAED,oBAAY,UAAU;IACpB,SAAS,YAAY;IACrB,OAAO,YAAY;IACnB,MAAM,YAAY;IAClB,SAAS,YAAY;IACrB,QAAQ,aAAa;CACtB;AAED,eAAO,MAAM,kBAAkB,uBAAuB,CAAC;AAEvD,oBAAY,aAAa;IACvB,WAAW,2BAA2B;IACtC,qBAAqB,sCAAsC;IAC3D,IAAI,0BAA0B;IAC9B,KAAK,oBAAoB;IACzB,MAAM,0BAA0B;CACjC;AAED,oBAAY,UAAU;IACpB,IAAI,SAAS;IACb,OAAO,YAAY;CACpB;AAED,eAAO,MAAM,UAAU,EAAE,MAAM,EAI9B,CAAC;AAEF,oBAAY,eAAe;IACzB,OAAO,aAAa;IACpB,WAAW,kBAAkB;IAC7B,MAAM,WAAW;CAClB;AAED,oBAAY,yBAAyB,GAAG,OAAO,CAC7C,eAAe,EACf,eAAe,CAAC,OAAO,CACxB,CAAC;AAEF,oBAAY,0BAA0B;IACpC,gBAAgB,sBAAsB;IACtC,uBAAuB,gCAAgC;IACvD,QAAQ,aAAa;CACtB"}

package/lib/types.js

@@ -1,9 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-tslib_1.__exportStar(require("../rest/types"), exports);
-tslib_1.__exportStar(require("./base-types"), exports);
-tslib_1.__exportStar(require("./session/types"), exports);
-tslib_1.__exportStar(require("./auth/types"), exports);
-tslib_1.__exportStar(require("./webhooks/types"), exports);
+exports.BillingReplacementBehavior = exports.BillingInterval = exports.gdprTopics = exports.ClientType = exports.ShopifyHeader = exports.LATEST_API_VERSION = exports.ApiVersion = exports.LogSeverity = void 0;
+var LogSeverity;
+(function (LogSeverity) {
+    LogSeverity[LogSeverity["Error"] = 0] = "Error";
+    LogSeverity[LogSeverity["Warning"] = 1] = "Warning";
+    LogSeverity[LogSeverity["Info"] = 2] = "Info";
+    LogSeverity[LogSeverity["Debug"] = 3] = "Debug";
+})(LogSeverity = exports.LogSeverity || (exports.LogSeverity = {}));
+var ApiVersion;
+(function (ApiVersion) {
+    ApiVersion["January22"] = "2022-01";
+    ApiVersion["April22"] = "2022-04";
+    ApiVersion["July22"] = "2022-07";
+    ApiVersion["October22"] = "2022-10";
+    ApiVersion["Unstable"] = "unstable";
+})(ApiVersion = exports.ApiVersion || (exports.ApiVersion = {}));
+exports.LATEST_API_VERSION = ApiVersion.October22;
+var ShopifyHeader;
+(function (ShopifyHeader) {
+    ShopifyHeader["AccessToken"] = "X-Shopify-Access-Token";
+    ShopifyHeader["StorefrontAccessToken"] = "X-Shopify-Storefront-Access-Token";
+    ShopifyHeader["Hmac"] = "X-Shopify-Hmac-Sha256";
+    ShopifyHeader["Topic"] = "X-Shopify-Topic";
+    ShopifyHeader["Domain"] = "X-Shopify-Shop-Domain";
+})(ShopifyHeader = exports.ShopifyHeader || (exports.ShopifyHeader = {}));
+var ClientType;
+(function (ClientType) {
+    ClientType["Rest"] = "rest";
+    ClientType["Graphql"] = "graphql";
+})(ClientType = exports.ClientType || (exports.ClientType = {}));
+exports.gdprTopics = [
+    'CUSTOMERS_DATA_REQUEST',
+    'CUSTOMERS_REDACT',
+    'SHOP_REDACT',
+];
+var BillingInterval;
+(function (BillingInterval) {
+    BillingInterval["OneTime"] = "ONE_TIME";
+    BillingInterval["Every30Days"] = "EVERY_30_DAYS";
+    BillingInterval["Annual"] = "ANNUAL";
+})(BillingInterval = exports.BillingInterval || (exports.BillingInterval = {}));
+var BillingReplacementBehavior;
+(function (BillingReplacementBehavior) {
+    BillingReplacementBehavior["ApplyImmediately"] = "APPLY_IMMEDIATELY";
+    BillingReplacementBehavior["ApplyOnNextBillingCycle"] = "APPLY_ON_NEXT_BILLING_CYCLE";
+    BillingReplacementBehavior["Standard"] = "STANDARD";
+})(BillingReplacementBehavior = exports.BillingReplacementBehavior || (exports.BillingReplacementBehavior = {}));
 //# sourceMappingURL=types.js.map

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":";;;AAAA,wDAA8B;AAE9B,uDAA6B;AAC7B,0DAAgC;AAChC,uDAA6B;AAC7B,2DAAiC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":";;;AAAA,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,+CAAK,CAAA;IACL,mDAAO,CAAA;IACP,6CAAI,CAAA;IACJ,+CAAK,CAAA;AACP,CAAC,EALW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAKtB;AAED,IAAY,UAMX;AAND,WAAY,UAAU;IACpB,mCAAqB,CAAA;IACrB,iCAAmB,CAAA;IACnB,gCAAkB,CAAA;IAClB,mCAAqB,CAAA;IACrB,mCAAqB,CAAA;AACvB,CAAC,EANW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAMrB;AAEY,QAAA,kBAAkB,GAAG,UAAU,CAAC,SAAS,CAAC;AAEvD,IAAY,aAMX;AAND,WAAY,aAAa;IACvB,uDAAsC,CAAA;IACtC,4EAA2D,CAAA;IAC3D,+CAA8B,CAAA;IAC9B,0CAAyB,CAAA;IACzB,iDAAgC,CAAA;AAClC,CAAC,EANW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAMxB;AAED,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,2BAAa,CAAA;IACb,iCAAmB,CAAA;AACrB,CAAC,EAHW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAGrB;AAEY,QAAA,UAAU,GAAa;IAClC,wBAAwB;IACxB,kBAAkB;IAClB,aAAa;CACd,CAAC;AAEF,IAAY,eAIX;AAJD,WAAY,eAAe;IACzB,uCAAoB,CAAA;IACpB,gDAA6B,CAAA;IAC7B,oCAAiB,CAAA;AACnB,CAAC,EAJW,eAAe,GAAf,uBAAe,KAAf,uBAAe,QAI1B;AAOD,IAAY,0BAIX;AAJD,WAAY,0BAA0B;IACpC,oEAAsC,CAAA;IACtC,qFAAuD,CAAA;IACvD,mDAAqB,CAAA;AACvB,CAAC,EAJW,0BAA0B,GAA1B,kCAA0B,KAA1B,kCAA0B,QAIrC"}

package/lib/utils/index.d.ts

@@ -3,6 +3,7 @@ export declare function shopifyUtils(config: ConfigInterface): {
     sanitizeShop: (shop: string, throwOnInvalid?: boolean) => string | null;
     sanitizeHost: (host: string, throwOnInvalid?: boolean) => string | null;
     validateHmac: (query: import("..").AuthQuery) => Promise<boolean>;
-    versionCompatible: (referenceVersion: import("../base-types").ApiVersion, currentVersion?: import("../base-types").ApiVersion) => boolean;
+    versionCompatible: (referenceVersion: import("..").ApiVersion, currentVersion?: import("..").ApiVersion) => boolean;
 };
+export declare type ShopifyUtils = ReturnType<typeof shopifyUtils>;
 //# sourceMappingURL=index.d.ts.map

package/lib/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAM9C,wBAAgB,YAAY,CAAC,MAAM,EAAE,eAAe;;;;;EAOnD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAM9C,wBAAgB,YAAY,CAAC,MAAM,EAAE,eAAe;;;;;EAOnD;AAED,oBAAY,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC"}

package/lib/utils/version-compatible.d.ts

@@ -1,3 +1,4 @@
-import { ApiVersion, ConfigInterface } from '../base-types';
+import { ConfigInterface } from '../base-types';
+import { ApiVersion } from '../types';
 export declare function createVersionCompatible(config: ConfigInterface): (referenceVersion: ApiVersion, currentVersion?: ApiVersion) => boolean;
 //# sourceMappingURL=version-compatible.d.ts.map

package/lib/utils/version-compatible.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-compatible.d.ts","sourceRoot":"","sources":["version-compatible.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,eAAe,EAAC,MAAM,eAAe,CAAC;AAE1D,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,sBAEzC,UAAU,mBACZ,UAAU,KACzB,OAAO,CAWX"}
+{"version":3,"file":"version-compatible.d.ts","sourceRoot":"","sources":["version-compatible.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,UAAU,CAAC;AAEpC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,eAAe,sBAEzC,UAAU,mBACZ,UAAU,KACzB,OAAO,CAWX"}

package/lib/utils/version-compatible.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createVersionCompatible = void 0;
-var base_types_1 = require("../base-types");
+var types_1 = require("../types");
 function createVersionCompatible(config) {
     return function (referenceVersion, currentVersion) {
         if (currentVersion === void 0) { currentVersion = config.apiVersion; }
         // Return true if not using a dated version
-        if (currentVersion === base_types_1.ApiVersion.Unstable) {
+        if (currentVersion === types_1.ApiVersion.Unstable) {
             return true;
         }
         var numericVersion = function (version) {

package/lib/utils/version-compatible.js.map

@@ -1 +1 @@
-{"version":3,"file":"version-compatible.js","sourceRoot":"","sources":["version-compatible.ts"],"names":[],"mappings":";;;AAAA,4CAA0D;AAE1D,SAAgB,uBAAuB,CAAC,MAAuB;IAC7D,OAAO,UACL,gBAA4B,EAC5B,cAA8C;QAA9C,+BAAA,EAAA,iBAA6B,MAAM,CAAC,UAAU;QAE9C,2CAA2C;QAC3C,IAAI,cAAc,KAAK,uBAAU,CAAC,QAAQ,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QACD,IAAM,cAAc,GAAG,UAAC,OAAe;YACrC,OAAA,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAAtC,CAAsC,CAAC;QACzC,IAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAM,SAAS,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACnD,OAAO,OAAO,IAAI,SAAS,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAfD,0DAeC"}
+{"version":3,"file":"version-compatible.js","sourceRoot":"","sources":["version-compatible.ts"],"names":[],"mappings":";;;AACA,kCAAoC;AAEpC,SAAgB,uBAAuB,CAAC,MAAuB;IAC7D,OAAO,UACL,gBAA4B,EAC5B,cAA8C;QAA9C,+BAAA,EAAA,iBAA6B,MAAM,CAAC,UAAU;QAE9C,2CAA2C;QAC3C,IAAI,cAAc,KAAK,kBAAU,CAAC,QAAQ,EAAE;YAC1C,OAAO,IAAI,CAAC;SACb;QACD,IAAM,cAAc,GAAG,UAAC,OAAe;YACrC,OAAA,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAAtC,CAAsC,CAAC;QACzC,IAAM,OAAO,GAAG,cAAc,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAM,SAAS,GAAG,cAAc,CAAC,gBAAgB,CAAC,CAAC;QACnD,OAAO,OAAO,IAAI,SAAS,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAfD,0DAeC"}

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-export declare const SHOPIFY_API_LIBRARY_VERSION = "6.0.0-rc7";
+export declare const SHOPIFY_API_LIBRARY_VERSION = "6.0.0-rc9";
 //# sourceMappingURL=version.d.ts.map

package/lib/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SHOPIFY_API_LIBRARY_VERSION = void 0;
-exports.SHOPIFY_API_LIBRARY_VERSION = '6.0.0-rc7';
+exports.SHOPIFY_API_LIBRARY_VERSION = '6.0.0-rc9';
 //# sourceMappingURL=version.js.map

package/lib/webhooks/index.d.ts

@@ -1,9 +1,10 @@
 import { ConfigInterface } from '../base-types';
 export declare function shopifyWebhooks(config: ConfigInterface): {
-    addHandlers: (handlersToAdd: import("./types").AddHandlersParams) => void;
+    addHandlers: (handlersToAdd: import("./types").AddHandlersParams) => Promise<void>;
     getTopicsAdded: () => string[];
     getHandlers: (topic: string) => import("./types").WebhookHandler[];
-    register: ({ accessToken, shop, }: import("./types").RegisterParams) => Promise<import("./types").RegisterReturn>;
+    register: ({ session, }: import("./types").RegisterParams) => Promise<import("./types").RegisterReturn>;
     process: ({ rawBody, ...adapterArgs }: import("./types").WebhookProcessParams) => Promise<any>;
 };
+export declare type ShopifyWebhooks = ReturnType<typeof shopifyWebhooks>;
 //# sourceMappingURL=index.d.ts.map

package/lib/webhooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAW9C,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe;;;;;;EAUtD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAW9C,wBAAgB,eAAe,CAAC,MAAM,EAAE,eAAe;;;;;;EAUtD;AAED,oBAAY,eAAe,GAAG,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC"}

package/lib/webhooks/process.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["process.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAMhB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAC,eAAe,EAAgB,MAAM,eAAe,CAAC;AAI7D,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAiB,MAAM,SAAS,CAAC;AAG9E,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,eAAe,EAAE,eAAe,iCAK7B,oBAAoB,KAAG,QAAQ,eAAe,CAAC,CA6DnD"}
+{"version":3,"file":"process.d.ts","sourceRoot":"","sources":["process.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,eAAe,EAMhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAK9C,OAAO,EAAC,eAAe,EAAE,oBAAoB,EAAiB,MAAM,SAAS,CAAC;AAG9E,wBAAgB,aAAa,CAC3B,MAAM,EAAE,eAAe,EACvB,eAAe,EAAE,eAAe,iCAK7B,oBAAoB,KAAG,QAAQ,eAAe,CAAC,CA4EnD"}

package/lib/webhooks/process.js

@@ -7,16 +7,17 @@ var network_1 = require("@shopify/network");
 var http_1 = require("../../runtime/http");
 var crypto_1 = require("../../runtime/crypto");
 var types_1 = require("../../runtime/crypto/types");
-var base_types_1 = require("../base-types");
+var types_2 = require("../types");
 var safe_compare_1 = require("../auth/oauth/safe-compare");
 var ShopifyErrors = tslib_1.__importStar(require("../error"));
-var types_2 = require("./types");
+var logger_1 = require("../logger");
+var types_3 = require("./types");
 var registry_1 = require("./registry");
 function createProcess(config, webhookRegistry) {
     return function process(_a) {
         var rawBody = _a.rawBody, adapterArgs = tslib_1.__rest(_a, ["rawBody"]);
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, graphqlTopic, handlers, found, handlers_1, handlers_1_1, handler, error_1, e_1_1, returnResponse;
+            var request, response, webhookCheck, webhookOk, hmac, topic, domain, errorMessage, log, graphqlTopic, handlers, found, handlers_1, handlers_1_1, handler, error_1, e_1_1, returnResponse;
             var e_1, _b;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
@@ -31,10 +32,14 @@ function createProcess(config, webhookRegistry) {
                         webhookCheck = checkWebhookRequest(rawBody, request.headers);
                         webhookOk = webhookCheck.webhookOk, hmac = webhookCheck.hmac, topic = webhookCheck.topic, domain = webhookCheck.domain;
                         errorMessage = webhookCheck.errorMessage;
+                        log = (0, logger_1.logger)(config);
+                        log.info('Processing webhook request', { topic: topic, domain: domain });
                         if (!webhookOk) return [3 /*break*/, 15];
+                        log.debug('Webhook request is well formed', { topic: topic, domain: domain });
                         return [4 /*yield*/, validateOkWebhook(config.apiSecretKey, rawBody, hmac)];
                     case 2:
                         if (!_c.sent()) return [3 /*break*/, 13];
+                        log.debug('Webhook request is valid', { topic: topic, domain: domain });
                         graphqlTopic = (0, registry_1.topicForStorage)(topic);
                         handlers = webhookRegistry[graphqlTopic] || [];
                         found = false;
@@ -46,11 +51,12 @@ function createProcess(config, webhookRegistry) {
                     case 4:
                         if (!!handlers_1_1.done) return [3 /*break*/, 9];
                         handler = handlers_1_1.value;
-                        if (handler.deliveryMethod !== types_2.DeliveryMethod.Http ||
+                        if (handler.deliveryMethod !== types_3.DeliveryMethod.Http ||
                             handler.callbackUrl !== request.url) {
                             return [3 /*break*/, 8];
                         }
                         found = true;
+                        log.debug('Found HTTP handler, triggering it', { topic: topic, domain: domain });
                         _c.label = 5;
                     case 5:
                         _c.trys.push([5, 7, , 8]);
@@ -80,16 +86,19 @@ function createProcess(config, webhookRegistry) {
                         return [7 /*endfinally*/];
                     case 12:
                         if (!found) {
+                            log.debug('No HTTP handlers found', { topic: topic, domain: domain });
                             response.statusCode = network_1.StatusCode.NotFound;
                             errorMessage = "No HTTP webhooks registered for topic ".concat(topic);
                         }
                         return [3 /*break*/, 14];
                     case 13:
+                        log.debug('Webhook validation failed', { topic: topic, domain: domain });
                         response.statusCode = network_1.StatusCode.Unauthorized;
                         errorMessage = "Could not validate request for topic ".concat(topic);
                         _c.label = 14;
                     case 14: return [3 /*break*/, 16];
                     case 15:
+                        log.debug('Webhook request is malformed', { topic: topic, domain: domain });
                         response.statusCode = network_1.StatusCode.BadRequest;
                         _c.label = 16;
                     case 16:
@@ -126,18 +135,18 @@ function checkWebhookRequest(rawBody, headers) {
         domain: '',
     };
     if (rawBody.length) {
-        var hmac = (0, http_1.getHeader)(headers, base_types_1.ShopifyHeader.Hmac);
-        var topic = (0, http_1.getHeader)(headers, base_types_1.ShopifyHeader.Topic);
-        var domain = (0, http_1.getHeader)(headers, base_types_1.ShopifyHeader.Domain);
+        var hmac = (0, http_1.getHeader)(headers, types_2.ShopifyHeader.Hmac);
+        var topic = (0, http_1.getHeader)(headers, types_2.ShopifyHeader.Topic);
+        var domain = (0, http_1.getHeader)(headers, types_2.ShopifyHeader.Domain);
         var missingHeaders = [];
         if (!hmac) {
-            missingHeaders.push(base_types_1.ShopifyHeader.Hmac);
+            missingHeaders.push(types_2.ShopifyHeader.Hmac);
         }
         if (!topic) {
-            missingHeaders.push(base_types_1.ShopifyHeader.Topic);
+            missingHeaders.push(types_2.ShopifyHeader.Topic);
         }
         if (!domain) {
-            missingHeaders.push(base_types_1.ShopifyHeader.Domain);
+            missingHeaders.push(types_2.ShopifyHeader.Domain);
         }
         if (missingHeaders.length) {
             retVal.webhookOk = false;

package/lib/webhooks/process.js.map

@@ -1 +1 @@
-{"version":3,"file":"process.js","sourceRoot":"","sources":["process.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"process.js","sourceRoot":"","sources":["process.ts"],"names":[],"mappings":"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"}

package/lib/webhooks/register.d.ts

@@ -1,6 +1,6 @@
 import { ConfigInterface } from '../base-types';
-import { WebhookRegistry, RegisterParams, RegisterReturn } from './types';
-export declare function createRegister(config: ConfigInterface, webhookRegistry: WebhookRegistry): ({ accessToken, shop, }: RegisterParams) => Promise<RegisterReturn>;
+import { WebhookRegistry, RegisterReturn, RegisterParams } from './types';
+export declare function createRegister(config: ConfigInterface, webhookRegistry: WebhookRegistry): ({ session, }: RegisterParams) => Promise<RegisterReturn>;
 export declare const TEMPLATE_GET_HANDLERS = "{\n  webhookSubscriptions(\n    first: 250,\n    after: {{END_CURSOR}},\n  ) {\n    edges {\n      node {\n        id\n        topic\n        includeFields\n        metafieldNamespaces\n        privateMetafieldNamespaces\n        endpoint {\n          __typename\n          ... on WebhookHttpEndpoint {\n            callbackUrl\n          }\n          ... on WebhookEventBridgeEndpoint {\n            arn\n          }\n          ... on WebhookPubSubEndpoint {\n            pubSubProject\n            pubSubTopic\n          }\n        }\n      }\n    }\n    pageInfo {\n      endCursor\n      hasNextPage\n    }\n  }\n}";
 export declare const TEMPLATE_MUTATION = "\n  mutation webhookSubscription {\n    {{MUTATION_NAME}}(\n      {{IDENTIFIER}},\n      {{MUTATION_PARAMS}}\n    ) {\n      userErrors {\n        field\n        message\n      }\n    }\n  }\n";
 //# sourceMappingURL=register.d.ts.map

package/lib/webhooks/register.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["register.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAa,MAAM,eAAe,CAAC;AAQ1D,OAAO,EACL,eAAe,EACf,cAAc,EACd,cAAc,EAOf,MAAM,SAAS,CAAC;AA2BjB,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,eAAe,EAAE,eAAe,4BAK7B,cAAc,KAAG,QAAQ,cAAc,CAAC,CAoC5C;AA+XD,eAAO,MAAM,qBAAqB,+mBAgChC,CAAC;AAEH,eAAO,MAAM,iBAAiB,qMAY7B,CAAC"}
+{"version":3,"file":"register.d.ts","sourceRoot":"","sources":["register.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,eAAe,EAAC,MAAM,eAAe,CAAC;AAS9C,OAAO,EACL,eAAe,EACf,cAAc,EAOd,cAAc,EACf,MAAM,SAAS,CAAC;AA0BjB,wBAAgB,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,eAAe,EAAE,eAAe,kBAI7B,cAAc,KAAG,QAAQ,cAAc,CAAC,CA4D5C;AA+XD,eAAO,MAAM,qBAAqB,+mBAgChC,CAAC;AAEH,eAAO,MAAM,iBAAiB,qMAY7B,CAAC"}