TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 21:07:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter of domain claimed users (#2752)

Browse Source
This commit is contained in:
Livio Amstutz
2021-11-29 17:36:24 +01:00
committed by GitHub
parent 209ea09e30
commit 7d45ae3c6c
3 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/api/grpc/admin/org.go
View File

@@ -3,14 +3,14 @@ package admin
import (
"context"
"github.com/caos/zitadel/internal/api/authz"
"google.golang.org/protobuf/types/known/timestamppb"
"github.com/caos/zitadel/internal/api/grpc/object"
org_grpc "github.com/caos/zitadel/internal/api/grpc/org"
"github.com/caos/zitadel/internal/domain"
usr_model "github.com/caos/zitadel/internal/user/model"
admin_pb "github.com/caos/zitadel/pkg/grpc/admin"
obj_pb "github.com/caos/zitadel/pkg/grpc/object"
"google.golang.org/protobuf/types/known/timestamppb"
)
func (s *Server) IsOrgUnique(ctx context.Context, req *admin_pb.IsOrgUniqueRequest) (*admin_pb.IsOrgUniqueResponse, error) {
@@ -68,12 +68,7 @@ func (s *Server) getClaimedUserIDsOfOrgDomain(ctx context.Context, orgDomain str
{
Key: usr_model.UserSearchKeyPreferredLoginName,
Method: domain.SearchMethodEndsWithIgnoreCase,
Value: orgDomain,
},
{
Key: usr_model.UserSearchKeyResourceOwner,
Method: domain.SearchMethodNotEquals,
Value: authz.GetCtxData(ctx).OrgID,
Value: "@" + orgDomain,
},
},
})