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, remote destinationDockerId, settings, basicAuthUser, - basicAuthPw + basicAuthPw, + settings: { basicAuth: isBasicAuthEnabled } } = application; if (!destinationDockerId) { continue; @@ -408,7 +409,7 @@ export async function proxyConfiguration(request: FastifyRequest, 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 => { - fastify.get('/main.json', async (request, reply) => proxyConfiguration(request, false)); + fastify.get('/main.json', async (request) => proxyConfiguration(request, false)); fastify.get('/remote/:id', async (request) => proxyConfiguration(request, true)); - fastify.get('/other.json', async (request, reply) => + fastify.get('/other.json', async (request) => otherProxyConfiguration(request) ); };