TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-05-02 13:10:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: handle private labeling on login page without auth request (#2309)

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

* fix: respect requested org (primary domain scope) for private labeling again
This commit is contained in:
Livio Amstutz 2021-09-02 18:29:42 +02:00 committed by GitHub
parent ec6e1ed467
commit b5a6e25e9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@ -521,6 +521,9 @@ func (repo *AuthRequestRepo) fillPolicies(ctx context.Context, request *domain.A
privateLabelingOrgID = request.UserOrgID privateLabelingOrgID = request.UserOrgID
} }
} }
if request.RequestedOrgID != "" {
privateLabelingOrgID = request.RequestedOrgID
}
labelPolicy, err := repo.getLabelPolicy(ctx, privateLabelingOrgID) labelPolicy, err := repo.getLabelPolicy(ctx, privateLabelingOrgID)
if err != nil { if err != nil {
return err return err

3
internal/ui/login/handler/renderer.go
View File

@ -426,6 +426,9 @@ func (l *Login) getOrgID(authReq *domain.AuthRequest) string {
func (l *Login) getPrivateLabelingID(authReq *domain.AuthRequest) string { func (l *Login) getPrivateLabelingID(authReq *domain.AuthRequest) string {
privateLabelingOrgID := domain.IAMID privateLabelingOrgID := domain.IAMID
if authReq == nil {
return privateLabelingOrgID
}
if authReq.PrivateLabelingSetting != domain.PrivateLabelingSettingUnspecified { if authReq.PrivateLabelingSetting != domain.PrivateLabelingSettingUnspecified {
privateLabelingOrgID = authReq.ApplicationResourceOwner privateLabelingOrgID = authReq.ApplicationResourceOwner
} }