From 49261308f7b3a800802bd2ff9a8d51064f305644 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 25 Jul 2023 12:00:31 +0200
Subject: [PATCH] update webhook

---
 apps/api/src/routes/webhooks/traefik/handlers.ts | 5 +++--
 apps/api/src/routes/webhooks/traefik/index.ts    | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/api/src/routes/webhooks/traefik/handlers.ts b/apps/api/src/routes/webhooks/traefik/handlers.ts
index a8ae125c0..098859714 100644
--- a/apps/api/src/routes/webhooks/traefik/handlers.ts
+++ b/apps/api/src/routes/webhooks/traefik/handlers.ts
@@ -394,7 +394,8 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 						destinationDockerId,
 						settings,
 						basicAuthUser,
-						basicAuthPw
+						basicAuthPw,
+						settings: { basicAuth: isBasicAuthEnabled }
 					} = application;
 					if (!destinationDockerId) {
 						continue;
@@ -408,7 +409,7 @@ export async function proxyConfiguration(request: FastifyRequest<OnlyId>, remote
 						continue;
 					}
 					let httpBasicAuth = null;
-					if (basicAuthUser && basicAuthPw) {
+					if (basicAuthUser && basicAuthPw && isBasicAuthEnabled) {
 						httpBasicAuth = {
 							basicAuth: {
 								users: [basicAuthUser + ':' + await hashPassword(basicAuthPw, 1)]
diff --git a/apps/api/src/routes/webhooks/traefik/index.ts b/apps/api/src/routes/webhooks/traefik/index.ts
index ed7298ef9..f89e64f73 100644
--- a/apps/api/src/routes/webhooks/traefik/index.ts
+++ b/apps/api/src/routes/webhooks/traefik/index.ts
@@ -4,9 +4,9 @@ import { proxyConfiguration, otherProxyConfiguration } from './handlers';
 import { OtherProxyConfiguration } from './types';
 
 const root: FastifyPluginAsync = async (fastify): Promise<void> => {
-	fastify.get<OnlyId>('/main.json', async (request, reply) => proxyConfiguration(request, false));
+	fastify.get<OnlyId>('/main.json', async (request) => proxyConfiguration(request, false));
 	fastify.get<OnlyId>('/remote/:id', async (request) => proxyConfiguration(request, true));
-	fastify.get<OtherProxyConfiguration>('/other.json', async (request, reply) =>
+	fastify.get<OtherProxyConfiguration>('/other.json', async (request) =>
 		otherProxyConfiguration(request)
 	);
 };