mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 14:27:34 +00:00
feat: user memberships (#537)
* feat: add search user memberships * feat: add search user memberships * feat: read user member ship * feat: add usergrant search key * feat: uesrmemberships based on permissions * feat: merge master * fix: correct permissions * fix: update display name on change profile * fix: merge request converations * fix: err handling * Update internal/user/model/user_membership_view.go Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
Fabi
139
internal/user/repository/view/model/user_membership.go
Normal file
139
internal/user/repository/view/model/user_membership.go
Normal file
@@ -0,0 +1,139 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"github.com/caos/logging"
|
||||
caos_errs "github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore/models"
|
||||
org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
|
||||
proj_es_model "github.com/caos/zitadel/internal/project/repository/eventsourcing/model"
|
||||
"github.com/caos/zitadel/internal/user/model"
|
||||
"github.com/lib/pq"
|
||||
"time"
|
||||
)
|
||||
|
||||
const (
|
||||
UserMembershipKeyUserID = "user_id"
|
||||
UserMembershipKeyAggregateID = "aggregate_id"
|
||||
UserMembershipKeyObjectID = "object_id"
|
||||
UserMembershipKeyResourceOwner = "resource_owner"
|
||||
UserMembershipKeyMemberType = "member_type"
|
||||
)
|
||||
|
||||
type UserMembershipView struct {
|
||||
UserID string `json:"-" gorm:"column:user_id;primary_key"`
|
||||
MemberType int32 `json:"-" gorm:"column:member_type;primary_key"`
|
||||
AggregateID string `json:"-" gorm:"column:aggregate_id;primary_key"`
|
||||
ObjectID string `json:"-" gorm:"column:object_id;primary_key"`
|
||||
|
||||
Roles pq.StringArray `json:"-" gorm:"column:roles"`
|
||||
DisplayName string `json:"-" gorm:"column:display_name"`
|
||||
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
|
||||
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
|
||||
ResourceOwner string `json:"-" gorm:"column:resource_owner"`
|
||||
Sequence uint64 `json:"-" gorm:"column:sequence"`
|
||||
}
|
||||
|
||||
func UserMembershipFromModel(membership *model.UserMembershipView) *UserMembershipView {
|
||||
return &UserMembershipView{
|
||||
UserID: membership.UserID,
|
||||
MemberType: int32(membership.MemberType),
|
||||
AggregateID: membership.AggregateID,
|
||||
ObjectID: membership.ObjectID,
|
||||
Roles: membership.Roles,
|
||||
DisplayName: membership.DisplayName,
|
||||
ChangeDate: membership.ChangeDate,
|
||||
CreationDate: membership.CreationDate,
|
||||
ResourceOwner: membership.ResourceOwner,
|
||||
Sequence: membership.Sequence,
|
||||
}
|
||||
}
|
||||
|
||||
func UserMembershipToModel(membership *UserMembershipView) *model.UserMembershipView {
|
||||
return &model.UserMembershipView{
|
||||
UserID: membership.UserID,
|
||||
MemberType: model.MemberType(membership.MemberType),
|
||||
AggregateID: membership.AggregateID,
|
||||
ObjectID: membership.ObjectID,
|
||||
Roles: membership.Roles,
|
||||
DisplayName: membership.DisplayName,
|
||||
ChangeDate: membership.ChangeDate,
|
||||
CreationDate: membership.CreationDate,
|
||||
ResourceOwner: membership.ResourceOwner,
|
||||
Sequence: membership.Sequence,
|
||||
}
|
||||
}
|
||||
|
||||
func UserMembershipsToModel(memberships []*UserMembershipView) []*model.UserMembershipView {
|
||||
result := make([]*model.UserMembershipView, len(memberships))
|
||||
for i, m := range memberships {
|
||||
result[i] = UserMembershipToModel(m)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (u *UserMembershipView) AppendEvent(event *models.Event) (err error) {
|
||||
u.ChangeDate = event.CreationDate
|
||||
u.Sequence = event.Sequence
|
||||
|
||||
switch event.Type {
|
||||
case org_es_model.OrgMemberAdded:
|
||||
u.setRootData(event, model.MemberTypeOrganisation)
|
||||
err = u.setOrgMemberData(event)
|
||||
case org_es_model.OrgMemberChanged:
|
||||
err = u.setOrgMemberData(event)
|
||||
case proj_es_model.ProjectMemberAdded:
|
||||
u.setRootData(event, model.MemberTypeProject)
|
||||
err = u.setProjectMemberData(event)
|
||||
case proj_es_model.ProjectMemberChanged:
|
||||
err = u.setProjectMemberData(event)
|
||||
case proj_es_model.ProjectGrantMemberAdded:
|
||||
u.setRootData(event, model.MemberTypeProjectGrant)
|
||||
err = u.setProjectMemberData(event)
|
||||
case proj_es_model.ProjectGrantMemberChanged:
|
||||
err = u.setProjectMemberData(event)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (u *UserMembershipView) setRootData(event *models.Event, memberType model.MemberType) {
|
||||
u.CreationDate = event.CreationDate
|
||||
u.AggregateID = event.AggregateID
|
||||
u.ObjectID = event.AggregateID
|
||||
u.ResourceOwner = event.ResourceOwner
|
||||
u.MemberType = int32(memberType)
|
||||
}
|
||||
|
||||
func (u *UserMembershipView) setOrgMemberData(event *models.Event) error {
|
||||
member := new(org_es_model.OrgMember)
|
||||
if err := json.Unmarshal(event.Data, member); err != nil {
|
||||
logging.Log("MODEL-Lps0e").WithError(err).Error("could not unmarshal event data")
|
||||
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
||||
}
|
||||
u.UserID = member.UserID
|
||||
u.Roles = member.Roles
|
||||
return nil
|
||||
}
|
||||
|
||||
func (u *UserMembershipView) setProjectMemberData(event *models.Event) error {
|
||||
member := new(proj_es_model.ProjectMember)
|
||||
if err := json.Unmarshal(event.Data, member); err != nil {
|
||||
logging.Log("MODEL-Esu8k").WithError(err).Error("could not unmarshal event data")
|
||||
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
||||
}
|
||||
u.UserID = member.UserID
|
||||
u.Roles = member.Roles
|
||||
return nil
|
||||
}
|
||||
|
||||
func (u *UserMembershipView) setProjectGrantMemberData(event *models.Event) error {
|
||||
member := new(proj_es_model.ProjectGrantMember)
|
||||
if err := json.Unmarshal(event.Data, member); err != nil {
|
||||
logging.Log("MODEL-MCn8s").WithError(err).Error("could not unmarshal event data")
|
||||
return caos_errs.ThrowInternal(nil, "MODEL-6jhsw", "could not unmarshal data")
|
||||
}
|
||||
u.UserID = member.UserID
|
||||
u.ObjectID = member.GrantID
|
||||
u.Roles = member.Roles
|
||||
return nil
|
||||
}
|
||||
67
internal/user/repository/view/model/user_membership_query.go
Normal file
67
internal/user/repository/view/model/user_membership_query.go
Normal file
@@ -0,0 +1,67 @@
|
||||
package model
|
||||
|
||||
import (
|
||||
global_model "github.com/caos/zitadel/internal/model"
|
||||
usr_model "github.com/caos/zitadel/internal/user/model"
|
||||
"github.com/caos/zitadel/internal/view/repository"
|
||||
)
|
||||
|
||||
type UserMembershipSearchRequest usr_model.UserMembershipSearchRequest
|
||||
type UserMembershipSearchQuery usr_model.UserMembershipSearchQuery
|
||||
type UserMembershipSearchKey usr_model.UserMembershipSearchKey
|
||||
|
||||
func (req UserMembershipSearchRequest) GetLimit() uint64 {
|
||||
return req.Limit
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchRequest) GetOffset() uint64 {
|
||||
return req.Offset
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchRequest) GetSortingColumn() repository.ColumnKey {
|
||||
if req.SortingColumn == usr_model.UserMembershipSearchKeyUnspecified {
|
||||
return nil
|
||||
}
|
||||
return UserMembershipSearchKey(req.SortingColumn)
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchRequest) GetAsc() bool {
|
||||
return req.Asc
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchRequest) GetQueries() []repository.SearchQuery {
|
||||
result := make([]repository.SearchQuery, len(req.Queries))
|
||||
for i, q := range req.Queries {
|
||||
result[i] = UserMembershipSearchQuery{Key: q.Key, Value: q.Value, Method: q.Method}
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchQuery) GetKey() repository.ColumnKey {
|
||||
return UserMembershipSearchKey(req.Key)
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchQuery) GetMethod() global_model.SearchMethod {
|
||||
return req.Method
|
||||
}
|
||||
|
||||
func (req UserMembershipSearchQuery) GetValue() interface{} {
|
||||
return req.Value
|
||||
}
|
||||
|
||||
func (key UserMembershipSearchKey) ToColumnName() string {
|
||||
switch usr_model.UserMembershipSearchKey(key) {
|
||||
case usr_model.UserMembershipSearchKeyUserID:
|
||||
return UserMembershipKeyUserID
|
||||
case usr_model.UserMembershipSearchKeyResourceOwner:
|
||||
return UserMembershipKeyResourceOwner
|
||||
case usr_model.UserMembershipSearchKeyMemberType:
|
||||
return UserMembershipKeyMemberType
|
||||
case usr_model.UserMembershipSearchKeyAggregateID:
|
||||
return UserMembershipKeyAggregateID
|
||||
case usr_model.UserMembershipSearchKeyObjectID:
|
||||
return UserMembershipKeyObjectID
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user