User view (#94)

* fix: some funcitons * feat(eventstore): implemented push events * fix: move project eventstore to project package * fix: change project eventstore funcs * feat(eventstore): overwrite context data * fix: change project eventstore * fix: add project repo to mgmt server * feat(types): SQL-config * fix: commented code * feat(eventstore): options to overwrite editor * feat: auth interceptor and cockroach migrations * fix: migrations * fix: fix filter * fix: not found on getbyid * fix: use global sql config * fix: add sequence * fix: add some tests * fix(eventstore): nullable sequence * fix: add some tests * merge * fix: add some tests * fix(migrations): correct statements for sequence * fix: add some tests * fix: add some tests * fix: changes from mr * fix: changes from mr * fix: add some tests * Update internal/eventstore/models/field.go Co-Authored-By: livio-a <[email protected]> * fix(eventstore): code quality * fix: add types to aggregate/Event-types * fix: try tests * fix(eventstore): rename modifier* to editor* * fix(eventstore): delete editor_org * fix(migrations): remove editor_org field, rename modifier_* to editor_* * fix: query tests * fix: use prepare funcs * fix: go mod * fix: generate files * fix(eventstore): tests * fix(eventstore): rename modifier to editor * fix(migrations): add cluster migration, fix(migrations): fix typo of host in clean clsuter * fix(eventstore): move health * fix(eventstore): AggregateTypeFilter aggregateType as param * code quality * fix: go tests * feat: add member funcs * feat: add member model * feat: add member events * feat: add member repo model * fix: better error func testing * fix: project member funcs * fix: add tests * fix: add tests * feat: implement member requests * fix: merge master * fix: merge master * fix: read existing in project repo * fix: fix tests * feat: add internal cache * feat: add cache mock * fix: return values of cache mock * feat: add project role * fix: add cache config * fix: add role to eventstore * fix: use eventstore sdk * fix: use eventstore sdk * fix: add project role grpc requests * fix: fix getby id * fix: changes for mr * fix: change value to interface * feat: add app event creations * fix: searchmethods * Update internal/project/model/project_member.go Co-Authored-By: Silvan <[email protected]> * fix: use get project func * fix: append events * fix: check if value is string on equal ignore case * fix: add changes test * fix: add go mod * fix: add some tests * fix: return err not nil * fix: return err not nil * fix: add aggregate funcs and tests * fix: add oidc aggregate funcs and tests * fix: add oidc * fix: add some tests * fix: tests * fix: oidc validation * fix: generate client secret * fix: generate client id * fix: test change app * fix: deactivate/reactivate application * fix: change oidc config * fix: change oidc config secret * fix: implement grpc app funcs * fix: add application requests * fix: converter * fix: converter * fix: converter and generate clientid * fix: tests * feat: project grant aggregate * feat: project grant * fix: project grant check if role existing * fix: project grant requests * fix: project grant fixes * fix: project grant member model * fix: project grant member aggregate * fix: project grant member eventstore * fix: project grant member requests * feat: user model * feat: user command side * user command side * profile requests * local config with gopass and more * init for views (spooler, handler) * init for views (spooler, handler) * start view in management * granted project * Update internal/user/model/user.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/address.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/address.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/mfa.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/mfa.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/usergrant/repository/eventsourcing/model/user_grant.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/usergrant/repository/eventsourcing/model/user_grant.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/usergrant/repository/eventsourcing/user_grant.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/user_test.go Co-Authored-By: Livio Amstutz <[email protected]> * Update internal/user/repository/eventsourcing/eventstore_mock_test.go Co-Authored-By: Livio Amstutz <[email protected]> * changes from mr review * save files into basedir * changes from mr review * changes from mr review * implement granted project view * Update internal/usergrant/repository/eventsourcing/cache.go Co-authored-by: Silvan <[email protected]> * Update internal/usergrant/repository/eventsourcing/cache.go Co-authored-by: Silvan <[email protected]> * changes requested on mr * fix generate codes * fix return if no events * password code * search granted projects * fix search column * update all projects on project change * search roles * filter org * project members * project grant members * fix tests * application view * project grant search * mock * Update internal/user/repository/eventsourcing/model/password.go Co-authored-by: Silvan <[email protected]> * Update internal/user/repository/eventsourcing/model/user.go Co-authored-by: Silvan <[email protected]> * requests of mr * check email * test appendevents * test appendevents * Update internal/view/query.go Co-authored-by: Livio Amstutz <[email protected]> * Update internal/eventstore/spooler/spooler.go Co-authored-by: Livio Amstutz <[email protected]> * Update internal/view/query.go Co-authored-by: Livio Amstutz <[email protected]> * merge request changes * Update internal/project/repository/view/model/application.go Co-authored-by: Livio Amstutz <[email protected]> * merge request changes * Project view sql (#92) * sql and configs * error handling * sql start in eventstore * on error handling, config * merge branches * user view * user grant view * fix test * user grant search * fill data on user grant * update data on user grant * return caos errors * converter list len * merge master * Update internal/management/repository/eventsourcing/handler/user_grant.go Co-authored-by: Livio Amstutz <[email protected]> * Update internal/usergrant/repository/view/model/user_grant_query.go Co-authored-by: Livio Amstutz <[email protected]> * typo * Update internal/user/repository/view/model/user_query.go Co-authored-by: Silvan <[email protected]> * Update internal/user/repository/view/user_view.go Co-authored-by: Silvan <[email protected]> * Update pkg/management/api/grpc/user_converter.go Co-authored-by: Silvan <[email protected]> * Update pkg/management/api/grpc/user_grant_converter.go Co-authored-by: Silvan <[email protected]> * set my org query Co-authored-by: adlerhurst <[email protected]> Co-authored-by: livio-a <[email protected]>
2026-11-12 00:55:12 +00:00 · 2020-05-12 06:30:53 +02:00
parent 6e105f662e
commit 5cbf537a91
40 changed files with 6135 additions and 3743 deletions
@@ -115,7 +115,7 @@
          "200": {
            "description": "A successful response.",
            "schema": {
-              "$ref": "#/definitions/v1User"
+              "$ref": "#/definitions/v1UserView"
            }
          }
        },
@@ -5595,14 +5595,6 @@
          "type": "string",
          "format": "date-time"
        },
-        "last_login": {
-          "type": "string",
-          "format": "date-time"
-        },
-        "password_changed": {
-          "type": "string",
-          "format": "date-time"
-        },
        "user_name": {
          "type": "string"
        },
@@ -5753,27 +5745,6 @@
          "type": "string",
          "format": "date-time"
        },
-        "user_name": {
-          "type": "string"
-        },
-        "first_name": {
-          "type": "string"
-        },
-        "last_name": {
-          "type": "string"
-        },
-        "email": {
-          "type": "string"
-        },
-        "org_name": {
-          "type": "string"
-        },
-        "org_domain": {
-          "type": "string"
-        },
-        "project_name": {
-          "type": "string"
-        },
        "sequence": {
          "type": "string",
          "format": "uint64"
@@ -5869,7 +5840,7 @@
        "result": {
          "type": "array",
          "items": {
-            "$ref": "#/definitions/v1UserGrant"
+            "$ref": "#/definitions/v1UserGrantView"
          }
        }
      }
@@ -5900,6 +5871,68 @@
        }
      }
    },
+    "v1UserGrantView": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "user_id": {
+          "type": "string"
+        },
+        "org_id": {
+          "type": "string"
+        },
+        "project_id": {
+          "type": "string"
+        },
+        "role_keys": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "state": {
+          "$ref": "#/definitions/v1UserGrantState"
+        },
+        "creation_date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "change_date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "user_name": {
+          "type": "string"
+        },
+        "first_name": {
+          "type": "string"
+        },
+        "last_name": {
+          "type": "string"
+        },
+        "email": {
+          "type": "string"
+        },
+        "org_name": {
+          "type": "string"
+        },
+        "org_domain": {
+          "type": "string"
+        },
+        "project_name": {
+          "type": "string"
+        },
+        "sequence": {
+          "type": "string",
+          "format": "uint64"
+        },
+        "resource_owner": {
+          "type": "string"
+        }
+      }
+    },
    "v1UserID": {
      "type": "object",
      "properties": {
@@ -6048,7 +6081,7 @@
        "result": {
          "type": "array",
          "items": {
-            "$ref": "#/definitions/v1User"
+            "$ref": "#/definitions/v1UserView"
          }
        }
      }
@@ -6065,6 +6098,90 @@
        "USERSTATE_INITIAL"
      ],
      "default": "USERSTATE_UNSPECIFIED"
+    },
+    "v1UserView": {
+      "type": "object",
+      "properties": {
+        "id": {
+          "type": "string"
+        },
+        "state": {
+          "$ref": "#/definitions/v1UserState"
+        },
+        "creation_date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "change_date": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "last_login": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "password_changed": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "user_name": {
+          "type": "string"
+        },
+        "first_name": {
+          "type": "string"
+        },
+        "last_name": {
+          "type": "string"
+        },
+        "display_name": {
+          "type": "string"
+        },
+        "nick_name": {
+          "type": "string"
+        },
+        "preferred_language": {
+          "type": "string"
+        },
+        "gender": {
+          "$ref": "#/definitions/v1Gender"
+        },
+        "email": {
+          "type": "string"
+        },
+        "is_email_verified": {
+          "type": "boolean",
+          "format": "boolean"
+        },
+        "phone": {
+          "type": "string"
+        },
+        "is_phone_verified": {
+          "type": "boolean",
+          "format": "boolean"
+        },
+        "country": {
+          "type": "string"
+        },
+        "locality": {
+          "type": "string"
+        },
+        "postal_code": {
+          "type": "string"
+        },
+        "region": {
+          "type": "string"
+        },
+        "street_address": {
+          "type": "string"
+        },
+        "sequence": {
+          "type": "string",
+          "format": "uint64"
+        },
+        "resource_owner": {
+          "type": "string"
+        }
+      }
    }
  }
 }
@@ -918,14 +918,14 @@ func (mr *MockManagementServiceClientMockRecorder) GetUserAddress(arg0, arg1 int
 }

 // GetUserByEmailGlobal mocks base method
-func (m *MockManagementServiceClient) GetUserByEmailGlobal(arg0 context.Context, arg1 *grpc.UserEmailID, arg2 ...grpc0.CallOption) (*grpc.User, error) {
+func (m *MockManagementServiceClient) GetUserByEmailGlobal(arg0 context.Context, arg1 *grpc.UserEmailID, arg2 ...grpc0.CallOption) (*grpc.UserView, error) {
 	m.ctrl.T.Helper()
 	varargs := []interface{}{arg0, arg1}
 	for _, a := range arg2 {
 		varargs = append(varargs, a)
 	}
 	ret := m.ctrl.Call(m, "GetUserByEmailGlobal", varargs...)
-	ret0, _ := ret[0].(*grpc.User)
+	ret0, _ := ret[0].(*grpc.UserView)
 	ret1, _ := ret[1].(error)
 	return ret0, ret1
 }
@@ -2,6 +2,8 @@ package grpc

 import (
 	"context"
+	"github.com/caos/zitadel/internal/api"
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/golang/protobuf/ptypes/empty"
 )
@@ -37,7 +39,8 @@ func (s *Server) ReactivateProject(ctx context.Context, in *ProjectID) (*Project

 func (s *Server) SearchGrantedProjects(ctx context.Context, in *GrantedProjectSearchRequest) (*GrantedProjectSearchResponse, error) {
 	request := grantedProjectSearchRequestsToModel(in)
-	request.AppendMyOrgQuery(ctx)
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	request.AppendMyOrgQuery(orgID)
 	response, err := s.project.SearchGrantedProjects(ctx, request)
 	if err != nil {
 		return nil, err
@@ -83,7 +86,8 @@ func (s *Server) RemoveProjectRole(ctx context.Context, in *ProjectRoleRemove) (

 func (s *Server) SearchProjectRoles(ctx context.Context, in *ProjectRoleSearchRequest) (*ProjectRoleSearchResponse, error) {
 	request := projectRoleSearchRequestsToModel(in)
-	request.AppendMyOrgQuery(ctx)
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	request.AppendMyOrgQuery(orgID)
 	response, err := s.project.SearchProjectRoles(ctx, request)
 	if err != nil {
 		return nil, err
@@ -2,6 +2,8 @@ package grpc

 import (
 	"context"
+	"github.com/caos/zitadel/internal/api"
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/golang/protobuf/ptypes/empty"
 )
@@ -12,8 +14,9 @@ func (s *Server) GetProjectGrantMemberRoles(ctx context.Context, _ *empty.Empty)

 func (s *Server) SearchProjectGrants(ctx context.Context, in *ProjectGrantSearchRequest) (*ProjectGrantSearchResponse, error) {
 	request := projectGrantSearchRequestsToModel(in)
-	request.AppendMyResourceOwnerQuery(ctx)
-	request.AppendNotMyOrgQuery(ctx)
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	request.AppendMyResourceOwnerQuery(orgID)
+	request.AppendNotMyOrgQuery(orgID)
 	response, err := s.project.SearchGrantedProjects(ctx, request)
 	if err != nil {
 		return nil, err
@@ -2,6 +2,8 @@ package grpc

 import (
 	"context"
+	"github.com/caos/zitadel/internal/api"
+	grpc_util "github.com/caos/zitadel/internal/api/grpc"
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/golang/protobuf/ptypes/empty"
 )
@@ -14,12 +16,23 @@ func (s *Server) GetUserByID(ctx context.Context, id *UserID) (*User, error) {
 	return userFromModel(user), nil
 }

-func (s *Server) GetUserByEmailGlobal(ctx context.Context, email *UserEmailID) (*User, error) {
-	return nil, errors.ThrowUnimplemented(nil, "GRPC-9djSw", "Not implemented")
+func (s *Server) GetUserByEmailGlobal(ctx context.Context, email *UserEmailID) (*UserView, error) {
+	user, err := s.user.GetGlobalUserByEmail(ctx, email.Email)
+	if err != nil {
+		return nil, err
+	}
+	return userViewFromModel(user), nil
 }

-func (s *Server) SearchUsers(ctx context.Context, userSearch *UserSearchRequest) (*UserSearchResponse, error) {
-	return nil, errors.ThrowUnimplemented(nil, "GRPC-as2Dc", "Not implemented")
+func (s *Server) SearchUsers(ctx context.Context, in *UserSearchRequest) (*UserSearchResponse, error) {
+	request := userSearchRequestsToModel(in)
+	orgID := grpc_util.GetHeader(ctx, api.ZitadelOrgID)
+	request.AppendMyOrgQuery(orgID)
+	response, err := s.user.SearchUsers(ctx, request)
+	if err != nil {
+		return nil, err
+	}
+	return userSearchResponseFromModel(response), nil
 }

 func (s *Server) UserChanges(ctx context.Context, changesRequest *ChangeRequest) (*Changes, error) {
@@ -27,7 +40,11 @@ func (s *Server) UserChanges(ctx context.Context, changesRequest *ChangeRequest)
 }

 func (s *Server) IsUserUnique(ctx context.Context, request *UniqueUserRequest) (*UniqueUserResponse, error) {
-	return nil, errors.ThrowUnimplemented(nil, "GRPC-olF56", "Not implemented")
+	unique, err := s.user.IsUserUnique(ctx, request.UserName, request.Email)
+	if err != nil {
+		return nil, err
+	}
+	return &UniqueUserResponse{IsUnique: unique}, nil
 }

 func (s *Server) CreateUser(ctx context.Context, in *CreateUserRequest) (*User, error) {
@@ -159,5 +176,9 @@ func (s *Server) SetInitialPassword(ctx context.Context, request *PasswordReques
 }

 func (s *Server) GetUserMfas(ctx context.Context, userID *UserID) (*MultiFactors, error) {
-	return nil, errors.ThrowUnimplemented(nil, "GRPC-ldmw3", "Not implemented")
+	mfas, err := s.user.UserMfas(ctx, userID.Id)
+	if err != nil {
+		return nil, err
+	}
+	return &MultiFactors{Mfas: mfasFromModel(mfas)}, nil
 }
@@ -89,6 +89,51 @@ func passwordRequestToModel(r *PasswordRequest) *usr_model.Password {
 	}
 }

+func userSearchRequestsToModel(project *UserSearchRequest) *usr_model.UserSearchRequest {
+	return &usr_model.UserSearchRequest{
+		Offset:  project.Offset,
+		Limit:   project.Limit,
+		Queries: userSearchQueriesToModel(project.Queries),
+	}
+}
+
+func userSearchQueriesToModel(queries []*UserSearchQuery) []*usr_model.UserSearchQuery {
+	converted := make([]*usr_model.UserSearchQuery, len(queries))
+	for i, q := range queries {
+		converted[i] = userSearchQueryToModel(q)
+	}
+	return converted
+}
+
+func userSearchQueryToModel(query *UserSearchQuery) *usr_model.UserSearchQuery {
+	return &usr_model.UserSearchQuery{
+		Key:    userSearchKeyToModel(query.Key),
+		Method: searchMethodToModel(query.Method),
+		Value:  query.Value,
+	}
+}
+
+func userSearchKeyToModel(key UserSearchKey) usr_model.UserSearchKey {
+	switch key {
+	case UserSearchKey_USERSEARCHKEY_USER_NAME:
+		return usr_model.USERSEARCHKEY_USER_NAME
+	case UserSearchKey_USERSEARCHKEY_FIRST_NAME:
+		return usr_model.USERSEARCHKEY_FIRST_NAME
+	case UserSearchKey_USERSEARCHKEY_LAST_NAME:
+		return usr_model.USERSEARCHKEY_LAST_NAME
+	case UserSearchKey_USERSEARCHKEY_NICK_NAME:
+		return usr_model.USERSEARCHKEY_NICK_NAME
+	case UserSearchKey_USERSEARCHKEY_DISPLAY_NAME:
+		return usr_model.USERSEARCHKEY_DISPLAY_NAME
+	case UserSearchKey_USERSEARCHKEY_EMAIL:
+		return usr_model.USERSEARCHKEY_EMAIL
+	case UserSearchKey_USERSEARCHKEY_STATE:
+		return usr_model.USERSEARCHKEY_STATE
+	default:
+		return usr_model.USERSEARCHKEY_UNSPECIFIED
+	}
+}
+
 func profileFromModel(profile *usr_model.Profile) *UserProfile {
 	creationDate, err := ptypes.TimestampProto(profile.CreationDate)
 	logging.Log("GRPC-dkso3").OnError(err).Debug("unable to parse timestamp")
@@ -207,6 +252,76 @@ func updateAddressToModel(address *UpdateUserAddressRequest) *usr_model.Address
 	}
 }

+func userSearchResponseFromModel(response *usr_model.UserSearchResponse) *UserSearchResponse {
+	return &UserSearchResponse{
+		Offset:      response.Offset,
+		Limit:       response.Limit,
+		TotalResult: response.TotalResult,
+		Result:      userViewsFromModel(response.Result),
+	}
+}
+
+func userViewsFromModel(users []*usr_model.UserView) []*UserView {
+	converted := make([]*UserView, len(users))
+	for i, user := range users {
+		converted[i] = userViewFromModel(user)
+	}
+	return converted
+}
+
+func userViewFromModel(user *usr_model.UserView) *UserView {
+	creationDate, err := ptypes.TimestampProto(user.CreationDate)
+	logging.Log("GRPC-dl9we").OnError(err).Debug("unable to parse timestamp")
+
+	changeDate, err := ptypes.TimestampProto(user.ChangeDate)
+	logging.Log("GRPC-lpsg5").OnError(err).Debug("unable to parse timestamp")
+
+	lastLogin, err := ptypes.TimestampProto(user.LastLogin)
+	logging.Log("GRPC-dksi3").OnError(err).Debug("unable to parse timestamp")
+
+	passwordChanged, err := ptypes.TimestampProto(user.PasswordChanged)
+	logging.Log("GRPC-dl9ws").OnError(err).Debug("unable to parse timestamp")
+
+	return &UserView{
+		Id:              user.ID,
+		State:           userStateFromModel(user.State),
+		CreationDate:    creationDate,
+		ChangeDate:      changeDate,
+		LastLogin:       lastLogin,
+		PasswordChanged: passwordChanged,
+		Sequence:        user.Sequence,
+		ResourceOwner:   user.ResourceOwner,
+		UserName:        user.UserName,
+		FirstName:       user.FirstName,
+		LastName:        user.LastName,
+		NickName:        user.NickName,
+		Email:           user.Email,
+		IsEmailVerified: user.IsEmailVerified,
+		Phone:           user.Phone,
+		IsPhoneVerified: user.IsPhoneVerified,
+		Country:         user.Country,
+		Locality:        user.Locality,
+		Region:          user.Region,
+		PostalCode:      user.PostalCode,
+		StreetAddress:   user.StreetAddress,
+	}
+}
+
+func mfasFromModel(mfas []*usr_model.MultiFactor) []*MultiFactor {
+	converted := make([]*MultiFactor, len(mfas))
+	for i, mfa := range mfas {
+		converted[i] = mfaFromModel(mfa)
+	}
+	return converted
+}
+
+func mfaFromModel(mfa *usr_model.MultiFactor) *MultiFactor {
+	return &MultiFactor{
+		State: mfaStateFromModel(mfa.State),
+		Type:  mfaTypeFromModel(mfa.Type),
+	}
+}
+
 func notifyTypeToModel(state NotificationType) usr_model.NotificationType {
 	switch state {
 	case NotificationType_NOTIFICATIONTYPE_EMAIL:
@@ -256,3 +371,25 @@ func genderToModel(gender Gender) usr_model.Gender {
 		return usr_model.GENDER_UNDEFINED
 	}
 }
+
+func mfaTypeFromModel(mfatype usr_model.MFAType) MfaType {
+	switch mfatype {
+	case usr_model.MFATYPE_OTP:
+		return MfaType_MFATYPE_OTP
+	case usr_model.MFATYPE_SMS:
+		return MfaType_MFATYPE_SMS
+	default:
+		return MfaType_MFATYPE_UNSPECIFIED
+	}
+}
+
+func mfaStateFromModel(state usr_model.MfaState) MFAState {
+	switch state {
+	case usr_model.MFASTATE_READY:
+		return MFAState_MFASTATE_READY
+	case usr_model.MFASTATE_NOTREADY:
+		return MFAState_MFASTATE_NOT_READY
+	default:
+		return MFAState_MFASTATE_UNSPECIFIED
+	}
+}
@@ -6,8 +6,13 @@ import (
 	"github.com/golang/protobuf/ptypes/empty"
 )

-func (s *Server) SearchUserGrants(ctx context.Context, request *UserGrantSearchRequest) (*UserGrantSearchResponse, error) {
-	return nil, errors.ThrowUnimplemented(nil, "GRPC-dk3ds", "Not implemented")
+func (s *Server) SearchUserGrants(ctx context.Context, in *UserGrantSearchRequest) (*UserGrantSearchResponse, error) {
+	request := userGrantSearchRequestsToModel(in)
+	response, err := s.usergrant.SearchUserGrants(ctx, request)
+	if err != nil {
+		return nil, err
+	}
+	return userGrantSearchResponseFromModel(response), nil
 }

 func (s *Server) UserGrantByID(ctx context.Context, request *UserGrantID) (*UserGrant, error) {
@@ -64,6 +64,85 @@ func projectGrantUserGrantUpdateToModel(u *ProjectGrantUserGrantUpdate) *grant_m
 	}
 }

+func userGrantSearchRequestsToModel(project *UserGrantSearchRequest) *grant_model.UserGrantSearchRequest {
+	return &grant_model.UserGrantSearchRequest{
+		Offset:  project.Offset,
+		Limit:   project.Limit,
+		Queries: userGrantSearchQueriesToModel(project.Queries),
+	}
+}
+
+func userGrantSearchQueriesToModel(queries []*UserGrantSearchQuery) []*grant_model.UserGrantSearchQuery {
+	converted := make([]*grant_model.UserGrantSearchQuery, len(queries))
+	for i, q := range queries {
+		converted[i] = userGrantSearchQueryToModel(q)
+	}
+	return converted
+}
+
+func userGrantSearchQueryToModel(query *UserGrantSearchQuery) *grant_model.UserGrantSearchQuery {
+	return &grant_model.UserGrantSearchQuery{
+		Key:    userGrantSearchKeyToModel(query.Key),
+		Method: searchMethodToModel(query.Method),
+		Value:  query.Value,
+	}
+}
+
+func userGrantSearchKeyToModel(key UserGrantSearchKey) grant_model.UserGrantSearchKey {
+	switch key {
+	case UserGrantSearchKey_USERGRANTSEARCHKEY_ORG_ID:
+		return grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER
+	case UserGrantSearchKey_USERGRANTSEARCHKEY_PROJECT_ID:
+		return grant_model.USERGRANTSEARCHKEY_PROJECT_ID
+	case UserGrantSearchKey_USERGRANTSEARCHKEY_USER_ID:
+		return grant_model.USERGRANTSEARCHKEY_USER_ID
+	default:
+		return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
+	}
+}
+
+func userGrantSearchResponseFromModel(response *grant_model.UserGrantSearchResponse) *UserGrantSearchResponse {
+	return &UserGrantSearchResponse{
+		Offset:      response.Offset,
+		Limit:       response.Limit,
+		TotalResult: response.TotalResult,
+		Result:      userGrantViewsFromModel(response.Result),
+	}
+}
+
+func userGrantViewsFromModel(users []*grant_model.UserGrantView) []*UserGrantView {
+	converted := make([]*UserGrantView, len(users))
+	for i, user := range users {
+		converted[i] = userGrantViewFromModel(user)
+	}
+	return converted
+}
+
+func userGrantViewFromModel(grant *grant_model.UserGrantView) *UserGrantView {
+	creationDate, err := ptypes.TimestampProto(grant.CreationDate)
+	logging.Log("GRPC-dl9we").OnError(err).Debug("unable to parse timestamp")
+
+	changeDate, err := ptypes.TimestampProto(grant.ChangeDate)
+	logging.Log("GRPC-lpsg5").OnError(err).Debug("unable to parse timestamp")
+
+	return &UserGrantView{
+		Id:            grant.ID,
+		State:         usergrantStateFromModel(grant.State),
+		CreationDate:  creationDate,
+		ChangeDate:    changeDate,
+		Sequence:      grant.Sequence,
+		ResourceOwner: grant.ResourceOwner,
+		UserName:      grant.UserName,
+		FirstName:     grant.FirstName,
+		LastName:      grant.LastName,
+		Email:         grant.Email,
+		ProjectName:   grant.ProjectName,
+		OrgName:       grant.OrgName,
+		OrgDomain:     grant.OrgDomain,
+		RoleKeys:      grant.RoleKeys,
+	}
+}
+
 func usergrantStateFromModel(state grant_model.UserGrantState) UserGrantState {
 	switch state {
 	case grant_model.USERGRANTSTATE_ACTIVE:
@@ -62,7 +62,7 @@ service ManagementService {
        };
    }

-    rpc GetUserByEmailGlobal(UserEmailID) returns (User) {
+    rpc GetUserByEmailGlobal(UserEmailID) returns (UserView) {
        option (google.api.http) = {
            get: "/global/users/email/{email}"
        };
@@ -1288,6 +1288,47 @@ message CreateUserRequest {
 }

 message User {
+    string id = 1;
+    UserState state = 2;
+    google.protobuf.Timestamp creation_date = 3;
+    google.protobuf.Timestamp change_date = 4;
+    string user_name = 5;
+    string first_name = 6;
+    string last_name = 7;
+    string display_name = 8;
+    string nick_name = 9;
+    string preferred_language = 10;
+    Gender gender = 11;
+    string email = 12;
+    bool is_email_verified = 13;
+    string phone = 14;
+    bool is_phone_verified = 15;
+    string country = 16;
+    string locality = 17;
+    string postal_code = 18;
+    string region = 19;
+    string street_address = 20;
+    uint64 sequence = 21;
+}
+
+enum UserState {
+    USERSTATE_UNSPECIFIED = 0;
+    USERSTATE_ACTIVE = 1;
+    USERSTATE_INACTIVE = 2;
+    USERSTATE_DELETED = 3;
+    USERSTATE_LOCKED = 4;
+    USERSTATE_SUSPEND = 5;
+    USERSTATE_INITIAL= 6;
+}
+
+enum Gender {
+    GENDER_UNSPECIFIED = 0;
+    GENDER_FEMALE = 1;
+    GENDER_MALE = 2;
+    GENDER_DIVERSE = 3;
+}
+
+message UserView {
    string id = 1;
    UserState state = 2;
    google.protobuf.Timestamp creation_date = 3;
@@ -1311,23 +1352,7 @@ message User {
    string region = 21;
    string street_address = 22;
    uint64 sequence = 23;
-}
-
-enum UserState {
-    USERSTATE_UNSPECIFIED = 0;
-    USERSTATE_ACTIVE = 1;
-    USERSTATE_INACTIVE = 2;
-    USERSTATE_DELETED = 3;
-    USERSTATE_LOCKED = 4;
-    USERSTATE_SUSPEND = 5;
-    USERSTATE_INITIAL= 6;
-}
-
-enum Gender {
-    GENDER_UNSPECIFIED = 0;
-    GENDER_FEMALE = 1;
-    GENDER_MALE = 2;
-    GENDER_DIVERSE = 3;
+    string resource_owner = 24;
 }

 message UserSearchRequest {
@@ -1359,7 +1384,7 @@ message UserSearchResponse {
    uint64 offset = 1;
    uint64 limit = 2;
    uint64 total_result = 3;
-    repeated User result = 4;
+    repeated UserView result = 4;
 }

 enum SearchMethod {
@@ -2149,14 +2174,7 @@ message UserGrant {
    UserGrantState state = 6;
    google.protobuf.Timestamp creation_date = 7;
    google.protobuf.Timestamp change_date = 8;
-    string user_name = 9;
-    string first_name = 10;
-    string last_name = 11;
-    string email = 12;
-    string org_name = 13;
-    string org_domain = 14;
-    string project_name = 15;
-    uint64 sequence = 16;
+    uint64 sequence = 9;
 }

 message UserGrantCreate {
@@ -2216,12 +2234,32 @@ enum UserGrantState {
    USERGRANTSTATE_INACTIVE = 2;
 }

+message UserGrantView {
+    string id = 1;
+    string user_id = 2;
+    string org_id = 3;
+    string project_id = 4;
+    repeated string role_keys = 5;
+    UserGrantState state = 6;
+    google.protobuf.Timestamp creation_date = 7;
+    google.protobuf.Timestamp change_date = 8;
+    string user_name = 9;
+    string first_name = 10;
+    string last_name = 11;
+    string email = 12;
+    string org_name = 13;
+    string org_domain = 14;
+    string project_name = 15;
+    uint64 sequence = 16;
+    string resource_owner = 17;
+}
+

 message UserGrantSearchResponse {
    uint64 offset = 1;
    uint64 limit = 2;
    uint64 total_result = 3;
-    repeated UserGrant result = 4;
+    repeated UserGrantView result = 4;
 }

 message UserGrantSearchRequest {