@agnostack/next-shopify 1.6.0-alpha.36 → 1.6.0-alpha.37

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [1.6.0-alpha.37](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.36...v1.6.0-alpha.37) (2023-05-19)
+
+
+### Bug Fixes
+
+* add logging ([90f2f93](https://github.com/agnostack/next-shopify/commit/90f2f9319a2d7e59e756ea556fa6dc9526fa8ac1))
+
 # [1.6.0-alpha.36](https://github.com/agnostack/next-shopify/compare/v1.6.0-alpha.35...v1.6.0-alpha.36) (2023-05-19)
 
 

package/dist/utils/index.d.ts

@@ -3,4 +3,6 @@ export * from "./constants";
 export * from "./display";
 export * from "./errors";
 export * from "./firebase";
+export * from "./session";
 export * from "./shopify";
+export * from "./webhooks";

package/dist/utils/session.d.ts

@@ -0,0 +1,13 @@
+export function getSessionStorage(serverRuntimeConfig: any, _shop: any): {
+    store: (session: any) => Promise<boolean>;
+    load: (id: any) => Promise<any>;
+    delete: (id: any) => Promise<void>;
+    deleteMany: (ids: any) => Promise<void>;
+    find: (__shop: any) => Promise<any[]>;
+};
+export function getVerifiedSession({ req, res, shop, serverRuntimeConfig }: {
+    req: any;
+    res: any;
+    shop: any;
+    serverRuntimeConfig: any;
+}): Promise<any>;

package/dist/utils/session.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getVerifiedSession = exports.getSessionStorage = void 0;
+const shopify_api_1 = require("@shopify/shopify-api");
+const display_1 = require("./display");
+const shopify_1 = require("./shopify");
+const billing_1 = require("./billing");
+const errors_1 = require("./errors");
+const constants_1 = require("./constants");
+const firebase_1 = require("./firebase");
+const getSessionStorage = (serverRuntimeConfig, _shop) => {
+    const { FB_CONFIG, FB_ROOT_COLLECTION, APP_ID } = serverRuntimeConfig;
+    const shopify = shopify_1.getInitializedShopify(serverRuntimeConfig);
+    const data = { app: APP_ID, shop: shopify.utils.sanitizeShop(_shop) };
+    const sessionHandler = firebase_1.FirebaseSessionHandler.getInstance(FB_CONFIG, FB_ROOT_COLLECTION);
+    return {
+        store: async (session) => firebase_1.storeCallback(session, data, sessionHandler),
+        load: async (id) => firebase_1.loadCallback(id, data, sessionHandler),
+        delete: async (id) => firebase_1.deleteSessionsCallback(id, data, sessionHandler),
+        deleteMany: async (ids) => firebase_1.deleteSessionsCallback(ids, data, sessionHandler),
+        find: async (__shop) => firebase_1.findSessionsByShop(shopify.utils.sanitizeShop(__shop), data, sessionHandler),
+    };
+};
+exports.getSessionStorage = getSessionStorage;
+// TODO re-enable (check scopes and expiration)
+const isSessionActive = (session, config) => {
+    console.log('isSessionActive:', { session, config });
+    return true;
+    // // TODO check scopes
+    // const scopesUnchanged = true
+    // if (
+    //   scopesUnchanged &&
+    //   (!session.expires || session.expires >= new Date())
+    // ) {
+    //   return true
+    // }
+    // return false
+};
+const getVerifiedSession = async ({ req, res, shop, serverRuntimeConfig }) => {
+    try {
+        const shopify = shopify_1.getInitializedShopify(serverRuntimeConfig, shop);
+        const sessionStorage = exports.getSessionStorage(serverRuntimeConfig, shop);
+        if (sessionStorage) {
+            console.log('have sessionStorage');
+        }
+        else {
+            console.log('have NO sessionStorage');
+        }
+        const { PAYMENT_CONFIG } = serverRuntimeConfig !== null && serverRuntimeConfig !== void 0 ? serverRuntimeConfig : {};
+        const sessionId = await shopify.session.getCurrentId({
+            isOnline: true,
+            rawRequest: req,
+            rawResponse: res,
+        });
+        const session = await sessionStorage.load(sessionId);
+        if (!isSessionActive(session, shopify.config)) {
+            throw new errors_1.ShopifyAuthenticationError('Inactive session');
+        }
+        if (shop && (session === null || session === void 0 ? void 0 : session.shop) !== shop) {
+            throw new errors_1.ShopifyAuthenticationError('Invalid shop');
+        }
+        if (PAYMENT_CONFIG === null || PAYMENT_CONFIG === void 0 ? void 0 : PAYMENT_CONFIG.required) {
+            const billingManager = new billing_1.BillingManager(shopify, session, serverRuntimeConfig);
+            const confirmationUrl = await billingManager.ensureBilling();
+            console.log('confirmationUrl:', confirmationUrl);
+            if (display_1.stringNotEmpty(confirmationUrl)) {
+                throw new errors_1.ShopifyAuthenticationError('Invalid payment status', { redirectUrl: confirmationUrl });
+            }
+        }
+        else {
+            // NOTE making a test call to ensure a valid session for free apps
+            const client = new shopify.clients.Graphql({ session });
+            await client.query({ data: constants_1.SHOP_QUERY });
+        }
+        return session;
+    }
+    catch (error) {
+        if (error instanceof shopify_api_1.HttpResponseError &&
+            error.response.code === 401) {
+            throw new errors_1.ShopifyAuthenticationError('Not authenticated');
+        }
+        throw error;
+    }
+};
+exports.getVerifiedSession = getVerifiedSession;
+//# sourceMappingURL=session.js.map

package/dist/utils/session.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/utils/session.js"],"names":[],"mappings":"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"}

package/dist/utils/webhooks.d.ts

@@ -0,0 +1 @@
+export function addWebhookHandlers(serverRuntimeConfig: any, shopify: any): Promise<void>;

package/dist/utils/webhooks.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addWebhookHandlers = void 0;
+const shopify_api_1 = require("@shopify/shopify-api");
+const session_1 = require("./session");
+const handleWebhook = async (topic, shop, webhookRequestBody) => {
+    const sessionStorage = session_1.getSessionStorage(JSON.parse(webhookRequestBody), shop);
+    console.log('sessionStorage:', sessionStorage);
+    switch (topic) {
+        // TODO pull from constants
+        case 'APP_UNINSTALLED': {
+            const sessionsIds = await sessionStorage.find(shop);
+            if (sessionsIds.length) {
+                return sessionStorage.deleteMany(sessionsIds);
+            }
+            break;
+        }
+        default: {
+            return;
+        }
+    }
+};
+const addWebhookHandlers = async (serverRuntimeConfig, shopify) => {
+    const { APP_WEBHOOKS } = serverRuntimeConfig;
+    const handlers = Object.entries(APP_WEBHOOKS).reduce((__payload, [topic, webhooks]) => (Object.assign(Object.assign({}, __payload), { [topic]: webhooks.map((webhook) => {
+            console.log('webhook:', webhook);
+            return {
+                deliveryMethod: shopify_api_1.DeliveryMethod.Http,
+                callbackUrl: webhook.path,
+                callback: handleWebhook,
+            };
+        }) })), {});
+    console.log('handlers:', handlers);
+    await shopify.webhooks.addHandlers(handlers);
+    const bar = await shopify.webhooks.getHandlers('APP_UNINSTALLED');
+    console.log('shopify.webhooks.getHandlers1:', bar);
+};
+exports.addWebhookHandlers = addWebhookHandlers;
+//# sourceMappingURL=webhooks.js.map

package/dist/utils/webhooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["../../src/utils/webhooks.js"],"names":[],"mappings":";;;AAAA,sDAAqD;AAErD,uCAA6C;AAE7C,MAAM,aAAa,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,kBAAkB,EAAE,EAAE;IAC9D,MAAM,cAAc,GAAG,2BAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,CAAA;IAC9E,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAA;IAE9C,QAAQ,KAAK,EAAE;QACb,2BAA2B;QAC3B,KAAK,iBAAiB,CAAC,CAAC;YACtB,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACnD,IAAI,WAAW,CAAC,MAAM,EAAE;gBACtB,OAAO,cAAc,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;aAC9C;YACD,MAAK;SACN;QAED,OAAO,CAAC,CAAC;YACP,OAAM;SACP;KACF;AACH,CAAC,CAAA;AAEM,MAAM,kBAAkB,GAAG,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,EAAE;IACvE,MAAM,EAAE,YAAY,EAAE,GAAG,mBAAmB,CAAA;IAE5C,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAC,iCAClF,SAAS,KACZ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAA;YAChC,OAAO;gBACL,cAAc,EAAE,4BAAc,CAAC,IAAI;gBACnC,WAAW,EAAE,OAAO,CAAC,IAAI;gBACzB,QAAQ,EAAE,aAAa;aACxB,CAAA;QACH,CAAC,CAAC,IACF,EAAE,EAAE,CAAC,CAAA;IACP,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;IAElC,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;IAE5C,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAA;IACjE,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAA;AACpD,CAAC,CAAA;AApBY,QAAA,kBAAkB,sBAoB9B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agnostack/next-shopify",
-  "version": "1.6.0-alpha.36",
+  "version": "1.6.0-alpha.37",
   "author": "agnoStack Dev <developers@agnostack.com> (https://agnostack.com)",
   "owner": "agnoStack",
   "description": "Please contact agnoStack via info@agnostack.com for any questions",