From f5661c6e61d0b0a9adba475383f3a390aa9c616d Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Fri, 22 Oct 2021 15:53:28 +0200
Subject: [PATCH] fix: respect requested org (primary domain scope) for private
 labeling  (#2561)

* fix: handle private labeling on login page without auth request

* fix: respect requested org (primary domain scope) for private labeling again

* respect requested org (primary domain scope) for private labeling
---
 internal/ui/login/handler/renderer.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/internal/ui/login/handler/renderer.go b/internal/ui/login/handler/renderer.go
index 95ded170f5..e58a589cf6 100644
--- a/internal/ui/login/handler/renderer.go
+++ b/internal/ui/login/handler/renderer.go
@@ -443,6 +443,9 @@ func (l *Login) getPrivateLabelingID(authReq *domain.AuthRequest) string {
 			privateLabelingOrgID = authReq.UserOrgID
 		}
 	}
+	if authReq.RequestedOrgID != "" {
+		privateLabelingOrgID = authReq.RequestedOrgID
+	}
 	return privateLabelingOrgID
 }