From c6fb0ed299c1f57a470f4d307c1232c22d465331 Mon Sep 17 00:00:00 2001 From: Rutuja Surve Date: Wed, 10 Aug 2022 06:52:15 +0530 Subject: [PATCH] manual backport of #1024 Signed-off-by: Rutuja Surve --- server/multitenancy/tenant_resolver.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/multitenancy/tenant_resolver.ts b/server/multitenancy/tenant_resolver.ts index f73710b48..0ea82d802 100644 --- a/server/multitenancy/tenant_resolver.ts +++ b/server/multitenancy/tenant_resolver.ts @@ -43,8 +43,12 @@ export function resolveTenant( ): string | undefined { let selectedTenant: string | undefined; const query: any = request.url.query as any; + // eslint-disable-next-line @typescript-eslint/naming-convention + const security_tenant = request?.url?.searchParams?.get('security_tenant'); if (query && (query.security_tenant || query.securitytenant)) { selectedTenant = query.security_tenant ? query.security_tenant : query.securitytenant; + } else if (security_tenant) { + selectedTenant = security_tenant; } else if (request.headers.securitytenant || request.headers.security_tenant) { selectedTenant = request.headers.securitytenant ? (request.headers.securitytenant as string)