made some changes to support Shopify Node API v5

Author: TheSecurityDev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-koa-shopify-auth",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "A better, simplified version of the (no longer supported) @Shopify/koa-shopify-auth middleware library. It removes the use of cookies for sessions (which greatly smooths the auth process), replaces a deprecated API call, and supports v2 of the official @shopify/shopify-api package.",
   "author": "TheSecurityDev",
   "license": "MIT",

src/create-shopify-auth.ts

@@ -48,7 +48,7 @@ export default function createShopifyAuth(options: OAuthBeginConfig) {
 
     if (path === inlineOAuthPath || (path === oAuthStartPath && shouldPerformInlineOAuth(ctx))) {
       // Auth started
-      if (!Shopify.Utils.validateShop(shop)) {
+      if (!validateShop(shop)) {
         // Invalid shop
         ctx.response.status = 400;
         ctx.response.body = shop ? "Invalid shop parameter" : "Missing shop parameter";
@@ -107,3 +107,8 @@ export default function createShopifyAuth(options: OAuthBeginConfig) {
     await next();
   };
 }
+
+export function validateShop(shop: string): boolean {
+  const shopUrlRegex = /^[a-zA-Z0-9][a-zA-Z0-9-]*\.myshopify\.(com|io)[/]*$/;
+  return shopUrlRegex.test(shop);
+}

src/index.ts

@@ -1,4 +1,4 @@
-import createShopifyAuth from "./create-shopify-auth";
+import createShopifyAuth, { validateShop } from "./create-shopify-auth";
 import verifyRequest from "./verify-request";
 
-export { createShopifyAuth, verifyRequest };
+export { createShopifyAuth, validateShop, verifyRequest };

src/verify-request.ts

@@ -63,7 +63,10 @@ export default function verifyRequest(options?: VerifyRequestOptions) {
           await next();
           return;
         } catch (err) {
-          if (err instanceof HttpResponseError && err.code == 401) {
+          if (
+            err instanceof HttpResponseError &&
+            (err.code === 401 || (err as any).response?.code === 401) // Shopify API v3 uses 'response.code' instead of 'code'
+          ) {
             // Session not valid, we will re-authorize
           } else {
             throw err;