zitadel/internal/query/project_member.go
MAHANTH-wq b664ffe993
feat(/internal): Add User Resource Owner (#9168)
Update the  ../proto/zitadel/member.proto to
include the UserResourceOwner as part of member.

Update the queries to include UserResourceOwner
for the following :
zitadel/internal/query/iam_member.go
zitadel/internal/query/org_member.go
zitadel/internal/query/project_member.go
zitadel/internal/query/project_grant_member.go

Non Breaking Changes

# Which Problems Are Solved

https://github.com/zitadel/zitadel/issues/5062

# How the Problems Are Solved

- Updated the member.proto file to include user_resource_owner. I have
compiled using` make compile` command .
- Changed the queries to include the userResourceOwner as part of
Member.
- Then, updated the converter to map the userResourceOwner.

# Additional Changes

Replace this example text with a concise list of additional changes that
this PR introduces, that are not directly solving the initial problem
but are related.
For example:
- The docs explicitly describe that the property XY is mandatory
- Adds missing translations for validations.

# Additional Context


- Closes #5062 
-
https://discordapp.com/channels/927474939156643850/1326245856193544232/1326476710752948316
2025-01-15 09:40:30 +01:00

195 lines
5.3 KiB
Go

package query
import (
"context"
"database/sql"
sq "github.com/Masterminds/squirrel"
"github.com/zitadel/zitadel/internal/api/authz"
"github.com/zitadel/zitadel/internal/api/call"
"github.com/zitadel/zitadel/internal/domain"
"github.com/zitadel/zitadel/internal/query/projection"
"github.com/zitadel/zitadel/internal/telemetry/tracing"
"github.com/zitadel/zitadel/internal/zerrors"
)
var (
projectMemberTable = table{
name: projection.ProjectMemberProjectionTable,
alias: "members",
instanceIDCol: projection.MemberInstanceID,
}
ProjectMemberUserID = Column{
name: projection.MemberUserIDCol,
table: projectMemberTable,
}
ProjectMemberRoles = Column{
name: projection.MemberRolesCol,
table: projectMemberTable,
}
ProjectMemberCreationDate = Column{
name: projection.MemberCreationDate,
table: projectMemberTable,
}
ProjectMemberChangeDate = Column{
name: projection.MemberChangeDate,
table: projectMemberTable,
}
ProjectMemberSequence = Column{
name: projection.MemberSequence,
table: projectMemberTable,
}
ProjectMemberResourceOwner = Column{
name: projection.MemberResourceOwner,
table: projectMemberTable,
}
ProjectMemberUserResourceOwner = Column{
name: projection.MemberUserResourceOwner,
table: projectMemberTable,
}
ProjectMemberInstanceID = Column{
name: projection.MemberInstanceID,
table: projectMemberTable,
}
ProjectMemberProjectID = Column{
name: projection.ProjectMemberProjectIDCol,
table: projectMemberTable,
}
)
type ProjectMembersQuery struct {
MembersQuery
ProjectID string
}
func (q *ProjectMembersQuery) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
return q.MembersQuery.
toQuery(query).
Where(sq.Eq{ProjectMemberProjectID.identifier(): q.ProjectID})
}
func (q *Queries) ProjectMembers(ctx context.Context, queries *ProjectMembersQuery) (members *Members, err error) {
ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }()
query, scan := prepareProjectMembersQuery(ctx, q.client)
eq := sq.Eq{ProjectMemberInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}
stmt, args, err := queries.toQuery(query).Where(eq).ToSql()
if err != nil {
return nil, zerrors.ThrowInvalidArgument(err, "QUERY-T8CuT", "Errors.Query.InvalidRequest")
}
currentSequence, err := q.latestState(ctx, projectMemberTable)
if err != nil {
return nil, err
}
err = q.client.QueryContext(ctx, func(rows *sql.Rows) error {
members, err = scan(rows)
return err
}, stmt, args...)
if err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-uh6pj", "Errors.Internal")
}
members.State = currentSequence
return members, err
}
func prepareProjectMembersQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Rows) (*Members, error)) {
return sq.Select(
ProjectMemberCreationDate.identifier(),
ProjectMemberChangeDate.identifier(),
ProjectMemberSequence.identifier(),
ProjectMemberResourceOwner.identifier(),
ProjectMemberUserResourceOwner.identifier(),
ProjectMemberUserID.identifier(),
ProjectMemberRoles.identifier(),
LoginNameNameCol.identifier(),
HumanEmailCol.identifier(),
HumanFirstNameCol.identifier(),
HumanLastNameCol.identifier(),
HumanDisplayNameCol.identifier(),
MachineNameCol.identifier(),
HumanAvatarURLCol.identifier(),
UserTypeCol.identifier(),
countColumn.identifier(),
).From(projectMemberTable.identifier()).
LeftJoin(join(HumanUserIDCol, ProjectMemberUserID)).
LeftJoin(join(MachineUserIDCol, ProjectMemberUserID)).
LeftJoin(join(UserIDCol, ProjectMemberUserID)).
LeftJoin(join(LoginNameUserIDCol, ProjectMemberUserID) + db.Timetravel(call.Took(ctx))).
Where(
sq.Eq{LoginNameIsPrimaryCol.identifier(): true},
).PlaceholderFormat(sq.Dollar),
func(rows *sql.Rows) (*Members, error) {
members := make([]*Member, 0)
var count uint64
for rows.Next() {
member := new(Member)
var (
preferredLoginName = sql.NullString{}
email = sql.NullString{}
firstName = sql.NullString{}
lastName = sql.NullString{}
displayName = sql.NullString{}
machineName = sql.NullString{}
avatarURL = sql.NullString{}
userType = sql.NullInt32{}
)
err := rows.Scan(
&member.CreationDate,
&member.ChangeDate,
&member.Sequence,
&member.ResourceOwner,
&member.UserResourceOwner,
&member.UserID,
&member.Roles,
&preferredLoginName,
&email,
&firstName,
&lastName,
&displayName,
&machineName,
&avatarURL,
&userType,
&count,
)
if err != nil {
return nil, err
}
member.PreferredLoginName = preferredLoginName.String
member.Email = email.String
member.FirstName = firstName.String
member.LastName = lastName.String
member.AvatarURL = avatarURL.String
if displayName.Valid {
member.DisplayName = displayName.String
} else {
member.DisplayName = machineName.String
}
member.UserType = domain.UserType(userType.Int32)
members = append(members, member)
}
if err := rows.Close(); err != nil {
return nil, zerrors.ThrowInternal(err, "QUERY-ZJ1Ii", "Errors.Query.CloseRows")
}
return &Members{
Members: members,
SearchResponse: SearchResponse{
Count: count,
},
}, nil
}
}