mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 19:44:21 +00:00
042c438813
# Which Problems Are Solved The current v3alpha actions APIs don't exactly adhere to the [new resources API design](https://zitadel.com/docs/apis/v3#standard-resources). # How the Problems Are Solved - **Improved ID access**: The aggregate ID is added to the resource details object, so accessing resource IDs and constructing proto messages for resources is easier - **Explicit Instances**: Optionally, the instance can be explicitly given in each request - **Pagination**: A default search limit and a max search limit are added to the defaults.yaml. They apply to the new v3 APIs (currently only actions). The search query defaults are changed to ascending by creation date, because this makes the pagination results the most deterministic. The creation date is also added to the object details. The bug with updated creation dates is fixed for executions and targets. - **Removed Sequences**: Removed Sequence from object details and ProcessedSequence from search details # Additional Changes Object details IDs are checked in unit test only if an empty ID is expected. Centralizing the details check also makes this internal object more flexible for future evolutions. # Additional Context - Closes #8169 - Depends on https://github.com/zitadel/zitadel/pull/8225 --------- Co-authored-by: Silvan <silvan.reusser@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
425 lines
10 KiB
Go
425 lines
10 KiB
Go
package command
|
|
|
|
import (
|
|
"context"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func TestCommandSide_AddOIDCConfig(t *testing.T) {
|
|
type fields struct {
|
|
eventstore *eventstore.Eventstore
|
|
}
|
|
type args struct {
|
|
ctx context.Context
|
|
oidcConfig *domain.OIDCSettings
|
|
}
|
|
type res struct {
|
|
want *domain.ObjectDetails
|
|
err func(error) bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
args args
|
|
res res
|
|
}{
|
|
{
|
|
name: "oidc settings, error already exists",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
instance.NewOIDCSettingsAddedEvent(context.Background(),
|
|
&instance.NewAggregate("INSTANCE").Aggregate,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorAlreadyExists,
|
|
},
|
|
},
|
|
{
|
|
name: "add oidc settings, ok",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(),
|
|
expectPush(
|
|
instance.NewOIDCSettingsAddedEvent(
|
|
context.Background(),
|
|
&instance.NewAggregate("INSTANCE").Aggregate,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "INSTANCE",
|
|
},
|
|
},
|
|
},
|
|
{
|
|
name: "add oidc settings, invalid argument 1",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 0 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "add oidc settings, invalid argument 2",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 0 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "add oidc settings, invalid argument 3",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 0 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "add oidc settings, invalid argument 4",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 0 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
r := &Commands{
|
|
eventstore: tt.fields.eventstore,
|
|
}
|
|
got, err := r.AddOIDCSettings(tt.args.ctx, tt.args.oidcConfig)
|
|
if tt.res.err == nil {
|
|
assert.NoError(t, err)
|
|
}
|
|
if tt.res.err != nil && !tt.res.err(err) {
|
|
t.Errorf("got wrong err: %v ", err)
|
|
}
|
|
if tt.res.err == nil {
|
|
assertObjectDetails(t, tt.res.want, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestCommandSide_ChangeOIDCConfig(t *testing.T) {
|
|
type fields struct {
|
|
eventstore *eventstore.Eventstore
|
|
}
|
|
type args struct {
|
|
ctx context.Context
|
|
oidcConfig *domain.OIDCSettings
|
|
}
|
|
type res struct {
|
|
want *domain.ObjectDetails
|
|
err func(error) bool
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
fields fields
|
|
args args
|
|
res res
|
|
}{
|
|
{
|
|
name: "oidc settings not existing, not found error",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: context.Background(),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsNotFound,
|
|
},
|
|
},
|
|
{
|
|
name: "no changes, invalid argument error 1",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 0 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "no changes, invalid argument error 2",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 0 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "no changes, invalid argument error 3",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 0 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "no changes, invalid argument error 4",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 0 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsErrorInvalidArgument,
|
|
},
|
|
},
|
|
{
|
|
name: "no changes, precondition error",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
instance.NewOIDCSettingsAddedEvent(
|
|
context.Background(),
|
|
&instance.NewAggregate("INSTANCE").Aggregate,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 1 * time.Hour,
|
|
IdTokenLifetime: 1 * time.Hour,
|
|
RefreshTokenIdleExpiration: 1 * time.Hour,
|
|
RefreshTokenExpiration: 1 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
err: zerrors.IsPreconditionFailed,
|
|
},
|
|
},
|
|
{
|
|
name: "oidc settings change, ok",
|
|
fields: fields{
|
|
eventstore: eventstoreExpect(
|
|
t,
|
|
expectFilter(
|
|
eventFromEventPusher(
|
|
instance.NewOIDCSettingsAddedEvent(
|
|
context.Background(),
|
|
&instance.NewAggregate("INSTANCE").Aggregate,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
time.Hour*1,
|
|
),
|
|
),
|
|
),
|
|
expectPush(
|
|
newOIDCConfigChangedEvent(
|
|
context.Background(),
|
|
time.Hour*2,
|
|
time.Hour*2,
|
|
time.Hour*2,
|
|
time.Hour*2),
|
|
),
|
|
),
|
|
},
|
|
args: args{
|
|
ctx: authz.WithInstanceID(context.Background(), "INSTANCE"),
|
|
oidcConfig: &domain.OIDCSettings{
|
|
AccessTokenLifetime: 2 * time.Hour,
|
|
IdTokenLifetime: 2 * time.Hour,
|
|
RefreshTokenIdleExpiration: 2 * time.Hour,
|
|
RefreshTokenExpiration: 2 * time.Hour,
|
|
},
|
|
},
|
|
res: res{
|
|
want: &domain.ObjectDetails{
|
|
ResourceOwner: "INSTANCE",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
r := &Commands{
|
|
eventstore: tt.fields.eventstore,
|
|
}
|
|
got, err := r.ChangeOIDCSettings(tt.args.ctx, tt.args.oidcConfig)
|
|
if tt.res.err == nil {
|
|
assert.NoError(t, err)
|
|
}
|
|
if tt.res.err != nil && !tt.res.err(err) {
|
|
t.Errorf("got wrong err: %v ", err)
|
|
}
|
|
if tt.res.err == nil {
|
|
assertObjectDetails(t, tt.res.want, got)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func newOIDCConfigChangedEvent(ctx context.Context, accessTokenLifetime, idTokenLifetime, refreshTokenIdleExpiration, refreshTokenExpiration time.Duration) *instance.OIDCSettingsChangedEvent {
|
|
changes := []instance.OIDCSettingsChanges{
|
|
instance.ChangeOIDCSettingsAccessTokenLifetime(accessTokenLifetime),
|
|
instance.ChangeOIDCSettingsIdTokenLifetime(idTokenLifetime),
|
|
instance.ChangeOIDCSettingsRefreshTokenIdleExpiration(refreshTokenIdleExpiration),
|
|
instance.ChangeOIDCSettingsRefreshTokenExpiration(refreshTokenExpiration),
|
|
}
|
|
event, _ := instance.NewOIDCSettingsChangeEvent(ctx,
|
|
&instance.NewAggregate("INSTANCE").Aggregate,
|
|
changes,
|
|
)
|
|
return event
|
|
}
|