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-12 03:57:32 +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/user/model/machine_key.go
+++ b/internal/user/model/machine_key.go
@@ -0,0 +1,53 @@
+package model
+
+import (
+	"time"
+
+	"github.com/caos/zitadel/internal/model"
+)
+
+type MachineKeyView struct {
+	ID             string
+	UserID         string
+	Type           MachineKeyType
+	Sequence       uint64
+	CreationDate   time.Time
+	ExpirationDate time.Time
+}
+
+type MachineKeySearchRequest struct {
+	Offset        uint64
+	Limit         uint64
+	SortingColumn MachineKeySearchKey
+	Asc           bool
+	Queries       []*MachineKeySearchQuery
+}
+
+type MachineKeySearchKey int32
+
+const (
+	MachineKeyKeyUnspecified MachineKeySearchKey = iota
+	MachineKeyKeyID
+	MachineKeyKeyUserID
+)
+
+type MachineKeySearchQuery struct {
+	Key    MachineKeySearchKey
+	Method model.SearchMethod
+	Value  interface{}
+}
+
+type MachineKeySearchResponse struct {
+	Offset      uint64
+	Limit       uint64
+	TotalResult uint64
+	Result      []*MachineKeyView
+	Sequence    uint64
+	Timestamp   time.Time
+}
+
+func (r *MachineKeySearchRequest) EnsureLimit(limit uint64) {
+	if r.Limit == 0 || r.Limit > limit {
+		r.Limit = limit
+	}
+}
--- a/internal/user/model/profile.go
+++ b/internal/user/model/profile.go
@@ -8,7 +8,6 @@ import (
 type Profile struct {
 	es_models.ObjectRoot

-	UserName           string
 	FirstName          string
 	LastName           string
 	NickName           string
--- a/internal/user/model/user.go
+++ b/internal/user/model/user.go
@@ -1,51 +1,21 @@
 package model

 import (
-	caos_errors "github.com/caos/zitadel/internal/errors"
-	org_model "github.com/caos/zitadel/internal/org/model"
-	policy_model "github.com/caos/zitadel/internal/policy/model"
-	"github.com/golang/protobuf/ptypes/timestamp"
 	"strings"
-	"time"

-	"github.com/caos/zitadel/internal/crypto"
+	caos_errors "github.com/caos/zitadel/internal/errors"
 	es_models "github.com/caos/zitadel/internal/eventstore/models"
+	org_model "github.com/caos/zitadel/internal/org/model"
+	"github.com/golang/protobuf/ptypes/timestamp"
 )

 type User struct {
 	es_models.ObjectRoot
+	State    UserState
+	UserName string

-	State UserState
-	*Password
-	*Profile
-	*Email
-	*Phone
-	*Address
-	InitCode     *InitUserCode
-	EmailCode    *EmailCode
-	PhoneCode    *PhoneCode
-	PasswordCode *PasswordCode
-	OTP          *OTP
-}
-type UserChanges struct {
-	Changes      []*UserChange
-	LastSequence uint64
-}
-
-type UserChange struct {
-	ChangeDate   *timestamp.Timestamp `json:"changeDate,omitempty"`
-	EventType    string               `json:"eventType,omitempty"`
-	Sequence     uint64               `json:"sequence,omitempty"`
-	ModifierId   string               `json:"modifierUser,omitempty"`
-	ModifierName string               `json:"-"`
-	Data         interface{}          `json:"data,omitempty"`
-}
-
-type InitUserCode struct {
-	es_models.ObjectRoot
-
-	Code   *crypto.CryptoValue
-	Expiry time.Duration
+	*Human
+	*Machine
 }

 type UserState int32
@@ -60,15 +30,6 @@ const (
 	UserStateInitial
 )

-type Gender int32
-
-const (
-	GenderUnspecified Gender = iota
-	GenderFemale
-	GenderMale
-	GenderDiverse
-)
-
 func (u *User) CheckOrgIAMPolicy(policy *org_model.OrgIAMPolicy) error {
 	if policy == nil {
 		return caos_errors.ThrowPreconditionFailed(nil, "MODEL-zSH7j", "Errors.Users.OrgIamPolicyNil")
@@ -88,12 +49,18 @@ func (u *User) SetNamesAsDisplayname() {
 	}
 }

-func (u *User) IsValid() bool {
-	return u.Profile != nil && u.FirstName != "" && u.LastName != "" && u.UserName != "" && u.Email != nil && u.Email.IsValid() && u.Phone == nil || (u.Phone != nil && u.Phone.IsValid())
+type UserChanges struct {
+	Changes      []*UserChange
+	LastSequence uint64
 }

-func (u *User) IsInitialState() bool {
-	return u.Email == nil || !u.IsEmailVerified || u.Password == nil || u.SecretString == ""
+type UserChange struct {
+	ChangeDate   *timestamp.Timestamp `json:"changeDate,omitempty"`
+	EventType    string               `json:"eventType,omitempty"`
+	Sequence     uint64               `json:"sequence,omitempty"`
+	ModifierID   string               `json:"modifierUser,omitempty"`
+	ModifierName string               `json:"-"`
+	Data         interface{}          `json:"data,omitempty"`
 }

 func (u *User) IsActive() bool {
@@ -112,47 +79,25 @@ func (u *User) IsLocked() bool {
 	return u.State == UserStateLocked
 }

-func (u *User) IsOTPReady() bool {
-	return u.OTP != nil && u.OTP.State == MfaStateReady
+func (u *User) IsValid() bool {
+	if u.Human == nil && u.Machine == nil || u.UserName == "" {
+		return false
+	}
+	if u.Human != nil {
+		return u.Human.IsValid()
+	}
+	return u.Machine.IsValid()
 }

-func (u *User) HashPasswordIfExisting(policy *policy_model.PasswordComplexityPolicy, passwordAlg crypto.HashAlgorithm, onetime bool) error {
-	if u.Password != nil {
-		return u.Password.HashPasswordIfExisting(policy, passwordAlg, onetime)
+func (u *User) CheckOrgIamPolicy(policy *org_model.OrgIAMPolicy) error {
+	if policy == nil {
+		return caos_errors.ThrowPreconditionFailed(nil, "MODEL-zSH7j", "Errors.Users.OrgIamPolicyNil")
+	}
+	if policy.UserLoginMustBeDomain && strings.Contains(u.UserName, "@") {
+		return caos_errors.ThrowPreconditionFailed(nil, "MODEL-se4sJ", "Errors.User.EmailAsUsernameNotAllowed")
+	}
+	if !policy.UserLoginMustBeDomain && u.Profile != nil && u.UserName == "" && u.Email != nil {
+		u.UserName = u.EmailAddress
 	}
 	return nil
 }
-
-func (u *User) GenerateInitCodeIfNeeded(initGenerator crypto.Generator) error {
-	if !u.IsInitialState() {
-		return nil
-	}
-	u.InitCode = new(InitUserCode)
-	return u.InitCode.GenerateInitUserCode(initGenerator)
-}
-
-func (u *User) GeneratePhoneCodeIfNeeded(phoneGenerator crypto.Generator) error {
-	if u.Phone == nil || u.IsPhoneVerified {
-		return nil
-	}
-	u.PhoneCode = new(PhoneCode)
-	return u.PhoneCode.GeneratePhoneCode(phoneGenerator)
-}
-
-func (u *User) GenerateEmailCodeIfNeeded(emailGenerator crypto.Generator) error {
-	if u.Email == nil || u.IsEmailVerified {
-		return nil
-	}
-	u.EmailCode = new(EmailCode)
-	return u.EmailCode.GenerateEmailCode(emailGenerator)
-}
-
-func (init *InitUserCode) GenerateInitUserCode(generator crypto.Generator) error {
-	initCodeCrypto, _, err := crypto.NewCode(generator)
-	if err != nil {
-		return err
-	}
-	init.Code = initCodeCrypto
-	init.Expiry = generator.Expiry()
-	return nil
-}
--- a/internal/user/model/user_human.go
+++ b/internal/user/model/user_human.go
@@ -0,0 +1,98 @@
+package model
+
+import (
+	"time"
+
+	policy_model "github.com/caos/zitadel/internal/policy/model"
+
+	"github.com/caos/zitadel/internal/crypto"
+	es_models "github.com/caos/zitadel/internal/eventstore/models"
+)
+
+type Human struct {
+	*Password
+	*Profile
+	*Email
+	*Phone
+	*Address
+	InitCode     *InitUserCode
+	EmailCode    *EmailCode
+	PhoneCode    *PhoneCode
+	PasswordCode *PasswordCode
+	OTP          *OTP
+}
+
+type InitUserCode struct {
+	es_models.ObjectRoot
+
+	Code   *crypto.CryptoValue
+	Expiry time.Duration
+}
+
+type Gender int32
+
+const (
+	GenderUnspecified Gender = iota
+	GenderFemale
+	GenderMale
+	GenderDiverse
+)
+
+func (u *Human) SetNamesAsDisplayname() {
+	if u.Profile != nil && u.DisplayName == "" && u.FirstName != "" && u.LastName != "" {
+		u.DisplayName = u.FirstName + " " + u.LastName
+	}
+}
+
+func (u *Human) IsValid() bool {
+	return u.Profile != nil && u.FirstName != "" && u.LastName != "" && u.Email != nil && u.Email.IsValid() && u.Phone == nil || (u.Phone != nil && u.Phone.IsValid())
+}
+
+func (u *Human) IsInitialState() bool {
+	return u.Email == nil || !u.IsEmailVerified || u.Password == nil || u.SecretString == ""
+}
+
+func (u *Human) IsOTPReady() bool {
+	return u.OTP != nil && u.OTP.State == MfaStateReady
+}
+
+func (u *Human) HashPasswordIfExisting(policy *policy_model.PasswordComplexityPolicy, passwordAlg crypto.HashAlgorithm, onetime bool) error {
+	if u.Password != nil {
+		return u.Password.HashPasswordIfExisting(policy, passwordAlg, onetime)
+	}
+	return nil
+}
+
+func (u *Human) GenerateInitCodeIfNeeded(initGenerator crypto.Generator) error {
+	if !u.IsInitialState() {
+		return nil
+	}
+	u.InitCode = new(InitUserCode)
+	return u.InitCode.GenerateInitUserCode(initGenerator)
+}
+
+func (u *Human) GeneratePhoneCodeIfNeeded(phoneGenerator crypto.Generator) error {
+	if u.Phone == nil || u.IsPhoneVerified {
+		return nil
+	}
+	u.PhoneCode = new(PhoneCode)
+	return u.PhoneCode.GeneratePhoneCode(phoneGenerator)
+}
+
+func (u *Human) GenerateEmailCodeIfNeeded(emailGenerator crypto.Generator) error {
+	if u.Email == nil || u.IsEmailVerified {
+		return nil
+	}
+	u.EmailCode = new(EmailCode)
+	return u.EmailCode.GenerateEmailCode(emailGenerator)
+}
+
+func (init *InitUserCode) GenerateInitUserCode(generator crypto.Generator) error {
+	initCodeCrypto, _, err := crypto.NewCode(generator)
+	if err != nil {
+		return err
+	}
+	init.Code = initCodeCrypto
+	init.Expiry = generator.Expiry()
+	return nil
+}
--- a/internal/user/model/user_human_test.go
+++ b/internal/user/model/user_human_test.go
@@ -6,7 +6,7 @@ import (

 func TestIsUserValid(t *testing.T) {
 	type args struct {
-		user *User
+		user *Human
 	}
 	tests := []struct {
 		name    string
@@ -17,9 +17,8 @@ func TestIsUserValid(t *testing.T) {
 		{
 			name: "user with minimal data",
 			args: args{
-				user: &User{
+				user: &Human{
 					Profile: &Profile{
-						UserName:  "UserName",
 						FirstName: "FirstName",
 						LastName:  "LastName",
 					},
@@ -33,9 +32,8 @@ func TestIsUserValid(t *testing.T) {
 		{
 			name: "user with phone data",
 			args: args{
-				user: &User{
+				user: &Human{
 					Profile: &Profile{
-						UserName:  "UserName",
 						FirstName: "FirstName",
 						LastName:  "LastName",
 					},
@@ -52,9 +50,8 @@ func TestIsUserValid(t *testing.T) {
 		{
 			name: "user with address data",
 			args: args{
-				user: &User{
+				user: &Human{
 					Profile: &Profile{
-						UserName:  "UserName",
 						FirstName: "FirstName",
 						LastName:  "LastName",
 					},
@@ -74,9 +71,8 @@ func TestIsUserValid(t *testing.T) {
 		{
 			name: "user with all data",
 			args: args{
-				user: &User{
+				user: &Human{
 					Profile: &Profile{
-						UserName:  "UserName",
 						FirstName: "FirstName",
 						LastName:  "LastName",
 					},
--- a/internal/user/model/user_machine.go
+++ b/internal/user/model/user_machine.go
@@ -0,0 +1,34 @@
+package model
+
+import (
+	"time"
+
+	"github.com/caos/zitadel/internal/eventstore/models"
+)
+
+type Machine struct {
+	models.ObjectRoot
+
+	Name        string
+	Description string
+}
+
+func (sa *Machine) IsValid() bool {
+	return sa.Name != ""
+}
+
+type MachineKey struct {
+	models.ObjectRoot
+
+	KeyID          string
+	Type           MachineKeyType
+	ExpirationDate time.Time
+	PrivateKey     []byte
+}
+
+type MachineKeyType int32
+
+const (
+	MachineKeyTypeNONE = iota
+	MachineKeyTypeJSON
+)
--- a/internal/user/model/user_view.go
+++ b/internal/user/model/user_view.go
@@ -3,28 +3,33 @@ package model
 import (
 	"time"

-	"golang.org/x/text/language"
-
-	"github.com/caos/zitadel/internal/eventstore/models"
-
 	req_model "github.com/caos/zitadel/internal/auth_request/model"
+	"github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore/models"
 	"github.com/caos/zitadel/internal/model"
+	"golang.org/x/text/language"
 )

 type UserView struct {
-	ID                     string
-	CreationDate           time.Time
-	ChangeDate             time.Time
-	State                  UserState
-	ResourceOwner          string
+	ID                 string
+	UserName           string
+	CreationDate       time.Time
+	ChangeDate         time.Time
+	State              UserState
+	Sequence           uint64
+	ResourceOwner      string
+	LastLogin          time.Time
+	PreferredLoginName string
+	LoginNames         []string
+	*MachineView
+	*HumanView
+}
+
+type HumanView struct {
 	PasswordSet            bool
 	PasswordChangeRequired bool
 	UsernameChangeRequired bool
 	PasswordChanged        time.Time
-	LastLogin              time.Time
-	UserName               string
-	PreferredLoginName     string
-	LoginNames             []string
 	FirstName              string
 	LastName               string
 	NickName               string
@@ -44,7 +49,12 @@ type UserView struct {
 	MfaMaxSetUp            req_model.MfaLevel
 	MfaInitSkipped         time.Time
 	InitRequired           bool
-	Sequence               uint64
+}
+
+type MachineView struct {
+	LastKeyAdded time.Time
+	Name         string
+	Description  string
 }

 type UserSearchRequest struct {
@@ -69,6 +79,7 @@ const (
 	UserSearchKeyState
 	UserSearchKeyResourceOwner
 	UserSearchKeyLoginNames
+	UserSearchKeyType
 )

 type UserSearchQuery struct {
@@ -130,7 +141,10 @@ func (u *UserView) MfaTypesAllowed(level req_model.MfaLevel) []req_model.MfaType
 	return types
 }

-func (u *UserView) GetProfile() *Profile {
+func (u *UserView) GetProfile() (*Profile, error) {
+	if u.HumanView == nil {
+		return nil, errors.ThrowPreconditionFailed(nil, "MODEL-WLTce", "Errors.User.NotHuman")
+	}
 	return &Profile{
 		ObjectRoot: models.ObjectRoot{
 			AggregateID:   u.ID,
@@ -139,7 +153,6 @@ func (u *UserView) GetProfile() *Profile {
 			CreationDate:  u.CreationDate,
 			ChangeDate:    u.ChangeDate,
 		},
-		UserName:           u.UserName,
 		FirstName:          u.FirstName,
 		LastName:           u.LastName,
 		NickName:           u.NickName,
@@ -148,10 +161,13 @@ func (u *UserView) GetProfile() *Profile {
 		Gender:             u.Gender,
 		PreferredLoginName: u.PreferredLoginName,
 		LoginNames:         u.LoginNames,
-	}
+	}, nil
 }

-func (u *UserView) GetPhone() *Phone {
+func (u *UserView) GetPhone() (*Phone, error) {
+	if u.HumanView == nil {
+		return nil, errors.ThrowPreconditionFailed(nil, "MODEL-him4a", "Errors.User.NotHuman")
+	}
 	return &Phone{
 		ObjectRoot: models.ObjectRoot{
 			AggregateID:   u.ID,
@@ -162,10 +178,13 @@ func (u *UserView) GetPhone() *Phone {
 		},
 		PhoneNumber:     u.Phone,
 		IsPhoneVerified: u.IsPhoneVerified,
-	}
+	}, nil
 }

-func (u *UserView) GetEmail() *Email {
+func (u *UserView) GetEmail() (*Email, error) {
+	if u.HumanView == nil {
+		return nil, errors.ThrowPreconditionFailed(nil, "MODEL-PWd6K", "Errors.User.NotHuman")
+	}
 	return &Email{
 		ObjectRoot: models.ObjectRoot{
 			AggregateID:   u.ID,
@@ -176,10 +195,13 @@ func (u *UserView) GetEmail() *Email {
 		},
 		EmailAddress:    u.Email,
 		IsEmailVerified: u.IsEmailVerified,
-	}
+	}, nil
 }

-func (u *UserView) GetAddress() *Address {
+func (u *UserView) GetAddress() (*Address, error) {
+	if u.HumanView == nil {
+		return nil, errors.ThrowPreconditionFailed(nil, "MODEL-DN61m", "Errors.User.NotHuman")
+	}
 	return &Address{
 		ObjectRoot: models.ObjectRoot{
 			AggregateID:   u.ID,
@@ -193,5 +215,5 @@ func (u *UserView) GetAddress() *Address {
 		PostalCode:    u.PostalCode,
 		Region:        u.Region,
 		StreetAddress: u.StreetAddress,
-	}
+	}, nil
 }