mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 20:08:02 +00:00
5cbf537a91
* fix: some funcitons * feat(eventstore): implemented push events * fix: move project eventstore to project package * fix: change project eventstore funcs * feat(eventstore): overwrite context data * fix: change project eventstore * fix: add project repo to mgmt server * feat(types): SQL-config * fix: commented code * feat(eventstore): options to overwrite editor * feat: auth interceptor and cockroach migrations * fix: migrations * fix: fix filter * fix: not found on getbyid * fix: use global sql config * fix: add sequence * fix: add some tests * fix(eventstore): nullable sequence * fix: add some tests * merge * fix: add some tests * fix(migrations): correct statements for sequence * fix: add some tests * fix: add some tests * fix: changes from mr * fix: changes from mr * fix: add some tests * Update internal/eventstore/models/field.go Co-Authored-By: livio-a <livio.a@gmail.com> * fix(eventstore): code quality * fix: add types to aggregate/Event-types * fix: try tests * fix(eventstore): rename modifier* to editor* * fix(eventstore): delete editor_org * fix(migrations): remove editor_org field, rename modifier_* to editor_* * fix: query tests * fix: use prepare funcs * fix: go mod * fix: generate files * fix(eventstore): tests * fix(eventstore): rename modifier to editor * fix(migrations): add cluster migration, fix(migrations): fix typo of host in clean clsuter * fix(eventstore): move health * fix(eventstore): AggregateTypeFilter aggregateType as param * code quality * fix: go tests * feat: add member funcs * feat: add member model * feat: add member events * feat: add member repo model * fix: better error func testing * fix: project member funcs * fix: add tests * fix: add tests * feat: implement member requests * fix: merge master * fix: merge master * fix: read existing in project repo * fix: fix tests * feat: add internal cache * feat: add cache mock * fix: return values of cache mock * feat: add project role * fix: add cache config * fix: add role to eventstore * fix: use eventstore sdk * fix: use eventstore sdk * fix: add project role grpc requests * fix: fix getby id * fix: changes for mr * fix: change value to interface * feat: add app event creations * fix: searchmethods * Update internal/project/model/project_member.go Co-Authored-By: Silvan <silvan.reusser@gmail.com> * fix: use get project func * fix: append events * fix: check if value is string on equal ignore case * fix: add changes test * fix: add go mod * fix: add some tests * fix: return err not nil * fix: return err not nil * fix: add aggregate funcs and tests * fix: add oidc aggregate funcs and tests * fix: add oidc * fix: add some tests * fix: tests * fix: oidc validation * fix: generate client secret * fix: generate client id * fix: test change app * fix: deactivate/reactivate application * fix: change oidc config * fix: change oidc config secret * fix: implement grpc app funcs * fix: add application requests * fix: converter * fix: converter * fix: converter and generate clientid * fix: tests * feat: project grant aggregate * feat: project grant * fix: project grant check if role existing * fix: project grant requests * fix: project grant fixes * fix: project grant member model * fix: project grant member aggregate * fix: project grant member eventstore * fix: project grant member requests * feat: user model * feat: user command side * user command side * profile requests * local config with gopass and more * init for views (spooler, handler) * init for views (spooler, handler) * start view in management * granted project * Update internal/user/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/address.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/address.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/email.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/mfa.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/mfa.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/password.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/phone.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/eventsourcing/model/user_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/eventsourcing/model/user_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/eventsourcing/user_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/user_test.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/user/repository/eventsourcing/eventstore_mock_test.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * changes from mr review * save files into basedir * changes from mr review * changes from mr review * implement granted project view * Update internal/usergrant/repository/eventsourcing/cache.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/usergrant/repository/eventsourcing/cache.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * changes requested on mr * fix generate codes * fix return if no events * password code * search granted projects * fix search column * update all projects on project change * search roles * filter org * project members * project grant members * fix tests * application view * project grant search * mock * Update internal/user/repository/eventsourcing/model/password.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/user/repository/eventsourcing/model/user.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * requests of mr * check email * test appendevents * test appendevents * Update internal/view/query.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * Update internal/eventstore/spooler/spooler.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * Update internal/view/query.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * merge request changes * Update internal/project/repository/view/model/application.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * merge request changes * Project view sql (#92) * sql and configs * error handling * sql start in eventstore * on error handling, config * merge branches * user view * user grant view * fix test * user grant search * fill data on user grant * update data on user grant * return caos errors * converter list len * merge master * Update internal/management/repository/eventsourcing/handler/user_grant.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * Update internal/usergrant/repository/view/model/user_grant_query.go Co-authored-by: Livio Amstutz <livio.a@gmail.com> * typo * Update internal/user/repository/view/model/user_query.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update internal/user/repository/view/user_view.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/user_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * Update pkg/management/api/grpc/user_grant_converter.go Co-authored-by: Silvan <silvan.reusser@gmail.com> * set my org query Co-authored-by: adlerhurst <silvan.reusser@gmail.com> Co-authored-by: livio-a <livio.a@gmail.com>
156 lines
4.8 KiB
Go
156 lines
4.8 KiB
Go
package grpc
|
|
|
|
import (
|
|
"github.com/caos/logging"
|
|
"github.com/caos/zitadel/internal/eventstore/models"
|
|
grant_model "github.com/caos/zitadel/internal/usergrant/model"
|
|
"github.com/golang/protobuf/ptypes"
|
|
)
|
|
|
|
func usergrantFromModel(grant *grant_model.UserGrant) *UserGrant {
|
|
creationDate, err := ptypes.TimestampProto(grant.CreationDate)
|
|
logging.Log("GRPC-ki9ds").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
changeDate, err := ptypes.TimestampProto(grant.ChangeDate)
|
|
logging.Log("GRPC-sl9ew").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
return &UserGrant{
|
|
Id: grant.AggregateID,
|
|
UserId: grant.UserID,
|
|
State: usergrantStateFromModel(grant.State),
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
Sequence: grant.Sequence,
|
|
ProjectId: grant.ProjectID,
|
|
RoleKeys: grant.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func userGrantCreateToModel(u *UserGrantCreate) *grant_model.UserGrant {
|
|
return &grant_model.UserGrant{
|
|
ObjectRoot: models.ObjectRoot{AggregateID: u.UserId},
|
|
UserID: u.UserId,
|
|
ProjectID: u.ProjectId,
|
|
RoleKeys: u.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func userGrantUpdateToModel(u *UserGrantUpdate) *grant_model.UserGrant {
|
|
return &grant_model.UserGrant{
|
|
ObjectRoot: models.ObjectRoot{AggregateID: u.Id},
|
|
RoleKeys: u.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func projectUserGrantUpdateToModel(u *ProjectUserGrantUpdate) *grant_model.UserGrant {
|
|
return &grant_model.UserGrant{
|
|
ObjectRoot: models.ObjectRoot{AggregateID: u.Id},
|
|
RoleKeys: u.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func projectGrantUserGrantCreateToModel(u *ProjectGrantUserGrantCreate) *grant_model.UserGrant {
|
|
return &grant_model.UserGrant{
|
|
UserID: u.UserId,
|
|
ProjectID: u.ProjectId,
|
|
RoleKeys: u.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func projectGrantUserGrantUpdateToModel(u *ProjectGrantUserGrantUpdate) *grant_model.UserGrant {
|
|
return &grant_model.UserGrant{
|
|
ObjectRoot: models.ObjectRoot{AggregateID: u.Id},
|
|
RoleKeys: u.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func userGrantSearchRequestsToModel(project *UserGrantSearchRequest) *grant_model.UserGrantSearchRequest {
|
|
return &grant_model.UserGrantSearchRequest{
|
|
Offset: project.Offset,
|
|
Limit: project.Limit,
|
|
Queries: userGrantSearchQueriesToModel(project.Queries),
|
|
}
|
|
}
|
|
|
|
func userGrantSearchQueriesToModel(queries []*UserGrantSearchQuery) []*grant_model.UserGrantSearchQuery {
|
|
converted := make([]*grant_model.UserGrantSearchQuery, len(queries))
|
|
for i, q := range queries {
|
|
converted[i] = userGrantSearchQueryToModel(q)
|
|
}
|
|
return converted
|
|
}
|
|
|
|
func userGrantSearchQueryToModel(query *UserGrantSearchQuery) *grant_model.UserGrantSearchQuery {
|
|
return &grant_model.UserGrantSearchQuery{
|
|
Key: userGrantSearchKeyToModel(query.Key),
|
|
Method: searchMethodToModel(query.Method),
|
|
Value: query.Value,
|
|
}
|
|
}
|
|
|
|
func userGrantSearchKeyToModel(key UserGrantSearchKey) grant_model.UserGrantSearchKey {
|
|
switch key {
|
|
case UserGrantSearchKey_USERGRANTSEARCHKEY_ORG_ID:
|
|
return grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER
|
|
case UserGrantSearchKey_USERGRANTSEARCHKEY_PROJECT_ID:
|
|
return grant_model.USERGRANTSEARCHKEY_PROJECT_ID
|
|
case UserGrantSearchKey_USERGRANTSEARCHKEY_USER_ID:
|
|
return grant_model.USERGRANTSEARCHKEY_USER_ID
|
|
default:
|
|
return grant_model.USERGRANTSEARCHKEY_UNSPECIFIED
|
|
}
|
|
}
|
|
|
|
func userGrantSearchResponseFromModel(response *grant_model.UserGrantSearchResponse) *UserGrantSearchResponse {
|
|
return &UserGrantSearchResponse{
|
|
Offset: response.Offset,
|
|
Limit: response.Limit,
|
|
TotalResult: response.TotalResult,
|
|
Result: userGrantViewsFromModel(response.Result),
|
|
}
|
|
}
|
|
|
|
func userGrantViewsFromModel(users []*grant_model.UserGrantView) []*UserGrantView {
|
|
converted := make([]*UserGrantView, len(users))
|
|
for i, user := range users {
|
|
converted[i] = userGrantViewFromModel(user)
|
|
}
|
|
return converted
|
|
}
|
|
|
|
func userGrantViewFromModel(grant *grant_model.UserGrantView) *UserGrantView {
|
|
creationDate, err := ptypes.TimestampProto(grant.CreationDate)
|
|
logging.Log("GRPC-dl9we").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
changeDate, err := ptypes.TimestampProto(grant.ChangeDate)
|
|
logging.Log("GRPC-lpsg5").OnError(err).Debug("unable to parse timestamp")
|
|
|
|
return &UserGrantView{
|
|
Id: grant.ID,
|
|
State: usergrantStateFromModel(grant.State),
|
|
CreationDate: creationDate,
|
|
ChangeDate: changeDate,
|
|
Sequence: grant.Sequence,
|
|
ResourceOwner: grant.ResourceOwner,
|
|
UserName: grant.UserName,
|
|
FirstName: grant.FirstName,
|
|
LastName: grant.LastName,
|
|
Email: grant.Email,
|
|
ProjectName: grant.ProjectName,
|
|
OrgName: grant.OrgName,
|
|
OrgDomain: grant.OrgDomain,
|
|
RoleKeys: grant.RoleKeys,
|
|
}
|
|
}
|
|
|
|
func usergrantStateFromModel(state grant_model.UserGrantState) UserGrantState {
|
|
switch state {
|
|
case grant_model.USERGRANTSTATE_ACTIVE:
|
|
return UserGrantState_USERGRANTSTATE_ACTIVE
|
|
case grant_model.USERGRANTSTATE_INACTIVE:
|
|
return UserGrantState_USERGRANTSTATE_INACTIVE
|
|
default:
|
|
return UserGrantState_USERGRANTSTATE_UNSPECIFIED
|
|
}
|
|
}
|