Merge pull request #10171 from swordqiu/hotfix/qj-idp-match-sso-domain

fix(keystone): idp filter by sso_domain returns domain's idp only
This commit is contained in:
Zexi Li
2021-02-06 10:35:05 +08:00
committed by GitHub
+1 -8
View File
@@ -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 {