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

fix: all enums same style (#262)

Browse Source 
* fix: all enums same style

* fix: rename process to reduce

* add some missing enum renaming

Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
2020-06-23 14:47:47 +02:00
committed by GitHub
parent c376b92315
commit 3cd3a238c2
152 changed files with 1026 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/auth/repository/eventsourcing/eventstore/auth_request.go
View File

@@ -350,17 +350,17 @@ func activeUserByID(ctx context.Context, userViewProvider userViewProvider, user
if err != nil {
return nil, err
}
if user.State == user_model.USERSTATE_LOCKED || user.State == user_model.USERSTATE_SUSPEND {
if user.State == user_model.UserStateLocked || user.State == user_model.UserStateSuspend {
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.Locked")
}
if !(user.State == user_model.USERSTATE_ACTIVE || user.State == user_model.USERSTATE_INITIAL) {
if !(user.State == user_model.UserStateActive || user.State == user_model.UserStateInitial) {
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-FJ262", "Errors.User.NotActive")
}
org, err := orgViewProvider.OrgByID(user.ResourceOwner)
if err != nil {
return nil, err
}
if org.State != int32(org_model.ORGSTATE_ACTIVE) {
if org.State != int32(org_model.OrgStateActive) {
return nil, errors.ThrowPreconditionFailed(nil, "EVENT-Zws3s", "Errors.User.NotActive")
}
return user, nil

42
internal/auth/repository/eventsourcing/eventstore/auth_request_test.go
View File

@@ -113,7 +113,7 @@ func (m *mockViewUser) UserByID(string) (*user_view_model.UserView, error) {
OTPState: m.OTPState,
MfaMaxSetUp: m.MfaMaxSetUp,
MfaInitSkipped: m.MfaInitSkipped,
State: int32(user_model.USERSTATE_ACTIVE),
State: int32(user_model.UserStateActive),
}, nil
}
@@ -242,7 +242,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
Type: user_es_model.UserDeactivated,
},
},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
},
args{&model.AuthRequest{UserID: "UserID"}, false},
nil,
@@ -264,7 +264,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
fields{
userViewProvider: &mockViewUser{},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_INACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateInactive},
},
args{&model.AuthRequest{UserID: "UserID"}, false},
nil,
@@ -278,7 +278,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
PasswordSet: true,
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
},
args{&model.AuthRequest{UserID: "UserID"}, false},
[]model.NextStep{&model.PasswordStep{}},
@@ -290,7 +290,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
userSessionViewProvider: &mockViewErrUserSession{},
userViewProvider: &mockViewUser{},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
},
args{&model.AuthRequest{UserID: "UserID"}, false},
nil,
@@ -305,7 +305,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
PasswordSet: true,
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
},
args{&model.AuthRequest{UserID: "UserID"}, false},
[]model.NextStep{&model.InitUserStep{
@@ -319,7 +319,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
userSessionViewProvider: &mockViewUserSession{},
userViewProvider: &mockViewUser{},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
},
args{&model.AuthRequest{UserID: "UserID"}, false},
[]model.NextStep{&model.InitPasswordStep{}},
@@ -333,7 +333,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
PasswordSet: true,
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
},
args{&model.AuthRequest{UserID: "UserID"}, false},
@@ -348,11 +348,11 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
},
userViewProvider: &mockViewUser{
PasswordSet: true,
OTPState: int32(user_model.MFASTATE_READY),
OTPState: int32(user_model.MfaStateReady),
MfaMaxSetUp: int32(model.MfaLevelSoftware),
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
MfaSoftwareCheckLifeTime: 18 * time.Hour,
},
@@ -376,7 +376,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
MfaMaxSetUp: int32(model.MfaLevelSoftware),
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
MfaSoftwareCheckLifeTime: 18 * time.Hour,
},
@@ -396,7 +396,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
MfaMaxSetUp: int32(model.MfaLevelSoftware),
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
MfaSoftwareCheckLifeTime: 18 * time.Hour,
},
@@ -417,7 +417,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
MfaMaxSetUp: int32(model.MfaLevelSoftware),
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
MfaSoftwareCheckLifeTime: 18 * time.Hour,
},
@@ -438,7 +438,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
MfaMaxSetUp: int32(model.MfaLevelSoftware),
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
MfaSoftwareCheckLifeTime: 18 * time.Hour,
},
@@ -459,7 +459,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
MfaMaxSetUp: int32(model.MfaLevelSoftware),
},
userEventProvider: &mockEventUser{},
orgViewProvider: &mockViewOrg{State: org_model.ORGSTATE_ACTIVE},
orgViewProvider: &mockViewOrg{State: org_model.OrgStateActive},
PasswordCheckLifeTime: 10 * 24 * time.Hour,
MfaSoftwareCheckLifeTime: 18 * time.Hour,
},
@@ -517,7 +517,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
// args{
// request: &model.AuthRequest{PossibleLOAs: []model.LevelOfAssurance{}},
// user: &user_model.UserView{
// OTPState: user_model.MFASTATE_READY,
// OTPState: user_model.MfaStateReady,
// },
// },
// false,
@@ -564,7 +564,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
request: &model.AuthRequest{},
user: &user_model.UserView{
MfaMaxSetUp: model.MfaLevelSoftware,
OTPState: user_model.MFASTATE_READY,
OTPState: user_model.MfaStateReady,
},
userSession: &user_model.UserSessionView{MfaSoftwareVerification: time.Now().UTC().Add(-5 * time.Hour)},
},
@@ -580,7 +580,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
request: &model.AuthRequest{},
user: &user_model.UserView{
MfaMaxSetUp: model.MfaLevelSoftware,
OTPState: user_model.MFASTATE_READY,
OTPState: user_model.MfaStateReady,
},
userSession: &user_model.UserSessionView{},
},
@@ -851,7 +851,7 @@ func Test_userByID(t *testing.T) {
},
&user_model.UserView{
PasswordChangeRequired: true,
State: user_model.USERSTATE_ACTIVE,
State: user_model.UserStateActive,
},
nil,
},
@@ -872,7 +872,7 @@ func Test_userByID(t *testing.T) {
},
&user_model.UserView{
PasswordChangeRequired: true,
State: user_model.USERSTATE_ACTIVE,
State: user_model.UserStateActive,
},
nil,
},
@@ -897,7 +897,7 @@ func Test_userByID(t *testing.T) {
&user_model.UserView{
PasswordChangeRequired: false,
ChangeDate: time.Now().UTC().Round(1 * time.Second),
State: user_model.USERSTATE_ACTIVE,
State: user_model.UserStateActive,
PasswordChanged: time.Now().UTC().Round(1 * time.Second),
},
nil,

2
internal/auth/repository/eventsourcing/eventstore/user.go
View File

@@ -212,7 +212,7 @@ func (repo *UserRepo) RequestPasswordReset(ctx context.Context, loginname string
if err != nil {
return err
}
return repo.UserEvents.RequestSetPassword(ctx, user.ID, model.NOTIFICATIONTYPE_EMAIL)
return repo.UserEvents.RequestSetPassword(ctx, user.ID, model.NotificationTypeEmail)
}
func (repo *UserRepo) SetPassword(ctx context.Context, userID, code, password string) error {

10
internal/auth/repository/eventsourcing/eventstore/user_grant.go
View File

@@ -23,7 +23,7 @@ type UserGrantRepo struct {
func (repo *UserGrantRepo) SearchMyUserGrants(ctx context.Context, request *grant_model.UserGrantSearchRequest) (*grant_model.UserGrantSearchResponse, error) {
request.EnsureLimit(repo.SearchLimit)
request.Queries = append(request.Queries, &grant_model.UserGrantSearchQuery{Key: grant_model.USERGRANTSEARCHKEY_USER_ID, Method: global_model.SEARCHMETHOD_EQUALS, Value: auth.GetCtxData(ctx).UserID})
request.Queries = append(request.Queries, &grant_model.UserGrantSearchQuery{Key: grant_model.UserGrantSearchKeyUserID, Method: global_model.SearchMethodEquals, Value: auth.GetCtxData(ctx).UserID})
grants, count, err := repo.View.SearchUserGrants(request)
if err != nil {
return nil, err
@@ -55,7 +55,7 @@ func (repo *UserGrantRepo) SearchMyProjectOrgs(ctx context.Context, request *gra
return repo.SearchAdminOrgs(request)
}
}
request.Queries = append(request.Queries, &grant_model.UserGrantSearchQuery{Key: grant_model.USERGRANTSEARCHKEY_PROJECT_ID, Method: global_model.SEARCHMETHOD_EQUALS, Value: ctxData.ProjectID})
request.Queries = append(request.Queries, &grant_model.UserGrantSearchQuery{Key: grant_model.UserGrantSearchKeyProjectID, Method: global_model.SearchMethodEquals, Value: ctxData.ProjectID})
grants, err := repo.SearchMyUserGrants(ctx, request)
if err != nil {
@@ -98,8 +98,8 @@ func (repo *UserGrantRepo) SearchAdminOrgs(request *grant_model.UserGrantSearchR
searchRequest := &org_model.OrgSearchRequest{}
if len(request.Queries) > 0 {
for _, q := range request.Queries {
if q.Key == grant_model.USERGRANTSEARCHKEY_ORG_NAME {
searchRequest.Queries = append(searchRequest.Queries, &org_model.OrgSearchQuery{Key: org_model.ORGSEARCHKEY_ORG_NAME, Method: q.Method, Value: q.Value})
if q.Key == grant_model.UserGrantSearchKeyOrgName {
searchRequest.Queries = append(searchRequest.Queries, &org_model.OrgSearchQuery{Key: org_model.OrgSearchKeyOrgName, Method: q.Method, Value: q.Value})
}
}
}
@@ -113,7 +113,7 @@ func (repo *UserGrantRepo) SearchAdminOrgs(request *grant_model.UserGrantSearchR
func (repo *UserGrantRepo) IsIamAdmin(ctx context.Context) (bool, error) {
grantSearch := &grant_model.UserGrantSearchRequest{
Queries: []*grant_model.UserGrantSearchQuery{
&grant_model.UserGrantSearchQuery{Key: grant_model.USERGRANTSEARCHKEY_RESOURCEOWNER, Method: global_model.SEARCHMETHOD_EQUALS, Value: repo.IamID},
&grant_model.UserGrantSearchQuery{Key: grant_model.UserGrantSearchKeyResourceOwner, Method: global_model.SearchMethodEquals, Value: repo.IamID},
}}
result, err := repo.SearchMyUserGrants(ctx, grantSearch)
if err != nil {

2
internal/auth/repository/eventsourcing/handler/application.go
View File

@@ -34,7 +34,7 @@ func (p *Application) EventQuery() (*models.SearchQuery, error) {
return eventsourcing.ProjectQuery(sequence), nil
}
func (p *Application) Process(event *models.Event) (err error) {
func (p *Application) Reduce(event *models.Event) (err error) {
app := new(view_model.ApplicationView)
switch event.Type {
case es_model.ApplicationAdded:

2
internal/auth/repository/eventsourcing/handler/key.go
View File

@@ -35,7 +35,7 @@ func (k *Key) EventQuery() (*models.SearchQuery, error) {
return eventsourcing.KeyPairQuery(sequence), nil
}
func (k *Key) Process(event *models.Event) error {
func (k *Key) Reduce(event *models.Event) error {
switch event.Type {
case es_model.KeyPairAdded:
privateKey, publicKey, err := view_model.KeysFromPairEvent(event)

2
internal/auth/repository/eventsourcing/handler/org.go
View File

@@ -32,7 +32,7 @@ func (o *Org) EventQuery() (*es_models.SearchQuery, error) {
return eventsourcing.OrgQuery(sequence), nil
}
func (o *Org) Process(event *es_models.Event) error {
func (o *Org) Reduce(event *es_models.Event) error {
org := new(org_model.OrgView)
switch event.Type {

2
internal/auth/repository/eventsourcing/handler/token.go
View File

@@ -44,7 +44,7 @@ func (u *Token) EventQuery() (*models.SearchQuery, error) {
LatestSequenceFilter(sequence), nil
}
func (u *Token) Process(event *models.Event) (err error) {
func (u *Token) Reduce(event *models.Event) (err error) {
switch event.Type {
case user_es_model.SignedOut:
id, err := agentIDFromSession(event)

2
internal/auth/repository/eventsourcing/handler/user.go
View File

@@ -43,7 +43,7 @@ func (p *User) EventQuery() (*models.SearchQuery, error) {
LatestSequenceFilter(sequence), nil
}
func (u *User) Process(event *models.Event) (err error) {
func (u *User) Reduce(event *models.Event) (err error) {
switch event.AggregateType {
case es_model.UserAggregate:
return u.ProcessUser(event)

2
internal/auth/repository/eventsourcing/handler/user_grant.go
View File

@@ -63,7 +63,7 @@ func (u *UserGrant) EventQuery() (*models.SearchQuery, error) {
LatestSequenceFilter(sequence), nil
}
func (u *UserGrant) Process(event *models.Event) (err error) {
func (u *UserGrant) Reduce(event *models.Event) (err error) {
switch event.AggregateType {
case grant_es_model.UserGrantAggregate:
err = u.processUserGrant(event)

2
internal/auth/repository/eventsourcing/handler/user_session.go
View File

@@ -39,7 +39,7 @@ func (u *UserSession) EventQuery() (*models.SearchQuery, error) {
return eventsourcing.UserQuery(sequence), nil
}
func (u *UserSession) Process(event *models.Event) (err error) {
func (u *UserSession) Reduce(event *models.Event) (err error) {
var session *view_model.UserSessionView
switch event.Type {
case es_model.UserPasswordCheckSucceeded,

8
internal/auth/repository/eventsourcing/view/application.go
View File

@@ -60,8 +60,8 @@ func (v *View) ApplicationByClientID(_ context.Context, clientID string) (*model
Limit: 1,
Queries: []*proj_model.ApplicationSearchQuery{
{
Key: proj_model.APPLICATIONSEARCHKEY_OIDC_CLIENT_ID,
Method: global_model.SEARCHMETHOD_EQUALS,
Key: proj_model.AppSearchKeyOIDCClientID,
Method: global_model.SearchMethodEquals,
Value: clientID,
},
},
@@ -84,8 +84,8 @@ func (v *View) AppIDsFromProjectByClientID(ctx context.Context, clientID string)
req := &proj_model.ApplicationSearchRequest{
Queries: []*proj_model.ApplicationSearchQuery{
{
Key: proj_model.APPLICATIONSEARCHKEY_PROJECT_ID,
Method: global_model.SEARCHMETHOD_EQUALS,
Key: proj_model.AppSearchKeyProjectID,
Method: global_model.SearchMethodEquals,
Value: app.ProjectID,
},
},