From 01abd8997c2be3d96b6ee0aa9affbea60ae1dc74 Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Sat, 6 Feb 2021 02:54:00 +0800 Subject: [PATCH] fix(keystone): idp filter by sso_domain returns domain's idp only --- pkg/keystone/models/identity_provider.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/keystone/models/identity_provider.go b/pkg/keystone/models/identity_provider.go index aa047326cb..1553926597 100644 --- a/pkg/keystone/models/identity_provider.go +++ b/pkg/keystone/models/identity_provider.go @@ -1169,14 +1169,7 @@ func (manager *SIdentityProviderManager) ListItemFilter( return nil, errors.Wrap(err, "FetchDomainByIdOrName") } } - q = q.Filter(sqlchemy.OR( - sqlchemy.IsNullOrEmpty(q.Field("domain_id")), - sqlchemy.Equals(q.Field("domain_id"), ssoDomain.Id), - )) - q = q.Filter(sqlchemy.OR( - sqlchemy.IsNullOrEmpty(q.Field("target_domain_id")), - sqlchemy.Equals(q.Field("target_domain_id"), ssoDomain.Id), - )) + q = q.Equals("domain_id", ssoDomain.Id) } } if query.AutoCreateProject != nil {