diff --git a/compose.yaml b/compose.yaml index bdb54937..3851b805 100644 --- a/compose.yaml +++ b/compose.yaml @@ -111,14 +111,10 @@ services: container_name: livekit profiles: ['voice'] restart: unless-stopped + network_mode: host command: ['--config', '/etc/livekit/livekit.yaml'] volumes: - ./config/livekit.yaml:/etc/livekit/livekit.yaml:ro - ports: - - '${LIVEKIT_PORT:-7880}:7880' - - '7881:7881' - - '3478:3478/udp' - - '50000-50100:50000-50100/udp' healthcheck: test: ['CMD-SHELL', 'wget -qO- http://127.0.0.1:7880 || exit 1'] interval: 15s diff --git a/packages/api/src/auth/services/SsoService.tsx b/packages/api/src/auth/services/SsoService.tsx index 5706dc20..d78ad71e 100644 --- a/packages/api/src/auth/services/SsoService.tsx +++ b/packages/api/src/auth/services/SsoService.tsx @@ -454,8 +454,7 @@ export class SsoService { }; if (config.clientSecret) { - const encoded = Buffer.from(`${config.clientId}:${config.clientSecret}`, 'utf8').toString('base64'); - headers['Authorization'] = `Basic ${encoded}`; + body.set('client_secret', config.clientSecret); } const resp = await FetchUtils.sendRequest({ @@ -520,7 +519,7 @@ export class SsoService { } private async getResolvedConfig(): Promise { - const stored = await this.instanceConfigRepository.getSsoConfig(); + const stored = await this.instanceConfigRepository.getSsoConfig({ includeSecret: true }); const redirectUri = stored.redirectUri ?? `${Config.endpoints.webApp}/auth/sso/callback`; const scope = stored.scope?.trim() || 'openid email profile'; const providerId = stored.issuer || stored.authorizationUrl || 'sso'; diff --git a/packages/http_client/src/HttpClientRequestInternals.tsx b/packages/http_client/src/HttpClientRequestInternals.tsx index 991aa920..8f34cd04 100644 --- a/packages/http_client/src/HttpClientRequestInternals.tsx +++ b/packages/http_client/src/HttpClientRequestInternals.tsx @@ -100,6 +100,9 @@ export function resolveRequestBody(body: unknown, headers: Record