All tests passing

ingenierias-lentas · Sep 22, 2024 · bfdd955 · bfdd955
1 parent be676c9
commit bfdd955
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 1 deletion.
diff --git a/src/__tests__/integration/oauth.test.ts b/src/__tests__/integration/oauth.test.ts
@@ -1,4 +1,5 @@
 import Koa from 'koa';
+import bodyParser from '@koa/bodyparser';
 import Router from '@koa/router';
 import request from 'supertest';
 import jwt from 'jsonwebtoken';
@@ -119,6 +120,15 @@ describe('OAuth integration tests', () => {
       router.get('/installed', shopify.ensureInstalledOnShop(), installedMock);
       router.get('/authed', shopify.validateAuthenticatedSession(), authedMock);
 
+      app.use(bodyParser({
+        enableTypes: ['json', 'text'], // Enable both JSON and text parsing
+        encoding: 'utf-8',
+        jsonLimit: '1mb', // Adjust the limit as needed
+        textLimit: '1mb',
+        extendTypes: {
+          text: ['text/plain'], // Only treat text/plain as text
+        },
+      }));
       app.use(router.routes()).use(router.allowedMethods());
 
       const callbackInfo = await beginOAuth(app, shopify, config);
@@ -370,6 +380,7 @@ async function webhookProcessRequest(
 ) {
   await request(app.callback())
     .post('/test/webhooks')
+    .set('Content-Type', 'application/json') // Ensure this header is set
     .set(validWebhookHeaders(topic, body, shopify.api.config.apiSecretKey))
     .send(body)
     .expect(200);

diff --git a/src/__tests__/integration/webhooks.test.ts b/src/__tests__/integration/webhooks.test.ts
@@ -1,4 +1,5 @@
 import Koa from 'koa';
+import bodyParser from '@koa/bodyparser';
 import Router from '@koa/router';
 import request from 'supertest';
 import {LATEST_API_VERSION, LogSeverity} from '@shopify/shopify-api';
@@ -71,6 +72,15 @@ describe('webhook integration', () => {
             ...shopify.processWebhooks({webhookHandlers: {APP_UNINSTALLED: config.handler}})
           );
 
+          app.use(bodyParser({
+            enableTypes: ['json', 'text'], // Enable both JSON and text parsing
+            encoding: 'utf-8',
+            jsonLimit: '1mb', // Adjust the limit as needed
+            textLimit: '1mb',
+            extendTypes: {
+              text: ['text/plain'], // Only treat text/plain as text
+            },
+          }));
           app.use(router.routes()).use(router.allowedMethods());
         });
 
@@ -194,6 +204,7 @@ async function triggerWebhook(app: Koa) {
 
   await request(app.callback())
     .post('/test/webhooks')
+    .set('Content-Type', 'application/json') // Ensure this header is set
     .set(
       validWebhookHeaders(
         'APP_UNINSTALLED',

diff --git a/src/webhooks/process.ts b/src/webhooks/process.ts
@@ -6,8 +6,10 @@ export async function process({
   config,
 }: WebhookProcessParams): Promise<void> {
   try {
+    const isJson = ctx.request.is('application/json');
+    const rawBody = isJson ? JSON.stringify(ctx.request.body) : ctx.request.body;
     await api.webhooks.process({
-      rawBody: ctx.request.body,
+      rawBody: rawBody,
       rawRequest: ctx.req, // Koa's raw Node.js request object
       rawResponse: ctx.res, // Koa's raw Node.js response object
     });