Merge pull request #3148 from RolandMa1986/feat-userapi

add group filter for user api

pkg/apis/iam/v1alpha2/types.go

@@ -65,6 +65,8 @@ const (
 	IdentifyProviderLabel                 = "iam.kubesphere.io/identify-provider"
 	PasswordEncryptedAnnotation           = "iam.kubesphere.io/password-encrypted"
 	FieldEmail                            = "email"
+	InGroup                               = "ingroup"
+	NotInGroup                            = "notingroup"
 	AggregateTo                           = "aggregateTo"
 	ScopeWorkspace                        = "workspace"
 	ScopeCluster                          = "cluster"

pkg/models/resources/v1alpha3/user/users.go

@@ -28,6 +28,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/apiserver/query"
 	ksinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions"
 	"kubesphere.io/kubesphere/pkg/models/resources/v1alpha3"
+	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 )
 
 type usersGetter struct {
@@ -107,6 +108,10 @@ func (d *usersGetter) filter(object runtime.Object, filter query.Filter) bool {
 	switch filter.Field {
 	case iamv1alpha2.FieldEmail:
 		return user.Spec.Email == string(filter.Value)
+	case iamv1alpha2.InGroup:
+		return sliceutil.HasString(user.Spec.Groups, string(filter.Value))
+	case iamv1alpha2.NotInGroup:
+		return !sliceutil.HasString(user.Spec.Groups, string(filter.Value))
 	default:
 		return v1alpha3.DefaultObjectMetaFilter(user.ObjectMeta, filter)
 	}