From 5dfa38ca99bca4c40a7d97445b3eb3cb446261b7 Mon Sep 17 00:00:00 2001 From: Faruk AYDIN Date: Thu, 28 Dec 2023 13:11:00 +0100 Subject: [PATCH] feat: Convert ts files to js files for controllers --- .../controllers/paddle/{webhooks.ee.ts => webhooks.ee.js} | 8 +++----- ...value.ts => handler-by-connection-id-and-ref-value.js} | 6 ++---- .../{handler-by-flow-id.ts => handler-by-flow-id.js} | 5 +---- 3 files changed, 6 insertions(+), 13 deletions(-) rename packages/backend/src/controllers/paddle/{webhooks.ee.ts => webhooks.ee.js} (84%) rename packages/backend/src/controllers/webhooks/{handler-by-connection-id-and-ref-value.ts => handler-by-connection-id-and-ref-value.js} (83%) rename packages/backend/src/controllers/webhooks/{handler-by-flow-id.ts => handler-by-flow-id.js} (85%) diff --git a/packages/backend/src/controllers/paddle/webhooks.ee.ts b/packages/backend/src/controllers/paddle/webhooks.ee.js similarity index 84% rename from packages/backend/src/controllers/paddle/webhooks.ee.ts rename to packages/backend/src/controllers/paddle/webhooks.ee.js index bd8ebb2d..62c27d23 100644 --- a/packages/backend/src/controllers/paddle/webhooks.ee.ts +++ b/packages/backend/src/controllers/paddle/webhooks.ee.js @@ -1,11 +1,9 @@ -import { Response } from 'express'; -import { IJSONObject, IRequest } from '@automatisch/types'; import crypto from 'crypto'; import { serialize } from 'php-serialize'; import Billing from '../../helpers/billing/index.ee'; import appConfig from '../../config/app'; -export default async (request: IRequest, response: Response) => { +export default async (request, response) => { if (!verifyWebhook(request)) { return response.sendStatus(401); } @@ -23,14 +21,14 @@ export default async (request: IRequest, response: Response) => { return response.sendStatus(200); }; -const verifyWebhook = (request: IRequest) => { +const verifyWebhook = (request) => { const signature = request.body.p_signature; const keys = Object.keys(request.body) .filter((key) => key !== 'p_signature') .sort(); - const sorted: IJSONObject = {}; + const sorted = {}; keys.forEach((key) => { sorted[key] = request.body[key]; }); diff --git a/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.ts b/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js similarity index 83% rename from packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.ts rename to packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js index 4a98b38d..3e21bb03 100644 --- a/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.ts +++ b/packages/backend/src/controllers/webhooks/handler-by-connection-id-and-ref-value.js @@ -1,12 +1,10 @@ import path from 'node:path'; -import { Response } from 'express'; -import { IRequest } from '@automatisch/types'; import Connection from '../../models/connection'; import logger from '../../helpers/logger'; import handler from '../../helpers/webhook-handler'; -export default async (request: IRequest, response: Response) => { +export default async (request, response) => { const computedRequestPayload = { headers: request.headers, body: request.body, @@ -22,7 +20,7 @@ export default async (request: IRequest, response: Response) => { .findById(connectionId) .throwIfNotFound(); - if (!await connection.verifyWebhook(request)) { + if (!(await connection.verifyWebhook(request))) { return response.sendStatus(401); } diff --git a/packages/backend/src/controllers/webhooks/handler-by-flow-id.ts b/packages/backend/src/controllers/webhooks/handler-by-flow-id.js similarity index 85% rename from packages/backend/src/controllers/webhooks/handler-by-flow-id.ts rename to packages/backend/src/controllers/webhooks/handler-by-flow-id.js index b7b98328..c262c857 100644 --- a/packages/backend/src/controllers/webhooks/handler-by-flow-id.ts +++ b/packages/backend/src/controllers/webhooks/handler-by-flow-id.js @@ -1,11 +1,8 @@ -import { Response } from 'express'; -import { IRequest } from '@automatisch/types'; - import Flow from '../../models/flow'; import logger from '../../helpers/logger'; import handler from '../../helpers/webhook-handler'; -export default async (request: IRequest, response: Response) => { +export default async (request, response) => { const computedRequestPayload = { headers: request.headers, body: request.body,