refactor(webhook): improve redirect handling in webhook deliverer and update test mocks

Author: Dobrunia

workers/email/tests/provider.test.ts

@@ -10,7 +10,7 @@ nodemailerMock.createTransport = jest.fn(() => ({
 
 jest.mock('nodemailer', () => nodemailerMock);
 
-import { DecodedGroupedEvent, ProjectDBScheme } from '@hawk.so/types';
+import { DecodedGroupedEvent, ProjectDBScheme, UserDBScheme } from '@hawk.so/types';
 import '../src/env';
 import EmailProvider from '../src/provider';
 import Templates from '../src/templates/names';
@@ -187,6 +187,11 @@ describe('EmailProvider', () => {
           password: '$argon2i$v=19$m=4096,t=3,p=1$QOo3u8uEor0t+nqCLpEW3g$aTCDEaHht9ro9VZDD1yZGpaTi+g1OWsfHbYd5TQBRPs',
           name: 'Hahahawk',
         },
+        assignee: {
+          _id: new ObjectId('5ec3ffe769c0030022f88f25'),
+          email: 'assignee@email.ru',
+          name: 'Assignee User',
+        } as UserDBScheme,
         project: {
           _id: new ObjectId('5d206f7f9aaf7c0071d64596'),
           token: 'project-token',

workers/webhook/package.json

@@ -6,6 +6,6 @@
   "license": "MIT",
   "workerType": "sender/webhook",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   }
 }

workers/webhook/src/deliverer.ts

@@ -84,7 +84,15 @@ export default class WebhookDeliverer {
 
           const status = res.statusCode || 0;
 
-          if (status >= HttpStatusCode.MultipleChoices && status <= HttpStatusCode.PermanentRedirect) {
+          const isRedirect = (
+            status === HttpStatusCode.MovedPermanently ||
+            status === HttpStatusCode.Found ||
+            status === HttpStatusCode.SeeOther ||
+            status === HttpStatusCode.TemporaryRedirect ||
+            status === HttpStatusCode.PermanentRedirect
+          ) && res.headers.location;
+
+          if (isRedirect) {
             this.logger.log('error', `Webhook blocked — redirect ${status} to ${res.headers.location} from ${endpoint}`);
             resolve();
 

workers/webhook/tests/provider.test.ts

@@ -18,7 +18,7 @@ const deliver = jest.fn();
 /**
  * Webhook Deliverer mock
  */
-jest.mock('./../src/deliverer.ts', () => {
+jest.mock('../src/deliverer', () => {
   return jest.fn().mockImplementation(() => {
     return {
       deliver: deliver,