TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 01:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: show display name on members (#492)

Browse Source 
* feat: show display name on members

* fix: generate proto
This commit is contained in:
Fabi
2020-07-22 14:21:41 +02:00
committed by GitHub
parent 351aac22f8
commit c66d9d3490
22 changed files with 2770 additions and 2691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
internal/admin/repository/eventsourcing/handler/iam_member.go
View File

@@ -120,6 +120,7 @@ func (m *IamMember) fillUserData(member *iam_model.IamMemberView, user *usr_mode
member.FirstName = user.FirstName
member.LastName = user.LastName
member.Email = user.EmailAddress
member.DisplayName = user.DisplayName
}
func (m *IamMember) OnError(event *models.Event, err error) error {
logging.LogWithFields("SPOOL-Ld9ow", "id", event.AggregateID).WithError(err).Warn("something went wrong in iammember handler")

1
internal/api/grpc/admin/iam_member_converter.go
View File

@@ -140,5 +140,6 @@ func iamMemberFromView(member *iam_model.IamMemberView) *admin.IamMemberView {
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
}
}

1
internal/api/grpc/management/org_member_converter.go
View File

@@ -141,5 +141,6 @@ func orgMemberFromView(member *org_model.OrgMemberView) *management.OrgMemberVie
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
}
}

1
internal/api/grpc/management/project_grant_member_converter.go
View File

@@ -120,6 +120,7 @@ func projectGrantMemberViewFromModel(member *proj_model.ProjectGrantMemberView)
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
CreationDate: creationDate,
ChangeDate: changeDate,

1
internal/api/grpc/management/project_member_converter.go
View File

@@ -118,6 +118,7 @@ func projectMemberViewFromModel(member *proj_model.ProjectMemberView) *managemen
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
CreationDate: creationDate,
ChangeDate: changeDate,

1
internal/iam/model/iam_member_view.go
View File

@@ -12,6 +12,7 @@ type IamMemberView struct {
Email string
FirstName string
LastName string
DisplayName string
Roles []string
CreationDate time.Time
ChangeDate time.Time

19
internal/iam/repository/view/model/iam_member.go
View File

@@ -23,14 +23,15 @@ const (
)
type IamMemberView struct {
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
IamID string `json:"-" gorm:"column:iam_id"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
IamID string `json:"-" gorm:"column:iam_id"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
DisplayName string `json:"-" gorm:"column:display_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
@@ -44,6 +45,7 @@ func IamMemberViewFromModel(member *model.IamMemberView) *IamMemberView {
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,
@@ -59,6 +61,7 @@ func IamMemberToModel(member *IamMemberView) *model.IamMemberView {
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,

1
internal/management/repository/eventsourcing/handler/org_member.go
View File

@@ -120,6 +120,7 @@ func (m *OrgMember) fillUserData(member *org_model.OrgMemberView, user *usr_mode
member.FirstName = user.FirstName
member.LastName = user.LastName
member.Email = user.EmailAddress
member.DisplayName = user.DisplayName
}
func (m *OrgMember) OnError(event *models.Event, err error) error {
logging.LogWithFields("SPOOL-u73es", "id", event.AggregateID).WithError(err).Warn("something went wrong in orgmember handler")

1
internal/management/repository/eventsourcing/handler/project_grant_member.go
View File

@@ -119,6 +119,7 @@ func (p *ProjectGrantMember) fillUserData(member *view_model.ProjectGrantMemberV
member.FirstName = user.FirstName
member.LastName = user.LastName
member.Email = user.EmailAddress
member.DisplayName = user.DisplayName
}
func (p *ProjectGrantMember) OnError(event *models.Event, err error) error {

1
internal/management/repository/eventsourcing/handler/project_member.go
View File

@@ -119,6 +119,7 @@ func (p *ProjectMember) fillUserData(member *view_model.ProjectMemberView, user
member.FirstName = user.FirstName
member.LastName = user.LastName
member.Email = user.EmailAddress
member.DisplayName = user.DisplayName
}
func (p *ProjectMember) OnError(event *models.Event, err error) error {
logging.LogWithFields("SPOOL-u73es", "id", event.AggregateID).WithError(err).Warn("something went wrong in projectmember handler")

1
internal/org/model/org_member_view.go
View File

@@ -13,6 +13,7 @@ type OrgMemberView struct {
Email string
FirstName string
LastName string
DisplayName string
Roles []string
CreationDate time.Time
ChangeDate time.Time

19
internal/org/repository/view/model/org_member.go
View File

@@ -22,14 +22,15 @@ const (
)
type OrgMemberView struct {
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
OrgID string `json:"-" gorm:"column:org_id;primary_key"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
OrgID string `json:"-" gorm:"column:org_id;primary_key"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
DisplayName string `json:"-" gorm:"column:display_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
@@ -43,6 +44,7 @@ func OrgMemberViewFromModel(member *model.OrgMemberView) *OrgMemberView {
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,
@@ -58,6 +60,7 @@ func OrgMemberToModel(member *OrgMemberView) *model.OrgMemberView {
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,

1
internal/project/model/project_grant_member_view.go
View File

@@ -13,6 +13,7 @@ type ProjectGrantMemberView struct {
Email string
FirstName string
LastName string
DisplayName string
Roles []string
CreationDate time.Time
ChangeDate time.Time

1
internal/project/model/project_member_view.go
View File

@@ -12,6 +12,7 @@ type ProjectMemberView struct {
Email string
FirstName string
LastName string
DisplayName string
Roles []string
CreationDate time.Time
ChangeDate time.Time

21
internal/project/repository/view/model/project_grant_member.go
View File

@@ -21,15 +21,16 @@ const (
)
type ProjectGrantMemberView struct {
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
GrantID string `json:"grantId" gorm:"column:grant_id;primary_key"`
ProjectID string `json:"-" gorm:"column:project_id"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
GrantID string `json:"grantId" gorm:"column:grant_id;primary_key"`
ProjectID string `json:"-" gorm:"column:project_id"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
DisplayName string `json:"-" gorm:"column:display_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
@@ -44,6 +45,7 @@ func ProjectGrantMemberViewFromModel(member *model.ProjectGrantMemberView) *Proj
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,
@@ -60,6 +62,7 @@ func ProjectGrantMemberToModel(member *ProjectGrantMemberView) *model.ProjectGra
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,

19
internal/project/repository/view/model/project_member.go
View File

@@ -21,14 +21,15 @@ const (
)
type ProjectMemberView struct {
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
ProjectID string `json:"-" gorm:"column:project_id;primary_key"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
UserID string `json:"userId" gorm:"column:user_id;primary_key"`
ProjectID string `json:"-" gorm:"column:project_id;primary_key"`
UserName string `json:"-" gorm:"column:user_name"`
Email string `json:"-" gorm:"column:email_address"`
FirstName string `json:"-" gorm:"column:first_name"`
LastName string `json:"-" gorm:"column:last_name"`
DisplayName string `json:"-" gorm:"column:display_name"`
Roles pq.StringArray `json:"roles" gorm:"column:roles"`
Sequence uint64 `json:"-" gorm:"column:sequence"`
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
@@ -42,6 +43,7 @@ func ProjectMemberViewFromModel(member *model.ProjectMemberView) *ProjectMemberV
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,
@@ -57,6 +59,7 @@ func ProjectMemberToModel(member *ProjectMemberView) *model.ProjectMemberView {
Email: member.Email,
FirstName: member.FirstName,
LastName: member.LastName,
DisplayName: member.DisplayName,
Roles: member.Roles,
Sequence: member.Sequence,
CreationDate: member.CreationDate,