From 94f267d475b3c78f80e6326ebe1601aad5983806 Mon Sep 17 00:00:00 2001 From: Livio Spring Date: Wed, 9 Oct 2024 11:02:28 +0200 Subject: [PATCH] fix: respect PrivateLabelingSetting on project for login texts (#8744) # Which Problems Are Solved Admins can set the branding to be used from the project's organization. Until now, only the branding (colors) were respected, but texts were still loaded from the user's organization. # How the Problems Are Solved Respect the setting when loading the texts for the login pages. # Additional Changes None # Additional Context - closes #8502 --- .../auth/repository/eventsourcing/eventstore/auth_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/auth/repository/eventsourcing/eventstore/auth_request.go b/internal/auth/repository/eventsourcing/eventstore/auth_request.go index c6ae47553..673877ff4 100644 --- a/internal/auth/repository/eventsourcing/eventstore/auth_request.go +++ b/internal/auth/repository/eventsourcing/eventstore/auth_request.go @@ -726,7 +726,7 @@ func (repo *AuthRequestRepo) fillPolicies(ctx context.Context, request *domain.A request.DefaultTranslations = defaultLoginTranslations } if len(request.OrgTranslations) == 0 || request.PolicyOrgID() != orgID { - orgLoginTranslations, err := repo.getLoginTexts(ctx, orgID) + orgLoginTranslations, err := repo.getLoginTexts(ctx, request.PrivateLabelingOrgID(orgID)) if err != nil { return err }