src/Forward/ForwardManager.ts

@@ -43,7 +43,5 @@ export function createForward(origin: string, webhook: string|undefined): Forwar
             webhook = generateRandomWebhookId();
         } while (getForwardByWebhook(webhook) != null);
     }
-    const forward = new Forward(webhook, origin);
-    known_forwards.push(forward);
-    return forward;
+    return new Forward(webhook, origin);
 };

src/Server/Webhook.ts

@@ -13,14 +13,14 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-export type WebhookRecievedCallback = (webhookId: string, webhook: any) => void;
+export type WebhookRecievedCallback = (webhookId: string, webhook: Promise<any>) => void;
 
 export function setupWebhookRoutes(router:any, webhookRecievedCallback:WebhookRecievedCallback):void {
     
     router.post('/webhook/:webhook', (req: any, res: any) => {
         const webhookId = req.params.webhook;
         console.log("[WEB] Recieved webhook " + webhookId);
-        webhookRecievedCallback(webhookId, req.body);
+        webhookRecievedCallback(webhookId, res.body);
         res.statusCode = 200;
         res.end();
     });

src/index.ts

@@ -81,12 +81,14 @@ for (const forwardData of parsedData) {
     }
 }
 
-createServer(parseInt(env["PORT"]||"3000"), async (webhookId: string, webhookData: any) => {
+createServer(parseInt(env["PORT"]||"3000"), async (webhookId: string, webhook: Promise<any>) => {
     const forward: Forward|null = getForwardByWebhook(webhookId);
     if (forward == null) return;
+    const webhookData: any = await webhook;
     if (!webhookData.hasOwnProperty("repository")) return;
     const url: any = webhookData.repository.clone_url || webhookData.repository.ssh_url || webhookData.repository.html_url;
-    if (typeof url !== "string" || forward.origin !== url) {
+    if (typeof url !== "string") return;
+    if (forward.origin !== url) {
         console.log("[VAL] Invalid webhook origin!");
         return;
     }