update webhook

This commit is contained in:
Andras Bacsai
2023-07-25 12:00:31 +02:00
parent d037409237
commit 49261308f7
2 changed files with 5 additions and 4 deletions

View File

@@ -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)]

View File

@@ -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)
);
};