fix: change to repository event types and removed unused code (#3386)

* fix: change to repository event types and removed unused code

* some fixes

* remove unused code

internal/auth/repository/eventsourcing/eventstore/auth_request.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/caos/zitadel/internal/api/authz"
 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
-	"github.com/caos/zitadel/internal/auth_request/model"
 	cache "github.com/caos/zitadel/internal/auth_request/repository"
 	"github.com/caos/zitadel/internal/command"
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
 	"github.com/caos/zitadel/internal/errors"
+	"github.com/caos/zitadel/internal/eventstore"
 	v1 "github.com/caos/zitadel/internal/eventstore/v1"
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	iam_model "github.com/caos/zitadel/internal/iam/model"
@@ -21,9 +21,9 @@ import (
 	"github.com/caos/zitadel/internal/id"
 	project_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	"github.com/caos/zitadel/internal/query"
+	user_repo "github.com/caos/zitadel/internal/repository/user"
 	"github.com/caos/zitadel/internal/telemetry/tracing"
 	user_model "github.com/caos/zitadel/internal/user/model"
-	es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	user_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
 )
 
@@ -842,7 +842,7 @@ func (repo *AuthRequestRepo) usersForUserSelection(request *domain.AuthRequest)
 				LoginName:         session.LoginName,
 				ResourceOwner:     session.ResourceOwner,
 				AvatarKey:         session.AvatarKey,
-				UserSessionState:  model.UserSessionStateToDomain(session.State),
+				UserSessionState:  session.State,
 				SelectionPossible: request.RequestedOrgID == "" || request.RequestedOrgID == session.ResourceOwner,
 			})
 		}
@@ -888,7 +888,7 @@ func (repo *AuthRequestRepo) firstFactorChecked(request *domain.AuthRequest, use
 func (repo *AuthRequestRepo) mfaChecked(userSession *user_model.UserSessionView, request *domain.AuthRequest, user *user_model.UserView) (domain.NextStep, bool, error) {
 	mfaLevel := request.MFALevel()
 	allowedProviders, required := user.MFATypesAllowed(mfaLevel, request.LoginPolicy)
-	promptRequired := (model.MFALevelToDomain(user.MFAMaxSetUp) < mfaLevel) || (len(allowedProviders) == 0 && required)
+	promptRequired := (user.MFAMaxSetUp < mfaLevel) || (len(allowedProviders) == 0 && required)
 	if promptRequired || !repo.mfaSkippedOrSetUp(user, request) {
 		types := user.MFATypesSetupPossible(mfaLevel, request.LoginPolicy)
 		if promptRequired && len(types) == 0 {
@@ -912,14 +912,14 @@ func (repo *AuthRequestRepo) mfaChecked(userSession *user_model.UserSessionView,
 		fallthrough
 	case domain.MFALevelSecondFactor:
 		if checkVerificationTimeMaxAge(userSession.SecondFactorVerification, request.LoginPolicy.SecondFactorCheckLifetime, request) {
-			request.MFAsVerified = append(request.MFAsVerified, model.MFATypeToDomain(userSession.SecondFactorVerificationType))
+			request.MFAsVerified = append(request.MFAsVerified, userSession.SecondFactorVerificationType)
 			request.AuthTime = userSession.SecondFactorVerification
 			return nil, true, nil
 		}
 		fallthrough
 	case domain.MFALevelMultiFactor:
 		if checkVerificationTimeMaxAge(userSession.MultiFactorVerification, request.LoginPolicy.MultiFactorCheckLifetime, request) {
-			request.MFAsVerified = append(request.MFAsVerified, model.MFATypeToDomain(userSession.MultiFactorVerificationType))
+			request.MFAsVerified = append(request.MFAsVerified, userSession.MultiFactorVerificationType)
 			request.AuthTime = userSession.MultiFactorVerification
 			return nil, true, nil
 		}
@@ -930,7 +930,7 @@ func (repo *AuthRequestRepo) mfaChecked(userSession *user_model.UserSessionView,
 }
 
 func (repo *AuthRequestRepo) mfaSkippedOrSetUp(user *user_model.UserView, request *domain.AuthRequest) bool {
-	if user.MFAMaxSetUp > model.MFALevelNotSetUp {
+	if user.MFAMaxSetUp > domain.MFALevelNotSetUp {
 		return true
 	}
 	return checkVerificationTime(user.MFAInitSkipped, request.LoginPolicy.MFAInitSkipLifetime)
@@ -1094,24 +1094,24 @@ func userSessionByIDs(ctx context.Context, provider userSessionViewProvider, eve
 	}
 	sessionCopy := *session
 	for _, event := range events {
-		switch event.Type {
-		case es_model.UserPasswordCheckSucceeded,
-			es_model.UserPasswordCheckFailed,
-			es_model.MFAOTPCheckSucceeded,
-			es_model.MFAOTPCheckFailed,
-			es_model.SignedOut,
-			es_model.UserLocked,
-			es_model.UserDeactivated,
-			es_model.HumanPasswordCheckSucceeded,
-			es_model.HumanPasswordCheckFailed,
-			es_model.HumanExternalLoginCheckSucceeded,
-			es_model.HumanMFAOTPCheckSucceeded,
-			es_model.HumanMFAOTPCheckFailed,
-			es_model.HumanSignedOut,
-			es_model.HumanPasswordlessTokenCheckSucceeded,
-			es_model.HumanPasswordlessTokenCheckFailed,
-			es_model.HumanMFAU2FTokenCheckSucceeded,
-			es_model.HumanMFAU2FTokenCheckFailed:
+		switch eventstore.EventType(event.Type) {
+		case user_repo.UserV1PasswordCheckSucceededType,
+			user_repo.UserV1PasswordCheckFailedType,
+			user_repo.UserV1MFAOTPCheckSucceededType,
+			user_repo.UserV1MFAOTPCheckFailedType,
+			user_repo.UserV1SignedOutType,
+			user_repo.UserLockedType,
+			user_repo.UserDeactivatedType,
+			user_repo.HumanPasswordCheckSucceededType,
+			user_repo.HumanPasswordCheckFailedType,
+			user_repo.UserIDPLoginCheckSucceededType,
+			user_repo.HumanMFAOTPCheckSucceededType,
+			user_repo.HumanMFAOTPCheckFailedType,
+			user_repo.HumanSignedOutType,
+			user_repo.HumanPasswordlessTokenCheckSucceededType,
+			user_repo.HumanPasswordlessTokenCheckFailedType,
+			user_repo.HumanU2FTokenCheckSucceededType,
+			user_repo.HumanU2FTokenCheckFailedType:
 			eventData, err := user_view_model.UserSessionFromEvent(event)
 			if err != nil {
 				logging.Log("EVENT-sdgT3").WithError(err).WithField("traceID", tracing.TraceIDFromCtx(ctx)).Debug("error getting event data")
@@ -1120,7 +1120,7 @@ func userSessionByIDs(ctx context.Context, provider userSessionViewProvider, eve
 			if eventData.UserAgentID != agentID {
 				continue
 			}
-		case es_model.UserRemoved:
+		case user_repo.UserRemovedType:
 			return nil, errors.ThrowPreconditionFailed(nil, "EVENT-dG2fe", "Errors.User.NotActive")
 		}
 		err := sessionCopy.AppendEvent(event)

internal/auth/repository/eventsourcing/eventstore/auth_request_test.go

@@ -9,7 +9,6 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
-	"github.com/caos/zitadel/internal/auth_request/model"
 	"github.com/caos/zitadel/internal/auth_request/repository/cache"
 	"github.com/caos/zitadel/internal/crypto"
 	"github.com/caos/zitadel/internal/domain"
@@ -17,6 +16,7 @@ import (
 	es_models "github.com/caos/zitadel/internal/eventstore/v1/models"
 	proj_view_model "github.com/caos/zitadel/internal/project/repository/view/model"
 	"github.com/caos/zitadel/internal/query"
+	user_repo "github.com/caos/zitadel/internal/repository/user"
 	user_model "github.com/caos/zitadel/internal/user/model"
 	user_es_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
 	user_view_model "github.com/caos/zitadel/internal/user/repository/view/model"
@@ -431,8 +431,8 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{},
 				userEventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.UserDeactivated,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserDeactivatedType),
 					},
 				},
 				orgViewProvider: &mockViewOrg{State: domain.OrgStateActive},
@@ -453,8 +453,8 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{},
 				userEventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.UserLocked,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserLockedType),
 					},
 				},
 				orgViewProvider: &mockViewOrg{State: domain.OrgStateActive},
@@ -643,7 +643,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 					PasswordlessTokens:     user_view_model.WebAuthNTokens{&user_view_model.WebAuthNView{ID: "id", State: int32(user_model.MFAStateReady)}},
 					PasswordChangeRequired: false,
 					IsEmailVerified:        false,
-					MFAMaxSetUp:            int32(model.MFALevelMultiFactor),
+					MFAMaxSetUp:            int32(domain.MFALevelMultiFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				lockoutPolicyProvider: &mockLockoutPolicy{
@@ -691,7 +691,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				},
 				userViewProvider: &mockViewUser{
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				lockoutPolicyProvider: &mockLockoutPolicy{
@@ -724,7 +724,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				},
 				userViewProvider: &mockViewUser{
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider:   &mockEventUser{},
 				orgViewProvider:     &mockViewOrg{State: domain.OrgStateActive},
@@ -785,7 +785,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider:   &mockEventUser{},
 				orgViewProvider:     &mockViewOrg{State: domain.OrgStateActive},
@@ -821,7 +821,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 					PasswordSet:        true,
 					PasswordlessTokens: user_view_model.WebAuthNTokens{&user_view_model.WebAuthNView{ID: "id", State: int32(user_model.MFAStateReady)}},
 					OTPState:           int32(user_model.MFAStateReady),
-					MFAMaxSetUp:        int32(model.MFALevelMultiFactor),
+					MFAMaxSetUp:        int32(domain.MFALevelMultiFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -854,7 +854,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet: true,
 					OTPState:    int32(user_model.MFAStateReady),
-					MFAMaxSetUp: int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp: int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -888,7 +888,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet: true,
 					OTPState:    int32(user_model.MFAStateReady),
-					MFAMaxSetUp: int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp: int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -925,7 +925,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 					PasswordSet:            true,
 					PasswordChangeRequired: true,
 					IsEmailVerified:        true,
-					MFAMaxSetUp:            int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:            int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -956,7 +956,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				},
 				userViewProvider: &mockViewUser{
 					PasswordSet: true,
-					MFAMaxSetUp: int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp: int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -987,7 +987,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:            true,
 					PasswordChangeRequired: true,
-					MFAMaxSetUp:            int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:            int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -1018,7 +1018,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider:   &mockEventUser{},
 				orgViewProvider:     &mockViewOrg{State: domain.OrgStateActive},
@@ -1053,7 +1053,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider:   &mockEventUser{},
 				orgViewProvider:     &mockViewOrg{State: domain.OrgStateActive},
@@ -1089,7 +1089,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider:   &mockEventUser{},
 				orgViewProvider:     &mockViewOrg{State: domain.OrgStateActive},
@@ -1125,7 +1125,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -1163,7 +1163,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -1202,7 +1202,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -1240,7 +1240,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -1278,7 +1278,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				lockoutPolicyProvider: &mockLockoutPolicy{
 					policy: &query.LockoutPolicy{
@@ -1313,7 +1313,7 @@ func TestAuthRequestRepo_nextSteps(t *testing.T) {
 				userViewProvider: &mockViewUser{
 					PasswordSet:     true,
 					IsEmailVerified: true,
-					MFAMaxSetUp:     int32(model.MFALevelSecondFactor),
+					MFAMaxSetUp:     int32(domain.MFALevelSecondFactor),
 				},
 				userEventProvider: &mockEventUser{},
 				orgViewProvider:   &mockViewOrg{State: domain.OrgStateActive},
@@ -1398,7 +1398,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelNotSetUp,
+						MFAMaxSetUp: domain.MFALevelNotSetUp,
 					},
 				},
 			},
@@ -1416,7 +1416,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelNotSetUp,
+						MFAMaxSetUp: domain.MFALevelNotSetUp,
 					},
 				},
 			},
@@ -1435,7 +1435,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelNotSetUp,
+						MFAMaxSetUp: domain.MFALevelNotSetUp,
 					},
 				},
 			},
@@ -1459,7 +1459,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelNotSetUp,
+						MFAMaxSetUp: domain.MFALevelNotSetUp,
 					},
 				},
 			},
@@ -1482,7 +1482,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp:    model.MFALevelNotSetUp,
+						MFAMaxSetUp:    domain.MFALevelNotSetUp,
 						MFAInitSkipped: time.Now().UTC(),
 					},
 				},
@@ -1502,7 +1502,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelSecondFactor,
+						MFAMaxSetUp: domain.MFALevelSecondFactor,
 						OTPState:    user_model.MFAStateReady,
 					},
 				},
@@ -1523,7 +1523,7 @@ func TestAuthRequestRepo_mfaChecked(t *testing.T) {
 				},
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelSecondFactor,
+						MFAMaxSetUp: domain.MFALevelSecondFactor,
 						OTPState:    user_model.MFAStateReady,
 					},
 				},
@@ -1573,7 +1573,7 @@ func TestAuthRequestRepo_mfaSkippedOrSetUp(t *testing.T) {
 			args{
 				user: &user_model.UserView{
 					HumanView: &user_model.HumanView{
-						MFAMaxSetUp: model.MFALevelSecondFactor,
+						MFAMaxSetUp: domain.MFALevelSecondFactor,
 					},
 				},
 				request: &domain.AuthRequest{
@@ -1687,8 +1687,8 @@ func Test_userSessionByIDs(t *testing.T) {
 				user:    &user_model.UserView{ID: "id", HumanView: &user_model.HumanView{FirstName: "FirstName"}},
 				eventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.MFAOTPCheckSucceeded,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserV1MFAOTPCheckSucceededType),
 						CreationDate:  time.Now().UTC().Round(1 * time.Second),
 					},
 				},
@@ -1710,8 +1710,8 @@ func Test_userSessionByIDs(t *testing.T) {
 				user:    &user_model.UserView{ID: "id"},
 				eventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.MFAOTPCheckSucceeded,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserV1MFAOTPCheckSucceededType),
 						CreationDate:  time.Now().UTC().Round(1 * time.Second),
 						Data: func() []byte {
 							data, _ := json.Marshal(&user_es_model.AuthRequest{UserAgentID: "otherID"})
@@ -1737,8 +1737,8 @@ func Test_userSessionByIDs(t *testing.T) {
 				user:    &user_model.UserView{ID: "id", HumanView: &user_model.HumanView{FirstName: "FirstName"}},
 				eventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.MFAOTPCheckSucceeded,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserV1MFAOTPCheckSucceededType),
 						CreationDate:  time.Now().UTC().Round(1 * time.Second),
 						Data: func() []byte {
 							data, _ := json.Marshal(&user_es_model.AuthRequest{UserAgentID: "agentID"})
@@ -1764,8 +1764,8 @@ func Test_userSessionByIDs(t *testing.T) {
 				user:    &user_model.UserView{ID: "id"},
 				eventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.UserRemoved,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserRemovedType),
 					},
 				},
 			},
@@ -1834,8 +1834,8 @@ func Test_userByID(t *testing.T) {
 				},
 				eventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.UserPasswordChanged,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserV1PasswordChangedType),
 						CreationDate:  time.Now().UTC().Round(1 * time.Second),
 						Data:          nil,
 					},
@@ -1860,8 +1860,8 @@ func Test_userByID(t *testing.T) {
 				},
 				eventProvider: &mockEventUser{
 					&es_models.Event{
-						AggregateType: user_es_model.UserAggregate,
-						Type:          user_es_model.UserPasswordChanged,
+						AggregateType: user_repo.AggregateType,
+						Type:          es_models.EventType(user_repo.UserV1PasswordChangedType),
 						CreationDate:  time.Now().UTC().Round(1 * time.Second),
 						Data: func() []byte {
 							data, _ := json.Marshal(user_es_model.Password{ChangeRequired: false, Secret: &crypto.CryptoValue{}})

internal/auth/repository/eventsourcing/eventstore/user.go

@@ -2,18 +2,10 @@ package eventstore
 
 import (
 	"context"
-	"time"
 
-	"github.com/caos/logging"
-	"github.com/golang/protobuf/ptypes"
-
-	"github.com/caos/zitadel/internal/user/model"
-
-	"github.com/caos/zitadel/internal/api/authz"
 	"github.com/caos/zitadel/internal/auth/repository/eventsourcing/view"
 	"github.com/caos/zitadel/internal/config/systemdefaults"
 	"github.com/caos/zitadel/internal/domain"
-	"github.com/caos/zitadel/internal/errors"
 	v1 "github.com/caos/zitadel/internal/eventstore/v1"
 	"github.com/caos/zitadel/internal/eventstore/v1/models"
 	"github.com/caos/zitadel/internal/query"
@@ -51,73 +43,6 @@ func (repo *UserRepo) UserEventsByID(ctx context.Context, id string, sequence ui
 	return repo.getUserEvents(ctx, id, sequence)
 }
 
-func (repo *UserRepo) MyUserChanges(ctx context.Context, lastSequence uint64, limit uint64, sortAscending bool, retention time.Duration) (*model.UserChanges, error) {
-	changes, err := repo.getUserChanges(ctx, authz.GetCtxData(ctx).UserID, lastSequence, limit, sortAscending, retention)
-	if err != nil {
-		return nil, err
-	}
-	for _, change := range changes.Changes {
-		change.ModifierName = change.ModifierID
-		change.ModifierLoginName = change.ModifierID
-		user, _ := repo.Query.GetUserByID(ctx, change.ModifierID)
-		if user != nil {
-			change.ModifierLoginName = user.PreferredLoginName
-			if user.Human != nil {
-				change.ModifierName = user.Human.DisplayName
-				change.ModifierAvatarURL = domain.AvatarURL(repo.PrefixAvatarURL, user.ResourceOwner, user.Human.AvatarKey)
-			}
-			if user.Machine != nil {
-				change.ModifierName = user.Machine.Name
-			}
-		}
-	}
-	return changes, nil
-}
-
-func (r *UserRepo) getUserChanges(ctx context.Context, userID string, lastSequence uint64, limit uint64, sortAscending bool, retention time.Duration) (*model.UserChanges, error) {
-	query := usr_view.ChangesQuery(userID, lastSequence, limit, sortAscending, retention)
-
-	events, err := r.Eventstore.FilterEvents(ctx, query)
-	if err != nil {
-		logging.Log("EVENT-g9HCv").WithError(err).Warn("eventstore unavailable")
-		return nil, errors.ThrowInternal(err, "EVENT-htuG9", "Errors.Internal")
-	}
-	if len(events) == 0 {
-		return nil, errors.ThrowNotFound(nil, "EVENT-6cAxe", "Errors.User.NoChanges")
-	}
-
-	result := make([]*model.UserChange, len(events))
-
-	for i, event := range events {
-		creationDate, err := ptypes.TimestampProto(event.CreationDate)
-		logging.Log("EVENT-8GTGS").OnError(err).Debug("unable to parse timestamp")
-		change := &model.UserChange{
-			ChangeDate: creationDate,
-			EventType:  event.Type.String(),
-			ModifierID: event.EditorUser,
-			Sequence:   event.Sequence,
-		}
-
-		//TODO: now all types should be unmarshalled, e.g. password
-		// if len(event.Data) != 0 {
-		// 	user := new(model.User)
-		// 	err := json.Unmarshal(event.Data, user)
-		// 	logging.Log("EVENT-Rkg7X").OnError(err).Debug("unable to unmarshal data")
-		// 	change.Data = user
-		// }
-
-		result[i] = change
-		if lastSequence < event.Sequence {
-			lastSequence = event.Sequence
-		}
-	}
-
-	return &model.UserChanges{
-		Changes:      result,
-		LastSequence: lastSequence,
-	}, nil
-}
-
 func (r *UserRepo) getUserEvents(ctx context.Context, userID string, sequence uint64) ([]*models.Event, error) {
 	query, err := usr_view.UserByIDQuery(userID, sequence)
 	if err != nil {