feat: split users into human and machine (#470)

* feat(management): service accounts * chore: current go version * init * refactor: apis * feat(internal): start impl of service account * chore: start impl of machine/human users * code compiles * fix: tests * fix: tests * fix: add new event types to switches * chore: add cases to event types * fix(management): definitive proto messages * fix: machine/human * fix: add missing tables as todos * fix: remove unused permissions * fix: refactoring * fix: refactor * fix: human registered * fix: user id * fix: logid * fix: proto remove //equal * chore(management): remove no comment * fix: human mfas * fix: user subobjects * chore: rename existing to better name * fix: username in user (#634) * fix: username in user * fix: username * fix remove unused code * fix add validations * fix: use new user in all apis * fix: regexp for username in api * fix: fill user data for human and machine (#638) * fix: fill Display name grant/member handlers fix: add description to grant/member objects in api fix: check if user is human in login * fix: remove description from member and grant * chore: remove todos * feat: machine keys * fix: implement missing parts * feat: machine key management view * fix: remove keys from machine view * fix: set default expiration date * fix: get key by ids * feat: add machine keys in proto * feat: machine keys * fix: add migration * fix: mig * fix: correct method name * feat: user search * feat: user search * fix: log ids * fix partial authconfig prompt, domain c perm * membership read check * contributor refresh trigger, observe org write * fix: migrations * fix(console): machine build (#660) * frontend 1 * fix html bindings * trailing comma * user permissions, project deactivate * fix(console): human view (#661) * fix search user view, user detail form * rm log * feat(console): user services list and create (#663) * fix search user view, user detail form * rm log * machine list * generic table component * create user service * proove table for undefined values * tmp disable user link if machine * lint * lint styles * user table lint * Update console/src/assets/i18n/de.json Co-authored-by: Florian Forster <florian@caos.ch> * feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664) * service users for sidenav, routing * i18n * back routes * machine detail form * update machine detail, fix svc user grants * keys table * add key dialog, timestamp creation * check permission on create, delete, fix selection * lint ts, scss * Update console/src/assets/i18n/de.json * Apply suggestions from code review Co-authored-by: Florian Forster <florian@caos.ch> * allow user grants for project.write * management service * fix mgmt service * feat: Machine keys (#655) * fix: memberships (#633) * feat: add iam members to memberships * fix: search project grants * fix: rename * feat: idp and login policy configurations (#619) * feat: oidc config * fix: oidc configurations * feat: oidc idp config * feat: add oidc config test * fix: tests * fix: tests * feat: translate new events * feat: idp eventstore * feat: idp eventstore * fix: tests * feat: command side idp * feat: query side idp * feat: idp config on org * fix: tests * feat: authz idp on org * feat: org idps * feat: login policy * feat: login policy * feat: login policy * feat: add idp func on login policy * feat: add validation to loginpolicy and idp provider * feat: add default login policy * feat: login policy on org * feat: login policy on org * fix: id config handlers * fix: id config handlers * fix: create idp on org * fix: create idp on org * fix: not existing idp config * fix: default login policy * fix: add login policy on org * fix: idp provider search on org * fix: test * fix: remove idp on org * fix: test * fix: test * fix: remove admin idp * fix: logo src as byte * fix: migration * fix: tests * Update internal/iam/repository/eventsourcing/iam.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/iam_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/iam_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/org/repository/eventsourcing/org_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/iam/repository/eventsourcing/model/login_policy_test.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * fix: pr comments * fix: tests * Update types.go * fix: merge request changes * fix: reduce optimization Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> * fix: reread user mfas, preferred loginname as otp account name (#636) * fix: reread user mfas * fix: use preferred login name as otp account name * fix: tests * fix: reduce (#635) * fix: management reduce optimization * fix: reduce optimization * fix: reduce optimization * fix: merge master * chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627) Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0. - [Release notes](https://github.com/gorilla/schema/releases) - [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624) Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0. - [Release notes](https://github.com/gorilla/mux/releases) - [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591) Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0. - [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases) - [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: auto assign issues and PR to ZTIADEL project board (#643) * Create main.yml * Update main.yml Co-authored-by: Livio Amstutz <livio.a@gmail.com> * fix(console): project grant members, update deps (#645) * fix: searchprojectgrantmembers * chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622) Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump @angular-devkit/build-angular in /console (#626) Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7. - [Release notes](https://github.com/angular/angular-cli/releases) - [Commits](https://github.com/angular/angular-cli/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> * chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623) Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629) Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0. - [Release notes](https://github.com/TypeStrong/ts-node/releases) - [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update packlock Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore: delete main.yml (#648) * fix: usergrant (#650) * fix(console): mfa refresh after verification, member eventemitter (#651) * refresh mfa * fix: detail link from contributors * lint * feat: add domain verification notification (#649) * fix: dont (re)generate client secret with auth type none * fix(cors): allow Origin from request * feat: add origin allow list and fix some core issues * rename migration * fix UserIDsByDomain * feat: send email to users after domain claim * username * check origin on userinfo * update oidc pkg * fix: add migration 1.6 * change username * change username * remove unique email aggregate * change username in mgmt * search global user by login name * fix test * change user search in angular * fix tests * merge * userview in angular * fix merge * Update pkg/grpc/management/proto/management.proto Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * Update internal/notification/static/i18n/de.yaml Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * fix Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> * fix: translation (#647) * fix: translation * fix: translation * fix: translation * fix: remove unused code * fix: log err * fix: migration numbers (#652) * chore: issue / feature templates (#642) * feat: machine keys * fix: implement missing parts * feat: machine key management view * fix: remove keys from machine view * feat: global org read (#657) * fix: set default expiration date * fix: get key by ids * feat: add machine keys in proto * feat: machine keys * fix: add migration * fix: mig * fix: correct method name * feat: user search * feat: user search * fix: log ids * fix: migrations * fix(console): machine build (#660) * frontend 1 * fix html bindings * trailing comma * fix(console): human view (#661) * fix search user view, user detail form * rm log * feat(console): user services list and create (#663) * fix search user view, user detail form * rm log * machine list * generic table component * create user service * proove table for undefined values * tmp disable user link if machine * lint * lint styles * user table lint * Update console/src/assets/i18n/de.json Co-authored-by: Florian Forster <florian@caos.ch> * feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664) * service users for sidenav, routing * i18n * back routes * machine detail form * update machine detail, fix svc user grants * keys table * add key dialog, timestamp creation * check permission on create, delete, fix selection * lint ts, scss * Update console/src/assets/i18n/de.json * Apply suggestions from code review Co-authored-by: Florian Forster <florian@caos.ch> * refactor: protos * fix(management): key expiration date * fix: check if user is human * fix: marshal key details * fix: correct generate login names * fix: logid Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com> Co-authored-by: Florian Forster <florian@caos.ch> * fix: naming * refactor: findings * fix: username * fix: mfa upper case * fix: tests * fix: add translations * reactivatemyorg req typeö * fix: projectType for console * fix: user changes * fix: translate events * fix: event type translation * fix: remove unused types Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Florian Forster <florian@caos.ch> Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com> Co-authored-by: Livio Amstutz <livio.a@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-08-11 21:27:42 +00:00 · 2020-08-31 17:48:01 +02:00
parent c1c85e632b
commit 5abd5b0505
207 changed files with 52837 additions and 26745 deletions
--- a/internal/api/grpc/admin/org_converter.go
+++ b/internal/api/grpc/admin/org_converter.go
@@ -3,7 +3,6 @@ package admin
 import (
 	"github.com/caos/logging"
 	"github.com/golang/protobuf/ptypes"
-	"golang.org/x/text/language"

 	admin_model "github.com/caos/zitadel/internal/admin/model"
 	"github.com/caos/zitadel/internal/eventstore/models"
@@ -32,39 +31,6 @@ func orgCreateRequestToModel(org *admin.CreateOrgRequest) *org_model.Org {
 	return o
 }

-func userCreateRequestToModel(user *admin.CreateUserRequest) *usr_model.User {
-	preferredLanguage, err := language.Parse(user.PreferredLanguage)
-	logging.Log("GRPC-30hwz").OnError(err).Debug("unable to parse language")
-	result := &usr_model.User{
-		Profile: &usr_model.Profile{
-			UserName:          user.UserName,
-			FirstName:         user.FirstName,
-			LastName:          user.LastName,
-			NickName:          user.NickName,
-			PreferredLanguage: preferredLanguage,
-			Gender:            genderToModel(user.Gender),
-		},
-		Password: &usr_model.Password{
-			SecretString: user.Password,
-		},
-		Email: &usr_model.Email{
-			EmailAddress:    user.Email,
-			IsEmailVerified: user.IsEmailVerified,
-		},
-		Address: &usr_model.Address{
-			Country:       user.Country,
-			Locality:      user.Locality,
-			PostalCode:    user.PostalCode,
-			Region:        user.Region,
-			StreetAddress: user.StreetAddress,
-		},
-	}
-	if user.Phone != "" {
-		result.Phone = &usr_model.Phone{PhoneNumber: user.Phone, IsPhoneVerified: user.IsPhoneVerified}
-	}
-	return result
-}
-
 func setUpOrgResponseFromModel(setUp *admin_model.SetupOrg) *admin.OrgSetUpResponse {
 	return &admin.OrgSetUpResponse{
 		Org:  orgFromModel(setUp.Org),
@@ -126,45 +92,6 @@ func orgViewFromModel(org *org_model.OrgView) *admin.Org {
 	}
 }

-func userFromModel(user *usr_model.User) *admin.User {
-	creationDate, err := ptypes.TimestampProto(user.CreationDate)
-	logging.Log("GRPC-8duwe").OnError(err).Debug("unable to parse timestamp")
-
-	changeDate, err := ptypes.TimestampProto(user.ChangeDate)
-	logging.Log("GRPC-ckoe3d").OnError(err).Debug("unable to parse timestamp")
-
-	converted := &admin.User{
-		Id:                user.AggregateID,
-		State:             userStateFromModel(user.State),
-		CreationDate:      creationDate,
-		ChangeDate:        changeDate,
-		Sequence:          user.Sequence,
-		UserName:          user.UserName,
-		FirstName:         user.FirstName,
-		LastName:          user.LastName,
-		DisplayName:       user.DisplayName,
-		NickName:          user.NickName,
-		PreferredLanguage: user.PreferredLanguage.String(),
-		Gender:            genderFromModel(user.Gender),
-	}
-	if user.Email != nil {
-		converted.Email = user.EmailAddress
-		converted.IsEmailVerified = user.IsEmailVerified
-	}
-	if user.Phone != nil {
-		converted.Phone = user.PhoneNumber
-		converted.IsPhoneVerified = user.IsPhoneVerified
-	}
-	if user.Address != nil {
-		converted.Country = user.Country
-		converted.Locality = user.Locality
-		converted.PostalCode = user.PostalCode
-		converted.Region = user.Region
-		converted.StreetAddress = user.StreetAddress
-	}
-	return converted
-}
-
 func orgStateFromModel(state org_model.OrgState) admin.OrgState {
 	switch state {
 	case org_model.OrgStateActive:
@@ -247,7 +174,7 @@ func orgQueryKeyToModel(key admin.OrgSearchKey) org_model.OrgSearchKey {
 	switch key {
 	case admin.OrgSearchKey_ORGSEARCHKEY_DOMAIN:
 		return org_model.OrgSearchKeyOrgDomain
-	case admin.OrgSearchKey_ORGSEARCHKEY_ORG_NAME:
+	case admin.OrgSearchKey_ORGSEARCHKEY_NAME:
 		return org_model.OrgSearchKeyOrgName
 	case admin.OrgSearchKey_ORGSEARCHKEY_STATE:
 		return org_model.OrgSearchKeyState
--- a/internal/api/grpc/admin/user_converter.go
+++ b/internal/api/grpc/admin/user_converter.go
@@ -0,0 +1,128 @@
+package admin
+
+import (
+	"github.com/caos/logging"
+	usr_model "github.com/caos/zitadel/internal/user/model"
+	"github.com/caos/zitadel/pkg/grpc/admin"
+	"github.com/golang/protobuf/ptypes"
+	"golang.org/x/text/language"
+)
+
+func userCreateRequestToModel(user *admin.CreateUserRequest) *usr_model.User {
+	var human *usr_model.Human
+	var machine *usr_model.Machine
+
+	if h := user.GetHuman(); h != nil {
+		human = humanCreateToModel(h)
+	}
+	if m := user.GetMachine(); m != nil {
+		machine = machineCreateToModel(m)
+	}
+
+	return &usr_model.User{
+		UserName: user.UserName,
+		Human:    human,
+		Machine:  machine,
+	}
+}
+
+func humanCreateToModel(u *admin.CreateHumanRequest) *usr_model.Human {
+	preferredLanguage, err := language.Parse(u.PreferredLanguage)
+	logging.Log("GRPC-1ouQc").OnError(err).Debug("language malformed")
+
+	human := &usr_model.Human{
+		Profile: &usr_model.Profile{
+			FirstName:         u.FirstName,
+			LastName:          u.LastName,
+			NickName:          u.NickName,
+			PreferredLanguage: preferredLanguage,
+			Gender:            genderToModel(u.Gender),
+		},
+		Email: &usr_model.Email{
+			EmailAddress:    u.Email,
+			IsEmailVerified: u.IsEmailVerified,
+		},
+		Address: &usr_model.Address{
+			Country:       u.Country,
+			Locality:      u.Locality,
+			PostalCode:    u.PostalCode,
+			Region:        u.Region,
+			StreetAddress: u.StreetAddress,
+		},
+	}
+	if u.Password != "" {
+		human.Password = &usr_model.Password{SecretString: u.Password}
+	}
+	if u.Phone != "" {
+		human.Phone = &usr_model.Phone{PhoneNumber: u.Phone, IsPhoneVerified: u.IsPhoneVerified}
+	}
+	return human
+}
+
+func machineCreateToModel(machine *admin.CreateMachineRequest) *usr_model.Machine {
+	return &usr_model.Machine{
+		Name:        machine.Name,
+		Description: machine.Description,
+	}
+}
+
+func userFromModel(user *usr_model.User) *admin.UserResponse {
+	creationDate, err := ptypes.TimestampProto(user.CreationDate)
+	logging.Log("GRPC-yo0FW").OnError(err).Debug("unable to parse timestamp")
+
+	changeDate, err := ptypes.TimestampProto(user.ChangeDate)
+	logging.Log("GRPC-jxoQr").OnError(err).Debug("unable to parse timestamp")
+
+	userResp := &admin.UserResponse{
+		Id:           user.AggregateID,
+		State:        userStateFromModel(user.State),
+		CreationDate: creationDate,
+		ChangeDate:   changeDate,
+		Sequence:     user.Sequence,
+		UserName:     user.UserName,
+	}
+
+	if user.Machine != nil {
+		userResp.User = &admin.UserResponse_Machine{Machine: machineFromModel(user.Machine)}
+	}
+	if user.Human != nil {
+		userResp.User = &admin.UserResponse_Human{Human: humanFromModel(user.Human)}
+	}
+
+	return userResp
+}
+
+func machineFromModel(account *usr_model.Machine) *admin.MachineResponse {
+	return &admin.MachineResponse{
+		Name:        account.Name,
+		Description: account.Description,
+	}
+}
+
+func humanFromModel(user *usr_model.Human) *admin.HumanResponse {
+	human := &admin.HumanResponse{
+		FirstName:         user.FirstName,
+		LastName:          user.LastName,
+		DisplayName:       user.DisplayName,
+		NickName:          user.NickName,
+		PreferredLanguage: user.PreferredLanguage.String(),
+		Gender:            genderFromModel(user.Gender),
+	}
+
+	if user.Email != nil {
+		human.Email = user.EmailAddress
+		human.IsEmailVerified = user.IsEmailVerified
+	}
+	if user.Phone != nil {
+		human.Phone = user.PhoneNumber
+		human.IsPhoneVerified = user.IsPhoneVerified
+	}
+	if user.Address != nil {
+		human.Country = user.Country
+		human.Locality = user.Locality
+		human.PostalCode = user.PostalCode
+		human.Region = user.Region
+		human.StreetAddress = user.StreetAddress
+	}
+	return human
+}
--- a/internal/api/grpc/auth/user_converter.go
+++ b/internal/api/grpc/auth/user_converter.go
@@ -27,37 +27,28 @@ func userViewFromModel(user *usr_model.UserView) *auth.UserView {
 	lastLogin, err := ptypes.TimestampProto(user.LastLogin)
 	logging.Log("GRPC-Gteh2").OnError(err).Debug("unable to parse timestamp")

-	passwordChanged, err := ptypes.TimestampProto(user.PasswordChanged)
-	logging.Log("GRPC-fgQFT").OnError(err).Debug("unable to parse timestamp")
-
-	return &auth.UserView{
+	userView := &auth.UserView{
 		Id:                 user.ID,
 		State:              userStateFromModel(user.State),
 		CreationDate:       creationDate,
 		ChangeDate:         changeDate,
 		LastLogin:          lastLogin,
-		PasswordChanged:    passwordChanged,
 		UserName:           user.UserName,
-		FirstName:          user.FirstName,
-		LastName:           user.LastName,
-		DisplayName:        user.DisplayName,
-		NickName:           user.NickName,
-		PreferredLanguage:  user.PreferredLanguage,
-		Gender:             genderFromModel(user.Gender),
-		Email:              user.Email,
-		IsEmailVerified:    user.IsEmailVerified,
-		Phone:              user.Phone,
-		IsPhoneVerified:    user.IsPhoneVerified,
-		Country:            user.Country,
-		Locality:           user.Locality,
-		PostalCode:         user.PostalCode,
-		Region:             user.Region,
-		StreetAddress:      user.StreetAddress,
 		Sequence:           user.Sequence,
 		ResourceOwner:      user.ResourceOwner,
 		LoginNames:         user.LoginNames,
 		PreferredLoginName: user.PreferredLoginName,
 	}
+
+	if user.HumanView != nil {
+		userView.User = &auth.UserView_Human{Human: humanViewFromModel(user.HumanView)}
+	}
+	if user.MachineView != nil {
+		userView.User = &auth.UserView_Machine{Machine: machineViewFromModel(user.MachineView)}
+
+	}
+
+	return userView
 }

 func profileFromModel(profile *usr_model.Profile) *auth.UserProfile {
@@ -72,7 +63,6 @@ func profileFromModel(profile *usr_model.Profile) *auth.UserProfile {
 		CreationDate:      creationDate,
 		ChangeDate:        changeDate,
 		Sequence:          profile.Sequence,
-		UserName:          profile.UserName,
 		FirstName:         profile.FirstName,
 		LastName:          profile.LastName,
 		DisplayName:       profile.DisplayName,
@@ -94,7 +84,6 @@ func profileViewFromModel(profile *usr_model.Profile) *auth.UserProfileView {
 		CreationDate:       creationDate,
 		ChangeDate:         changeDate,
 		Sequence:           profile.Sequence,
-		UserName:           profile.UserName,
 		FirstName:          profile.FirstName,
 		LastName:           profile.LastName,
 		DisplayName:        profile.DisplayName,
@@ -366,7 +355,7 @@ func userChangesToAPI(changes *usr_model.UserChanges) (_ []*auth.Change) {
 			EventType:  message.NewLocalizedEventType(change.EventType),
 			Sequence:   change.Sequence,
 			Data:       data,
-			EditorId:   change.ModifierId,
+			EditorId:   change.ModifierID,
 			Editor:     change.ModifierName,
 		}
 	}
--- a/internal/api/grpc/auth/user_human_converter.go
+++ b/internal/api/grpc/auth/user_human_converter.go
@@ -0,0 +1,32 @@
+package auth
+
+import (
+	"github.com/caos/logging"
+	usr_model "github.com/caos/zitadel/internal/user/model"
+	auth "github.com/caos/zitadel/pkg/grpc/auth"
+	"github.com/golang/protobuf/ptypes"
+)
+
+func humanViewFromModel(user *usr_model.HumanView) *auth.HumanView {
+	passwordChanged, err := ptypes.TimestampProto(user.PasswordChanged)
+	logging.Log("MANAG-h4ByY").OnError(err).Debug("unable to parse date")
+
+	return &auth.HumanView{
+		FirstName:         user.FirstName,
+		LastName:          user.LastName,
+		DisplayName:       user.DisplayName,
+		NickName:          user.NickName,
+		PreferredLanguage: user.PreferredLanguage,
+		Gender:            genderFromModel(user.Gender),
+		Email:             user.Email,
+		IsEmailVerified:   user.IsEmailVerified,
+		Phone:             user.Phone,
+		IsPhoneVerified:   user.IsPhoneVerified,
+		Country:           user.Country,
+		Locality:          user.Locality,
+		PostalCode:        user.PostalCode,
+		Region:            user.Region,
+		StreetAddress:     user.StreetAddress,
+		PasswordChanged:   passwordChanged,
+	}
+}
--- a/internal/api/grpc/auth/user_machine_converter.go
+++ b/internal/api/grpc/auth/user_machine_converter.go
@@ -0,0 +1,51 @@
+package auth
+
+import (
+	"github.com/caos/logging"
+	usr_model "github.com/caos/zitadel/internal/user/model"
+	"github.com/caos/zitadel/pkg/grpc/auth"
+	"github.com/golang/protobuf/ptypes"
+)
+
+func machineViewFromModel(machine *usr_model.MachineView) *auth.MachineView {
+	lastKeyAdded, err := ptypes.TimestampProto(machine.LastKeyAdded)
+	logging.Log("MANAG-wGcAQ").OnError(err).Debug("unable to parse date")
+	return &auth.MachineView{
+		Description:  machine.Description,
+		Name:         machine.Name,
+		LastKeyAdded: lastKeyAdded,
+	}
+}
+
+func machineKeyViewsFromModel(keys ...*usr_model.MachineKeyView) []*auth.MachineKeyView {
+	keyViews := make([]*auth.MachineKeyView, len(keys))
+	for i, key := range keys {
+		keyViews[i] = machineKeyViewFromModel(key)
+	}
+	return keyViews
+}
+
+func machineKeyViewFromModel(key *usr_model.MachineKeyView) *auth.MachineKeyView {
+	creationDate, err := ptypes.TimestampProto(key.CreationDate)
+	logging.Log("MANAG-gluk7").OnError(err).Debug("unable to parse timestamp")
+
+	expirationDate, err := ptypes.TimestampProto(key.CreationDate)
+	logging.Log("MANAG-gluk7").OnError(err).Debug("unable to parse timestamp")
+
+	return &auth.MachineKeyView{
+		Id:             key.ID,
+		CreationDate:   creationDate,
+		ExpirationDate: expirationDate,
+		Sequence:       key.Sequence,
+		Type:           machineKeyTypeFromModel(key.Type),
+	}
+}
+
+func machineKeyTypeFromModel(typ usr_model.MachineKeyType) auth.MachineKeyType {
+	switch typ {
+	case usr_model.MachineKeyTypeJSON:
+		return auth.MachineKeyType_MACHINEKEY_JSON
+	default:
+		return auth.MachineKeyType_MACHINEKEY_UNSPECIFIED
+	}
+}
--- a/internal/api/grpc/management/user.go
+++ b/internal/api/grpc/management/user.go
@@ -3,11 +3,10 @@ package management
 import (
 	"context"

-	"github.com/golang/protobuf/ptypes/empty"
-
 	"github.com/caos/zitadel/internal/api/authz"
 	"github.com/caos/zitadel/internal/errors"
 	"github.com/caos/zitadel/pkg/grpc/management"
+	"github.com/golang/protobuf/ptypes/empty"
 )

 func (s *Server) GetUserByID(ctx context.Context, id *management.UserID) (*management.UserView, error) {
@@ -52,7 +51,7 @@ func (s *Server) IsUserUnique(ctx context.Context, request *management.UniqueUse
 	return &management.UniqueUserResponse{IsUnique: unique}, nil
 }

-func (s *Server) CreateUser(ctx context.Context, in *management.CreateUserRequest) (*management.User, error) {
+func (s *Server) CreateUser(ctx context.Context, in *management.CreateUserRequest) (*management.UserResponse, error) {
 	user, err := s.user.CreateUser(ctx, userCreateToModel(in))
 	if err != nil {
 		return nil, err
@@ -60,7 +59,7 @@ func (s *Server) CreateUser(ctx context.Context, in *management.CreateUserReques
 	return userFromModel(user), nil
 }

-func (s *Server) DeactivateUser(ctx context.Context, in *management.UserID) (*management.User, error) {
+func (s *Server) DeactivateUser(ctx context.Context, in *management.UserID) (*management.UserResponse, error) {
 	user, err := s.user.DeactivateUser(ctx, in.Id)
 	if err != nil {
 		return nil, err
@@ -68,7 +67,7 @@ func (s *Server) DeactivateUser(ctx context.Context, in *management.UserID) (*ma
 	return userFromModel(user), nil
 }

-func (s *Server) ReactivateUser(ctx context.Context, in *management.UserID) (*management.User, error) {
+func (s *Server) ReactivateUser(ctx context.Context, in *management.UserID) (*management.UserResponse, error) {
 	user, err := s.user.ReactivateUser(ctx, in.Id)
 	if err != nil {
 		return nil, err
@@ -76,7 +75,7 @@ func (s *Server) ReactivateUser(ctx context.Context, in *management.UserID) (*ma
 	return userFromModel(user), nil
 }

-func (s *Server) LockUser(ctx context.Context, in *management.UserID) (*management.User, error) {
+func (s *Server) LockUser(ctx context.Context, in *management.UserID) (*management.UserResponse, error) {
 	user, err := s.user.LockUser(ctx, in.Id)
 	if err != nil {
 		return nil, err
@@ -84,7 +83,7 @@ func (s *Server) LockUser(ctx context.Context, in *management.UserID) (*manageme
 	return userFromModel(user), nil
 }

-func (s *Server) UnlockUser(ctx context.Context, in *management.UserID) (*management.User, error) {
+func (s *Server) UnlockUser(ctx context.Context, in *management.UserID) (*management.UserResponse, error) {
 	user, err := s.user.UnlockUser(ctx, in.Id)
 	if err != nil {
 		return nil, err
@@ -96,6 +95,14 @@ func (s *Server) DeleteUser(ctx context.Context, in *management.UserID) (*empty.
 	return nil, errors.ThrowUnimplemented(nil, "GRPC-as4fg", "Not implemented")
 }

+func (s *Server) UpdateUserMachine(ctx context.Context, in *management.UpdateMachineRequest) (*management.MachineResponse, error) {
+	machine, err := s.user.ChangeMachine(ctx, updateMachineToModel(in))
+	if err != nil {
+		return nil, err
+	}
+	return machineFromModel(machine), nil
+}
+
 func (s *Server) GetUserProfile(ctx context.Context, in *management.UserID) (*management.UserProfileView, error) {
 	profile, err := s.user.ProfileByID(ctx, in.Id)
 	if err != nil {
--- a/internal/api/grpc/management/user_converter.go
+++ b/internal/api/grpc/management/user_converter.go
@@ -15,77 +15,48 @@ import (
 	"github.com/caos/zitadel/pkg/grpc/message"
 )

-func userFromModel(user *usr_model.User) *management.User {
+func userFromModel(user *usr_model.User) *management.UserResponse {
 	creationDate, err := ptypes.TimestampProto(user.CreationDate)
 	logging.Log("GRPC-8duwe").OnError(err).Debug("unable to parse timestamp")

 	changeDate, err := ptypes.TimestampProto(user.ChangeDate)
 	logging.Log("GRPC-ckoe3d").OnError(err).Debug("unable to parse timestamp")

-	converted := &management.User{
-		Id:                user.AggregateID,
-		State:             userStateFromModel(user.State),
-		CreationDate:      creationDate,
-		ChangeDate:        changeDate,
-		Sequence:          user.Sequence,
-		UserName:          user.UserName,
-		FirstName:         user.FirstName,
-		LastName:          user.LastName,
-		DisplayName:       user.DisplayName,
-		NickName:          user.NickName,
-		PreferredLanguage: user.PreferredLanguage.String(),
-		Gender:            genderFromModel(user.Gender),
+	userResp := &management.UserResponse{
+		Id:           user.AggregateID,
+		State:        userStateFromModel(user.State),
+		CreationDate: creationDate,
+		ChangeDate:   changeDate,
+		Sequence:     user.Sequence,
+		UserName:     user.UserName,
 	}
-	if user.Email != nil {
-		converted.Email = user.EmailAddress
-		converted.IsEmailVerified = user.IsEmailVerified
+
+	if user.Machine != nil {
+		userResp.User = &management.UserResponse_Machine{Machine: machineFromModel(user.Machine)}
 	}
-	if user.Phone != nil {
-		converted.Phone = user.PhoneNumber
-		converted.IsPhoneVerified = user.IsPhoneVerified
+	if user.Human != nil {
+		userResp.User = &management.UserResponse_Human{Human: humanFromModel(user.Human)}
 	}
-	if user.Address != nil {
-		converted.Country = user.Country
-		converted.Locality = user.Locality
-		converted.PostalCode = user.PostalCode
-		converted.Region = user.Region
-		converted.StreetAddress = user.StreetAddress
-	}
-	return converted
+
+	return userResp
 }

-func userCreateToModel(u *management.CreateUserRequest) *usr_model.User {
-	preferredLanguage, err := language.Parse(u.PreferredLanguage)
-	logging.Log("GRPC-cK5k2").OnError(err).Debug("language malformed")
+func userCreateToModel(user *management.CreateUserRequest) *usr_model.User {
+	var human *usr_model.Human
+	var machine *usr_model.Machine

-	user := &usr_model.User{
-		Profile: &usr_model.Profile{
-			UserName:          u.UserName,
-			FirstName:         u.FirstName,
-			LastName:          u.LastName,
-			NickName:          u.NickName,
-			PreferredLanguage: preferredLanguage,
-			Gender:            genderToModel(u.Gender),
-		},
-		Email: &usr_model.Email{
-			EmailAddress:    u.Email,
-			IsEmailVerified: u.IsEmailVerified,
-		},
-		Address: &usr_model.Address{
-			Country:       u.Country,
-			Locality:      u.Locality,
-			PostalCode:    u.PostalCode,
-			Region:        u.Region,
-			StreetAddress: u.StreetAddress,
-		},
+	if h := user.GetHuman(); h != nil {
+		human = humanCreateToModel(h)
 	}
-	if u.Password != "" {
-		user.Password = &usr_model.Password{SecretString: u.Password}
+	if m := user.GetMachine(); m != nil {
+		machine = machineCreateToModel(m)
 	}
-	if u.Phone != "" {
-		user.Phone = &usr_model.Phone{PhoneNumber: u.Phone, IsPhoneVerified: u.IsPhoneVerified}
+
+	return &usr_model.User{
+		UserName: user.UserName,
+		Human:    human,
+		Machine:  machine,
 	}
-	return user
 }

 func passwordRequestToModel(r *management.PasswordRequest) *usr_model.Password {
@@ -135,6 +106,8 @@ func userSearchKeyToModel(key management.UserSearchKey) usr_model.UserSearchKey
 		return usr_model.UserSearchKeyEmail
 	case management.UserSearchKey_USERSEARCHKEY_STATE:
 		return usr_model.UserSearchKeyState
+	case management.UserSearchKey_USERSEARCHKEY_TYPE:
+		return usr_model.UserSearchKeyType
 	default:
 		return usr_model.UserSearchKeyUnspecified
 	}
@@ -187,7 +160,6 @@ func profileFromModel(profile *usr_model.Profile) *management.UserProfile {
 		CreationDate:      creationDate,
 		ChangeDate:        changeDate,
 		Sequence:          profile.Sequence,
-		UserName:          profile.UserName,
 		FirstName:         profile.FirstName,
 		LastName:          profile.LastName,
 		DisplayName:       profile.DisplayName,
@@ -209,7 +181,6 @@ func profileViewFromModel(profile *usr_model.Profile) *management.UserProfileVie
 		CreationDate:       creationDate,
 		ChangeDate:         changeDate,
 		Sequence:           profile.Sequence,
-		UserName:           profile.UserName,
 		FirstName:          profile.FirstName,
 		LastName:           profile.LastName,
 		DisplayName:        profile.DisplayName,
@@ -400,37 +371,26 @@ func userViewFromModel(user *usr_model.UserView) *management.UserView {
 	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 &management.UserView{
+	userView := &management.UserView{
 		Id:                 user.ID,
 		State:              userStateFromModel(user.State),
 		CreationDate:       creationDate,
 		ChangeDate:         changeDate,
 		LastLogin:          lastLogin,
-		PasswordChanged:    passwordChanged,
-		UserName:           user.UserName,
-		FirstName:          user.FirstName,
-		LastName:           user.LastName,
-		DisplayName:        user.DisplayName,
-		NickName:           user.NickName,
-		PreferredLanguage:  user.PreferredLanguage,
-		Gender:             genderFromModel(user.Gender),
-		Email:              user.Email,
-		IsEmailVerified:    user.IsEmailVerified,
-		Phone:              user.Phone,
-		IsPhoneVerified:    user.IsPhoneVerified,
-		Country:            user.Country,
-		Locality:           user.Locality,
-		PostalCode:         user.PostalCode,
-		Region:             user.Region,
-		StreetAddress:      user.StreetAddress,
 		Sequence:           user.Sequence,
 		ResourceOwner:      user.ResourceOwner,
 		LoginNames:         user.LoginNames,
 		PreferredLoginName: user.PreferredLoginName,
+		UserName:           user.UserName,
 	}
+	if user.HumanView != nil {
+		userView.User = &management.UserView_Human{Human: humanViewFromModel(user.HumanView)}
+	}
+	if user.MachineView != nil {
+		userView.User = &management.UserView_Machine{Machine: machineViewFromModel(user.MachineView)}
+
+	}
+	return userView
 }

 func userMembershipSearchResponseFromModel(response *usr_model.UserMembershipSearchResponse) *management.UserMembershipSearchResponse {
@@ -603,7 +563,7 @@ func userChangesToMgtAPI(changes *usr_model.UserChanges) (_ []*management.Change
 			EventType:  message.NewLocalizedEventType(change.EventType),
 			Sequence:   change.Sequence,
 			Data:       data,
-			EditorId:   change.ModifierId,
+			EditorId:   change.ModifierID,
 			Editor:     change.ModifierName,
 		}
 	}
--- a/internal/api/grpc/management/user_grant_converter.go
+++ b/internal/api/grpc/management/user_grant_converter.go
@@ -28,14 +28,6 @@ func usergrantFromModel(grant *grant_model.UserGrant) *management.UserGrant {
 	}
 }

-func userGrantCreateBulkToModel(u *management.UserGrantCreateBulk) []*grant_model.UserGrant {
-	grants := make([]*grant_model.UserGrant, len(u.UserGrants))
-	for i, grant := range u.UserGrants {
-		grants[i] = userGrantCreateToModel(grant)
-	}
-	return grants
-}
-
 func userGrantCreateToModel(u *management.UserGrantCreate) *grant_model.UserGrant {
 	return &grant_model.UserGrant{
 		ObjectRoot: models.ObjectRoot{AggregateID: u.UserId},
@@ -46,14 +38,6 @@ func userGrantCreateToModel(u *management.UserGrantCreate) *grant_model.UserGran
 	}
 }

-func userGrantUpdateBulkToModel(u *management.UserGrantUpdateBulk) []*grant_model.UserGrant {
-	grants := make([]*grant_model.UserGrant, len(u.UserGrants))
-	for i, grant := range u.UserGrants {
-		grants[i] = userGrantUpdateToModel(grant)
-	}
-	return grants
-}
-
 func userGrantUpdateToModel(u *management.UserGrantUpdate) *grant_model.UserGrant {
 	return &grant_model.UserGrant{
 		ObjectRoot: models.ObjectRoot{AggregateID: u.Id},
@@ -171,19 +155,3 @@ func usergrantStateFromModel(state grant_model.UserGrantState) management.UserGr
 		return management.UserGrantState_USERGRANTSTATE_UNSPECIFIED
 	}
 }
-
-func projectUserGrantSearchRequestsToModel(project *management.ProjectUserGrantSearchRequest) *grant_model.UserGrantSearchRequest {
-	return &grant_model.UserGrantSearchRequest{
-		Offset:  project.Offset,
-		Limit:   project.Limit,
-		Queries: userGrantSearchQueriesToModel(project.Queries),
-	}
-}
-
-func projectGrantUserGrantSearchRequestsToModel(project *management.ProjectGrantUserGrantSearchRequest) *grant_model.UserGrantSearchRequest {
-	return &grant_model.UserGrantSearchRequest{
-		Offset:  project.Offset,
-		Limit:   project.Limit,
-		Queries: userGrantSearchQueriesToModel(project.Queries),
-	}
-}
--- a/internal/api/grpc/management/user_human_converter.go
+++ b/internal/api/grpc/management/user_human_converter.go
@@ -0,0 +1,94 @@
+package management
+
+import (
+	"github.com/caos/logging"
+	usr_model "github.com/caos/zitadel/internal/user/model"
+	"github.com/caos/zitadel/pkg/grpc/management"
+	"github.com/golang/protobuf/ptypes"
+	"golang.org/x/text/language"
+)
+
+func humanFromModel(user *usr_model.Human) *management.HumanResponse {
+	human := &management.HumanResponse{
+		FirstName:         user.FirstName,
+		LastName:          user.LastName,
+		DisplayName:       user.DisplayName,
+		NickName:          user.NickName,
+		PreferredLanguage: user.PreferredLanguage.String(),
+		Gender:            genderFromModel(user.Gender),
+	}
+
+	if user.Email != nil {
+		human.Email = user.EmailAddress
+		human.IsEmailVerified = user.IsEmailVerified
+	}
+	if user.Phone != nil {
+		human.Phone = user.PhoneNumber
+		human.IsPhoneVerified = user.IsPhoneVerified
+	}
+	if user.Address != nil {
+		human.Country = user.Country
+		human.Locality = user.Locality
+		human.PostalCode = user.PostalCode
+		human.Region = user.Region
+		human.StreetAddress = user.StreetAddress
+	}
+	return human
+}
+
+func humanViewFromModel(user *usr_model.HumanView) *management.HumanView {
+	passwordChanged, err := ptypes.TimestampProto(user.PasswordChanged)
+	logging.Log("MANAG-h4ByY").OnError(err).Debug("unable to parse date")
+
+	return &management.HumanView{
+		FirstName:         user.FirstName,
+		LastName:          user.LastName,
+		DisplayName:       user.DisplayName,
+		NickName:          user.NickName,
+		PreferredLanguage: user.PreferredLanguage,
+		Gender:            genderFromModel(user.Gender),
+		Email:             user.Email,
+		IsEmailVerified:   user.IsEmailVerified,
+		Phone:             user.Phone,
+		IsPhoneVerified:   user.IsPhoneVerified,
+		Country:           user.Country,
+		Locality:          user.Locality,
+		PostalCode:        user.PostalCode,
+		Region:            user.Region,
+		StreetAddress:     user.StreetAddress,
+		PasswordChanged:   passwordChanged,
+	}
+}
+
+func humanCreateToModel(u *management.CreateHumanRequest) *usr_model.Human {
+	preferredLanguage, err := language.Parse(u.PreferredLanguage)
+	logging.Log("GRPC-cK5k2").OnError(err).Debug("language malformed")
+
+	human := &usr_model.Human{
+		Profile: &usr_model.Profile{
+			FirstName:         u.FirstName,
+			LastName:          u.LastName,
+			NickName:          u.NickName,
+			PreferredLanguage: preferredLanguage,
+			Gender:            genderToModel(u.Gender),
+		},
+		Email: &usr_model.Email{
+			EmailAddress:    u.Email,
+			IsEmailVerified: u.IsEmailVerified,
+		},
+		Address: &usr_model.Address{
+			Country:       u.Country,
+			Locality:      u.Locality,
+			PostalCode:    u.PostalCode,
+			Region:        u.Region,
+			StreetAddress: u.StreetAddress,
+		},
+	}
+	if u.Password != "" {
+		human.Password = &usr_model.Password{SecretString: u.Password}
+	}
+	if u.Phone != "" {
+		human.Phone = &usr_model.Phone{PhoneNumber: u.Phone, IsPhoneVerified: u.IsPhoneVerified}
+	}
+	return human
+}
--- a/internal/api/grpc/management/user_machine.go
+++ b/internal/api/grpc/management/user_machine.go
@@ -0,0 +1,37 @@
+package management
+
+import (
+	"context"
+
+	"github.com/caos/zitadel/pkg/grpc/management"
+	"github.com/golang/protobuf/ptypes/empty"
+)
+
+func (s *Server) AddMachineKey(ctx context.Context, req *management.AddMachineKeyRequest) (*management.AddMachineKeyResponse, error) {
+	key, err := s.user.AddMachineKey(ctx, addMachineKeyToModel(req))
+	if err != nil {
+		return nil, err
+	}
+	return addMachineKeyFromModel(key), nil
+}
+
+func (s *Server) DeleteMachineKey(ctx context.Context, req *management.MachineKeyIDRequest) (*empty.Empty, error) {
+	err := s.user.RemoveMachineKey(ctx, req.UserId, req.KeyId)
+	return &empty.Empty{}, err
+}
+
+func (s *Server) GetMachineKey(ctx context.Context, req *management.MachineKeyIDRequest) (*management.MachineKeyView, error) {
+	key, err := s.user.GetMachineKey(ctx, req.UserId, req.KeyId)
+	if err != nil {
+		return nil, err
+	}
+	return machineKeyViewFromModel(key), nil
+}
+
+func (s *Server) SearchMachineKeys(ctx context.Context, req *management.MachineKeySearchRequest) (*management.MachineKeySearchResponse, error) {
+	result, err := s.user.SearchMachineKeys(ctx, machineKeySearchRequestToModel(req))
+	if err != nil {
+		return nil, err
+	}
+	return machineKeySearchResponseFromModel(result), nil
+}
--- a/internal/api/grpc/management/user_machine_converter.go
+++ b/internal/api/grpc/management/user_machine_converter.go
@@ -0,0 +1,160 @@
+package management
+
+import (
+	"encoding/json"
+	"time"
+
+	"github.com/caos/logging"
+	"github.com/caos/zitadel/internal/eventstore/models"
+	"github.com/caos/zitadel/internal/model"
+	usr_model "github.com/caos/zitadel/internal/user/model"
+	"github.com/caos/zitadel/pkg/grpc/management"
+	"github.com/golang/protobuf/ptypes"
+)
+
+func machineCreateToModel(machine *management.CreateMachineRequest) *usr_model.Machine {
+	return &usr_model.Machine{
+		Name:        machine.Name,
+		Description: machine.Description,
+	}
+}
+
+func updateMachineToModel(machine *management.UpdateMachineRequest) *usr_model.Machine {
+	return &usr_model.Machine{
+		ObjectRoot:  models.ObjectRoot{AggregateID: machine.Id},
+		Description: machine.Description,
+	}
+}
+
+func machineFromModel(account *usr_model.Machine) *management.MachineResponse {
+	return &management.MachineResponse{
+		Name:        account.Name,
+		Description: account.Description,
+	}
+}
+
+func machineViewFromModel(machine *usr_model.MachineView) *management.MachineView {
+	lastKeyAdded, err := ptypes.TimestampProto(machine.LastKeyAdded)
+	logging.Log("MANAG-wGcAQ").OnError(err).Debug("unable to parse date")
+	return &management.MachineView{
+		Description:  machine.Description,
+		Name:         machine.Name,
+		LastKeyAdded: lastKeyAdded,
+	}
+}
+
+func machineKeyViewsFromModel(keys ...*usr_model.MachineKeyView) []*management.MachineKeyView {
+	keyViews := make([]*management.MachineKeyView, len(keys))
+	for i, key := range keys {
+		keyViews[i] = machineKeyViewFromModel(key)
+	}
+	return keyViews
+}
+
+func machineKeyViewFromModel(key *usr_model.MachineKeyView) *management.MachineKeyView {
+	creationDate, err := ptypes.TimestampProto(key.CreationDate)
+	logging.Log("MANAG-gluk7").OnError(err).Debug("unable to parse timestamp")
+
+	expirationDate, err := ptypes.TimestampProto(key.ExpirationDate)
+	logging.Log("MANAG-gluk7").OnError(err).Debug("unable to parse timestamp")
+
+	return &management.MachineKeyView{
+		Id:             key.ID,
+		CreationDate:   creationDate,
+		ExpirationDate: expirationDate,
+		Sequence:       key.Sequence,
+		Type:           machineKeyTypeFromModel(key.Type),
+	}
+}
+
+func addMachineKeyToModel(key *management.AddMachineKeyRequest) *usr_model.MachineKey {
+	expirationDate := time.Time{}
+	if key.ExpirationDate != nil {
+		var err error
+		expirationDate, err = ptypes.Timestamp(key.ExpirationDate)
+		logging.Log("MANAG-iNshR").OnError(err).Debug("unable to parse expiration date")
+	}
+
+	return &usr_model.MachineKey{
+		ExpirationDate: expirationDate,
+		Type:           machineKeyTypeToModel(key.Type),
+		ObjectRoot:     models.ObjectRoot{AggregateID: key.UserId},
+	}
+}
+
+func addMachineKeyFromModel(key *usr_model.MachineKey) *management.AddMachineKeyResponse {
+	creationDate, err := ptypes.TimestampProto(key.CreationDate)
+	logging.Log("MANAG-dlb8m").OnError(err).Debug("unable to parse cretaion date")
+
+	expirationDate, err := ptypes.TimestampProto(key.ExpirationDate)
+	logging.Log("MANAG-dlb8m").OnError(err).Debug("unable to parse cretaion date")
+
+	detail, err := json.Marshal(struct {
+		Type   string `json:"type"`
+		KeyID  string `json:"keyId"`
+		Key    []byte `json:"key"`
+		UserID string `json:"userId"`
+	}{
+		Type:   "serviceaccount",
+		KeyID:  key.KeyID,
+		Key:    key.PrivateKey,
+		UserID: key.AggregateID,
+	})
+	logging.Log("MANAG-lFQ2g").OnError(err).Warn("unable to marshall key")
+
+	return &management.AddMachineKeyResponse{
+		Id:             key.KeyID,
+		CreationDate:   creationDate,
+		ExpirationDate: expirationDate,
+		Sequence:       key.Sequence,
+		KeyDetails:     detail,
+		Type:           machineKeyTypeFromModel(key.Type),
+	}
+}
+
+func machineKeyTypeToModel(typ management.MachineKeyType) usr_model.MachineKeyType {
+	switch typ {
+	case management.MachineKeyType_MACHINEKEY_JSON:
+		return usr_model.MachineKeyTypeJSON
+	default:
+		return usr_model.MachineKeyTypeNONE
+	}
+}
+
+func machineKeyTypeFromModel(typ usr_model.MachineKeyType) management.MachineKeyType {
+	switch typ {
+	case usr_model.MachineKeyTypeJSON:
+		return management.MachineKeyType_MACHINEKEY_JSON
+	default:
+		return management.MachineKeyType_MACHINEKEY_UNSPECIFIED
+	}
+}
+
+func machineKeySearchRequestToModel(req *management.MachineKeySearchRequest) *usr_model.MachineKeySearchRequest {
+	return &usr_model.MachineKeySearchRequest{
+		Offset: req.Offset,
+		Limit:  req.Limit,
+		Asc:    req.Asc,
+		Queries: []*usr_model.MachineKeySearchQuery{
+			{
+				Key:    usr_model.MachineKeyKeyUserID,
+				Method: model.SearchMethodEquals,
+				Value:  req.UserId,
+			},
+		},
+	}
+}
+
+func machineKeySearchResponseFromModel(req *usr_model.MachineKeySearchResponse) *management.MachineKeySearchResponse {
+	viewTimestamp, err := ptypes.TimestampProto(req.Timestamp)
+	logging.Log("MANAG-Sk9ds").OnError(err).Debug("unable to parse cretaion date")
+
+	return &management.MachineKeySearchResponse{
+		Offset:            req.Offset,
+		Limit:             req.Limit,
+		TotalResult:       req.TotalResult,
+		ProcessedSequence: req.Sequence,
+		ViewTimestamp:     viewTimestamp,
+		Result:            machineKeyViewsFromModel(req.Result...),
+	}
+}
--- a/internal/api/grpc/server/middleware/validation_interceptor.go
+++ b/internal/api/grpc/server/middleware/validation_interceptor.go
@@ -0,0 +1,31 @@
+package middleware
+
+import (
+	"context"
+
+	"google.golang.org/grpc"
+
+	_ "github.com/caos/zitadel/internal/statik"
+)
+
+func ValidationHandler() grpc.UnaryServerInterceptor {
+	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+		return validate(ctx, req, info, handler)
+	}
+}
+
+type validator interface {
+	Validate() error
+}
+
+func validate(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
+	validate, ok := req.(validator)
+	if !ok {
+		return handler(ctx, req)
+	}
+	err := validate.Validate()
+	if err != nil {
+		return nil, err
+	}
+	return handler(ctx, req)
+}
--- a/internal/api/grpc/server/server.go
+++ b/internal/api/grpc/server/server.go
@@ -33,6 +33,7 @@ func CreateServer(verifier *authz.TokenVerifier, authConfig authz.Config, lang l
 				middleware.ErrorHandler(),
 				middleware.AuthorizationInterceptor(verifier, authConfig),
 				middleware.TranslationHandler(lang),
+				middleware.ValidationHandler(),
 			),
 		),
 	)