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

fix: resourceowner added for user state write model

Browse Source
This commit is contained in:
Stefan Benz
2025-08-08 13:37:03 +02:00
parent 4930870504
commit f3a86aedff
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/command/oidc_session.go
View File

@@ -295,7 +295,7 @@ func (c *Commands) RevokeOIDCSessionToken(ctx context.Context, token, clientID s
} }
func (c *Commands) newOIDCSessionAddEvents(ctx context.Context, userID, resourceOwner string, pending ...eventstore.Command) (*OIDCSessionEvents, error) { func (c *Commands) newOIDCSessionAddEvents(ctx context.Context, userID, resourceOwner string, pending ...eventstore.Command) (*OIDCSessionEvents, error) {
userStateModel, err := c.userStateWriteModel(ctx, userID) userStateModel, err := c.userStateWriteModel(ctx, userID, resourceOwner)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -358,7 +358,7 @@ func (c *Commands) newOIDCSessionUpdateEvents(ctx context.Context, refreshToken
if err = sessionWriteModel.CheckRefreshToken(refreshTokenID); err != nil { if err = sessionWriteModel.CheckRefreshToken(refreshTokenID); err != nil {
return nil, err return nil, err
} }
userStateWriteModel, err := c.userStateWriteModel(ctx, sessionWriteModel.UserID) userStateWriteModel, err := c.userStateWriteModel(ctx, sessionWriteModel.UserID, sessionWriteModel.UserResourceOwner)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
internal/command/saml_session.go
View File

@@ -93,7 +93,7 @@ func (c *Commands) CreateSAMLSessionFromSAMLRequest(ctx context.Context, samlReq
} }
func (c *Commands) newSAMLSessionAddEvents(ctx context.Context, userID, resourceOwner string, pending ...eventstore.Command) (*SAMLSessionEvents, error) { func (c *Commands) newSAMLSessionAddEvents(ctx context.Context, userID, resourceOwner string, pending ...eventstore.Command) (*SAMLSessionEvents, error) {
userStateModel, err := c.userStateWriteModel(ctx, userID) userStateModel, err := c.userStateWriteModel(ctx, userID, resourceOwner)
if err != nil { if err != nil {
return nil, err return nil, err
} }

12
internal/command/user_v2.go
View File

@@ -17,7 +17,7 @@ func (c *Commands) LockUserV2(ctx context.Context, userID string) (*domain.Objec
return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-agz3eczifm", "Errors.User.UserIDMissing") return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-agz3eczifm", "Errors.User.UserIDMissing")
} }
existingHuman, err := c.userStateWriteModel(ctx, userID) existingHuman, err := c.userStateWriteModel(ctx, userID, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -43,7 +43,7 @@ func (c *Commands) UnlockUserV2(ctx context.Context, userID string) (*domain.Obj
return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-a9ld4xckax", "Errors.User.UserIDMissing") return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-a9ld4xckax", "Errors.User.UserIDMissing")
} }
existingHuman, err := c.userStateWriteModel(ctx, userID) existingHuman, err := c.userStateWriteModel(ctx, userID, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -68,7 +68,7 @@ func (c *Commands) DeactivateUserV2(ctx context.Context, userID string) (*domain
return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-78iiirat8y", "Errors.User.UserIDMissing") return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-78iiirat8y", "Errors.User.UserIDMissing")
} }
existingHuman, err := c.userStateWriteModel(ctx, userID) existingHuman, err := c.userStateWriteModel(ctx, userID, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -96,7 +96,7 @@ func (c *Commands) ReactivateUserV2(ctx context.Context, userID string) (*domain
return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-0nx1ie38fw", "Errors.User.UserIDMissing") return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-0nx1ie38fw", "Errors.User.UserIDMissing")
} }
existingHuman, err := c.userStateWriteModel(ctx, userID) existingHuman, err := c.userStateWriteModel(ctx, userID, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -116,11 +116,11 @@ func (c *Commands) ReactivateUserV2(ctx context.Context, userID string) (*domain
return writeModelToObjectDetails(&existingHuman.WriteModel), nil return writeModelToObjectDetails(&existingHuman.WriteModel), nil
} }
func (c *Commands) userStateWriteModel(ctx context.Context, userID string) (writeModel *UserV2WriteModel, err error) { func (c *Commands) userStateWriteModel(ctx context.Context, userID, resourceOwner string) (writeModel *UserV2WriteModel, err error) {
ctx, span := tracing.NewSpan(ctx) ctx, span := tracing.NewSpan(ctx)
defer func() { span.EndWithError(err) }() defer func() { span.EndWithError(err) }()
writeModel = NewUserStateWriteModel(userID, "") writeModel = NewUserStateWriteModel(userID, resourceOwner)
err = c.eventstore.FilterToQueryReducer(ctx, writeModel) err = c.eventstore.FilterToQueryReducer(ctx, writeModel)
if err != nil { if err != nil {
return nil, err return nil, err

2
internal/command/user_v2_human.go
View File

@@ -511,7 +511,7 @@ func (c *Commands) HumanMFAInitSkippedV2(ctx context.Context, userID string) (*d
return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Wei5kooz1i", "Errors.User.UserIDMissing") return nil, zerrors.ThrowInvalidArgument(nil, "COMMAND-Wei5kooz1i", "Errors.User.UserIDMissing")
} }
existingHuman, err := c.userStateWriteModel(ctx, userID) existingHuman, err := c.userStateWriteModel(ctx, userID, "")
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
internal/command/user_v2_model_test.go
View File

@@ -1992,7 +1992,7 @@ func TestCommandSide_userStateWriteModel(t *testing.T) {
r := &Commands{ r := &Commands{
eventstore: tt.fields.eventstore(t), eventstore: tt.fields.eventstore(t),
} }
wm, err := r.userStateWriteModel(tt.args.ctx, tt.args.userID) wm, err := r.userStateWriteModel(tt.args.ctx, tt.args.userID, "")
if tt.res.err == nil { if tt.res.err == nil {
if !assert.NoError(t, err) { if !assert.NoError(t, err) {
t.FailNow() t.FailNow()