@agnostack/next-shopify 2.0.14-alpha.6 → 2.0.14-alpha.8

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [2.0.14-alpha.8](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.7...v2.0.14-alpha.8) (2024-10-06)
+
+
+### Bug Fixes
+
+* protect route mods ([b01c4b3](https://github.com/agnostack/next-shopify/commit/b01c4b3327db6aee58fd1c49882aa493cdb4d823))
+
+## [2.0.14-alpha.7](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.6...v2.0.14-alpha.7) (2024-10-06)
+
+
+### Bug Fixes
+
+* debug ([428e094](https://github.com/agnostack/next-shopify/commit/428e094aacd8222a1910bf4d795eddc04a90d066))
+
 ## [2.0.14-alpha.6](https://github.com/agnostack/next-shopify/compare/v2.0.14-alpha.5...v2.0.14-alpha.6) (2024-10-06)
 
 

package/dist/lib/handlers/ssr/protect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAmBO;;;;;;;;;;;;;;GAsHN"}
+{"version":3,"file":"protect.d.ts","sourceRoot":"","sources":["../../../../src/lib/handlers/ssr/protect.js"],"names":[],"mappings":"AAqBO;;;;;;;;;;;;;;GAqKN"}

package/dist/lib/handlers/ssr/protect.js

@@ -1,4 +1,5 @@
 "use strict";
+// import chalk from 'chalk'
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,92 +9,82 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.protectRoute = void 0;
-const chalk_1 = __importDefault(require("chalk"));
 const utils_1 = require("../../utils");
 const shared_1 = require("../../../shared");
 const protectRoute = (serverRuntimeConfig, props) => {
-    const { PAGE_PATHS } = serverRuntimeConfig; // API_PATHS
+    const { PAGE_PATHS } = serverRuntimeConfig; // API_PATHS // PAYMENT_CONFIG
+    const prepareWebhookHandlers = (0, utils_1.getPrepareWebhookHandlers)(serverRuntimeConfig);
     return ({ req, res, query, locale, } = {}, data) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d;
-        const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
-        console.info(`>>> ~ protectRoute`, shop);
-        // const embedded = query?.embedded ?? req.query?.embedded
-        if ((0, shared_1.stringEmpty)(shop)) {
-            return {
-                redirect: {
-                    destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`,
-                    permanent: false,
-                },
-            };
-        }
-        // NOTE: this should handle running in next to test non-shopify functionality
-        const shouldBypassProtect = (0, utils_1.allowLocalBypass)(serverRuntimeConfig);
-        if (shouldBypassProtect) {
-            console.info(`${chalk_1.default.yellowBright('next-shopify')} - [${chalk_1.default.bold('protectRoute')}]: ${`Bypassing local protect - should ONLY happen when running in next to test non-shopify functionality!`}`);
-            return {
-                props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly),
-            };
-        }
-        // findSessionIds, loadSession, 
-        const { shopify, handleTokenExchange } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
-        if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
-            res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
-        }
-        const shopContext = (_c = data === null || data === void 0 ? void 0 : data.query) === null || _c === void 0 ? void 0 : _c.shop;
-        console.info(`>>> ~ shopContext`, shopContext);
-        const tokenContext = (_d = data === null || data === void 0 ? void 0 : data.query) === null || _d === void 0 ? void 0 : _d.id_token;
-        console.info(`>>> ~ tokenContext`, tokenContext);
-        // NOTE initial load
-        if ((0, shared_1.stringNotEmpty)(shopContext) && (0, shared_1.stringNotEmpty)(tokenContext)) {
-            const { session: offlineSession } = yield handleTokenExchange({ idToken: tokenContext });
-            console.info(`>>> ~ offlineSession`, offlineSession);
-            const { session: onlineSession } = yield handleTokenExchange({ idToken: tokenContext, isOnline: true });
-            console.info(`>>> ~ onlineSession`, onlineSession);
-        }
-        /*
-        const existingSessionIds = await findSessionIds(shop)
-        if (arrayEmpty(existingSessionIds)) {
-          // TODO: explore objectToQuerystring
-          const queryParams = new URLSearchParams({ ...query, shop }).toString()
-      
-          return {
-            redirect: {
-              destination: `${API_PATHS[API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
-              permanent: false,
-            },
-          }
-        }
-      
-        if (embedded !== '1') {
-          try {
-            // NOTE: this does not work if called INSIDE of embedded
-            await loadSession({ req, res })
-      
-            const destination = await shopify.auth.getEmbeddedAppUrl({
-              rawRequest: req,
-              rawResponse: res,
-            })
-    
-            return {
-              redirect: {
-                destination,
-                permanent: false,
-              },
+        try {
+            const shop = (_a = query === null || query === void 0 ? void 0 : query.shop) !== null && _a !== void 0 ? _a : (_b = req.query) === null || _b === void 0 ? void 0 : _b.shop;
+            // const embedded = query?.embedded ?? req.query?.embedded
+            const idToken = (_c = query === null || query === void 0 ? void 0 : query.id_token) !== null && _c !== void 0 ? _c : (_d = req.query) === null || _d === void 0 ? void 0 : _d.id_token;
+            if ((0, shared_1.stringEmpty)(shop)) {
+                return {
+                    redirect: {
+                        destination: `${PAGE_PATHS[shared_1.PAGE_ROUTE_NAMES.ERROR]}?code=no_shop_provided&type=protectRoute`,
+                        permanent: false,
+                    },
+                };
+            }
+            // // NOTE: this should handle running in next to test non-shopify functionality
+            // const shouldBypassProtect = allowLocalBypass(serverRuntimeConfig)
+            // if (shouldBypassProtect) {
+            //   console.info(`${chalk.yellowBright('next-shopify')} - [${chalk.bold('protectRoute')}]: ${
+            //     `Bypassing local protect - should ONLY happen when running in next to test non-shopify functionality!`
+            //   }`)
+            //   return {
+            //     props: cleanObject({
+            //       locale,
+            //       ...props,
+            //       ...data,
+            //     }, false, stringEmptyOnly),
+            //   }
+            // }
+            // findSessionIds, loadSession, 
+            const { shopify, loadAppData, encryptStoreSession, handleTokenExchange, } = yield (0, utils_1.getShopifyHelpers)(serverRuntimeConfig, { shop });
+            if (shopify === null || shopify === void 0 ? void 0 : shopify.config) {
+                res.setHeader('Content-Security-Policy', (0, utils_1.getSecurityHeader)(shop, shopify.config));
             }
-          } catch (error) {
-            if (error instanceof ShopifyAuthenticationError) {
+            // NOTE initial load
+            if ((0, shared_1.stringNotEmpty)(idToken)) {
+                const { session: _offlineSession } = yield handleTokenExchange({ idToken });
+                const offlineSession = _offlineSession.toObject();
+                console.info(`>>> ~ offlineSession`, offlineSession);
+                // const { session: onlineSession } = await handleTokenExchange({ idToken, isOnline: true })
+                // console.info(`>>> ~ onlineSession`, onlineSession)
+                yield encryptStoreSession(offlineSession);
+                let appId;
+                try {
+                    const { appInfo } = yield loadAppData();
+                    appId = (0, shared_1.normalizeShopifyId)(appInfo === null || appInfo === void 0 ? void 0 : appInfo.id).id;
+                    // eslint-disable-next-line no-empty
+                }
+                catch (_ignore) {
+                    console.info('Ignoring error loading appData', _ignore);
+                }
+                // Register webhooks
+                const webhookHandlers = prepareWebhookHandlers({ appId });
+                shopify.webhooks.addHandlers(webhookHandlers);
+                // NOTE: webhooks cannot use an online session to make API calls to Shopify (but not all webooks may be doing that for all apps)
+                yield shopify.webhooks.register({ session: offlineSession });
+                // if (PAYMENT_CONFIG?.required) {
+                //   // NOTE: handleEnsureBilling handles calling encryptStoreSession for offline session when shouldCheckBilling
+                //   const confirmationUrl = await handleEnsureBilling(session, reAuth)
+                //   if (stringNotEmpty(confirmationUrl)) {
+                //     redirectUrl = confirmationUrl
+                //   }
+                // }
+            }
+            /*
+            const existingSessionIds = await findSessionIds(shop)
+            if (arrayEmpty(existingSessionIds)) {
               // TODO: explore objectToQuerystring
-              const queryParams = new URLSearchParams({
-                ...query,
-                shop,
-                reAuth: (error instanceof ShopifySessionAuthenticationError),
-              }).toString()
-    
+              const queryParams = new URLSearchParams({ ...query, shop }).toString()
+          
               return {
                 redirect: {
                   destination: `${API_PATHS[API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
@@ -101,15 +92,57 @@ const protectRoute = (serverRuntimeConfig, props) => {
                 },
               }
             }
-            console.error('Error protecting route.', error)
+          
+            if (embedded !== '1') {
+              try {
+                // NOTE: this does not work if called INSIDE of embedded
+                await loadSession({ req, res })
+          
+                const destination = await shopify.auth.getEmbeddedAppUrl({
+                  rawRequest: req,
+                  rawResponse: res,
+                })
+      
+                return {
+                  redirect: {
+                    destination,
+                    permanent: false,
+                  },
+                }
+              } catch (error) {
+                if (error instanceof ShopifyAuthenticationError) {
+                  // TODO: explore objectToQuerystring
+                  const queryParams = new URLSearchParams({
+                    ...query,
+                    shop,
+                    reAuth: (error instanceof ShopifySessionAuthenticationError),
+                  }).toString()
       
-            throw error
-          }
+                  return {
+                    redirect: {
+                      destination: `${API_PATHS[API_ROUTE_NAMES.AUTH_ONLINE]}?${queryParams}`,
+                      permanent: false,
+                    },
+                  }
+                }
+                console.error('Error protecting route.', error)
+          
+                throw error
+              }
+            }
+              */
+            const foo = (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly);
+            return {
+                props: foo,
+            };
+        }
+        catch (error) {
+            console.error(`>>> ~ error`, error);
+            const foo = (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly);
+            return {
+                props: foo,
+            };
         }
-          */
-        return {
-            props: (0, shared_1.cleanObject)(Object.assign(Object.assign({ locale }, props), data), false, shared_1.stringEmptyOnly),
-        };
     });
 };
 exports.protectRoute = protectRoute;

package/dist/lib/handlers/ssr/protect.js.map

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

package/package.json

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