Update code to remove express sub-app, add middlewares

Author: mkevinosullivan

sample-apps/discounts-tutorial/web/gdpr.js

@@ -9,6 +9,7 @@ export default {
    */
   CUSTOMERS_DATA_REQUEST: {
     deliveryMethod: DeliveryMethod.Http,
+    callbackUrl: "/api/webhooks",
     callback: async (topic, shop, body) => {
       const payload = JSON.parse(body);
       // Payload has the following shape:
@@ -40,6 +41,7 @@ export default {
    */
   CUSTOMERS_REDACT: {
     deliveryMethod: DeliveryMethod.Http,
+    callbackUrl: "/api/webhooks",
     callback: async (topic, shop, body) => {
       const payload = JSON.parse(body);
       // Payload has the following shape:
@@ -68,6 +70,7 @@ export default {
    */
   SHOP_REDACT: {
     deliveryMethod: DeliveryMethod.Http,
+    callbackUrl: "/api/webhooks",
     callback: async (topic, shop, body) => {
       const payload = JSON.parse(body);
       // Payload has the following shape:

sample-apps/discounts-tutorial/web/index.js

@@ -142,8 +142,17 @@ const DELETE_CODE_MUTATION = `
 
 const app = express();
 
-// Connect the Shopify middleware to the app at '/api'
-app.use("/api", shopify.app({ webhookHandlers: GDPRWebhookHandlers }));
+// Set up Shopify authentication and webhook handling
+app.get(shopify.config.auth.path, shopify.auth.begin());
+app.get(
+  shopify.config.auth.callbackPath,
+  shopify.auth.callback(),
+  shopify.redirectToShopifyOrAppRoot()
+);
+app.post(
+  shopify.config.webhooks.path,
+  shopify.processWebhooks({ webhookHandlers: GDPRWebhookHandlers })
+);
 
 // All endpoints after this point will require an active session
 app.use("/api/*", shopify.validateAuthenticatedSession());

sample-apps/discounts-tutorial/web/package.json

@@ -12,7 +12,7 @@
     "node": ">=16.13.0"
   },
   "dependencies": {
-    "@shopify/shopify-app-express": "1.0.0-rc.6",
+    "@shopify/shopify-app-express": "1.0.0-rc.7",
     "@shopify/shopify-app-session-storage-sqlite": "^1.0.0-rc.0",
     "compression": "^1.7.4",
     "cross-env": "^7.0.3",

sample-apps/discounts-tutorial/web/shopify.js

@@ -11,6 +11,13 @@ const shopify = shopifyApp({
   api: {
     restResources,
   },
+  auth: {
+    path: "/api/auth",
+    callbackPath: "/api/auth/callback",
+  },
+  webhooks: {
+    path: "/api/webhooks",
+  },
   // This should be replaced with your preferred storage strategy
   sessionStorage: new SQLiteSessionStorage(DB_PATH),
 });