fix: migration, key rotation and org event reducing (#1403)

* fix: migration, key rotation and org event reducing

* fix oidc app

* pointer receiver name

internal/authz/repository/eventsourcing/handler/user_membership.go

@@ -276,7 +276,11 @@ func (u *UserMembership) getOrgByID(ctx context.Context, orgID string) (*org_mod
 		return nil, err
 	}
 
-	var esOrg *org_es_model.Org
+	esOrg := &org_es_model.Org{
+		ObjectRoot: es_models.ObjectRoot{
+			AggregateID: orgID,
+		},
+	}
 	err = es_sdk.Filter(ctx, u.Eventstore().FilterEvents, esOrg.AppendEvents, query)
 	if err != nil && !errors.IsNotFound(err) {
 		return nil, err

internal/domain/application_oidc.go

@@ -41,24 +41,24 @@ type OIDCApp struct {
 	State AppState
 }
 
-func (h OIDCApp) GetApplicationName() string {
+func (a *OIDCApp) GetApplicationName() string {
-	return h.AppName
+	return a.AppName
 }
 
-func (h OIDCApp) GetState() AppState {
+func (a *OIDCApp) GetState() AppState {
-	return h.State
+	return a.State
 }
 
-func (h OIDCApp) setClientID(clientID string) {
+func (a *OIDCApp) setClientID(clientID string) {
-	h.ClientID = clientID
+	a.ClientID = clientID
 }
 
-func (h OIDCApp) setClientSecret(clientSecret *crypto.CryptoValue) {
+func (a *OIDCApp) setClientSecret(clientSecret *crypto.CryptoValue) {
-	h.ClientSecret = clientSecret
+	a.ClientSecret = clientSecret
 }
 
-func (h OIDCApp) requiresClientSecret() bool {
+func (a *OIDCApp) requiresClientSecret() bool {
-	return h.AuthMethodType == OIDCAuthMethodTypeBasic || h.AuthMethodType == OIDCAuthMethodTypePost
+	return a.AuthMethodType == OIDCAuthMethodTypeBasic || a.AuthMethodType == OIDCAuthMethodTypePost
 }
 
 type OIDCVersion int32
@@ -112,10 +112,10 @@ const (
 	OIDCTokenTypeJWT
 )
 
-func (c *OIDCApp) IsValid() bool {
+func (a *OIDCApp) IsValid() bool {
-	grantTypes := c.getRequiredGrantTypes()
+	grantTypes := a.getRequiredGrantTypes()
 	for _, grantType := range grantTypes {
-		ok := containsOIDCGrantType(c.GrantTypes, grantType)
+		ok := containsOIDCGrantType(a.GrantTypes, grantType)
 		if !ok {
 			return false
 		}
@@ -123,10 +123,10 @@ func (c *OIDCApp) IsValid() bool {
 	return true
 }
 
-func (c *OIDCApp) getRequiredGrantTypes() []OIDCGrantType {
+func (a *OIDCApp) getRequiredGrantTypes() []OIDCGrantType {
 	grantTypes := make([]OIDCGrantType, 0)
 	implicit := false
-	for _, r := range c.ResponseTypes {
+	for _, r := range a.ResponseTypes {
 		switch r {
 		case OIDCResponseTypeCode:
 			grantTypes = append(grantTypes, OIDCGrantTypeAuthorizationCode)
@@ -149,8 +149,8 @@ func containsOIDCGrantType(grantTypes []OIDCGrantType, grantType OIDCGrantType)
 	return false
 }
 
-func (c *OIDCApp) FillCompliance() {
+func (a *OIDCApp) FillCompliance() {
-	c.Compliance = GetOIDCCompliance(c.OIDCVersion, c.ApplicationType, c.GrantTypes, c.ResponseTypes, c.AuthMethodType, c.RedirectUris)
+	a.Compliance = GetOIDCCompliance(a.OIDCVersion, a.ApplicationType, a.GrantTypes, a.ResponseTypes, a.AuthMethodType, a.RedirectUris)
 }
 
 func GetOIDCCompliance(version OIDCVersion, appType OIDCApplicationType, grantTypes []OIDCGrantType, responseTypes []OIDCResponseType, authMethod OIDCAuthMethodType, redirectUris []string) *Compliance {

internal/key/repository/view/query.go

@@ -3,9 +3,11 @@ package view
 import (
 	"github.com/caos/zitadel/internal/eventstore"
 	"github.com/caos/zitadel/internal/repository/iam"
+	"github.com/caos/zitadel/internal/repository/keypair"
 )
 
 func KeyPairQuery(latestSequence uint64) *eventstore.SearchQueryBuilder {
 	return eventstore.NewSearchQueryBuilder(eventstore.ColumnsEvent, iam.AggregateType).
-		SequenceGreater(latestSequence)
+		SequenceGreater(latestSequence).
+		EventTypes(keypair.AddedEventType)
 }

internal/notification/repository/eventsourcing/handler/notify_user.go

@@ -242,7 +242,11 @@ func (u *NotifyUser) getOrgByID(ctx context.Context, orgID string) (*org_model.O
 		return nil, err
 	}
 
-	var esOrg *org_es_model.Org
+	esOrg := &org_es_model.Org{
+		ObjectRoot: es_models.ObjectRoot{
+			AggregateID: orgID,
+		},
+	}
 	err = es_sdk.Filter(ctx, u.Eventstore().FilterEvents, esOrg.AppendEvents, query)
 	if err != nil && !caos_errs.IsNotFound(err) {
 		return nil, err

internal/repository/keypair/aggregate.go

@@ -1,4 +1,4 @@
-package usergrant
+package keypair
 
 import (
 	"github.com/caos/zitadel/internal/eventstore"

internal/repository/keypair/eventstore.go

@@ -1,4 +1,4 @@
-package usergrant
+package keypair
 
 import (
 	"github.com/caos/zitadel/internal/eventstore"

internal/repository/keypair/key_pair.go

@@ -1,4 +1,4 @@
-package usergrant
+package keypair
 
 import (
 	"context"

migrations/cockroach/V1.36__queries.sql

@@ -1,2 +1,2 @@
 CREATE USER queries WITH PASSWORD ${queriespassword};
-GRANT SELECT ON DATABASE eventstore TO queries;
+GRANT SELECT ON TABLE eventstore.events TO queries;