2020-05-13 12:22:29 +00:00
|
|
|
package eventsourcing
|
|
|
|
|
|
|
|
import (
|
|
|
|
"context"
|
2020-08-26 07:56:23 +00:00
|
|
|
iam_es_model "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
|
2020-05-13 12:22:29 +00:00
|
|
|
"testing"
|
|
|
|
|
2020-07-08 11:56:37 +00:00
|
|
|
"github.com/caos/zitadel/internal/api/authz"
|
2020-05-13 12:22:29 +00:00
|
|
|
"github.com/caos/zitadel/internal/errors"
|
|
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
|
|
|
org_model "github.com/caos/zitadel/internal/org/model"
|
2020-07-08 11:56:37 +00:00
|
|
|
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
|
2020-05-13 12:22:29 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
func Test_isReservedValidation(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
isErr func(error) bool
|
|
|
|
agggregateSequence uint64
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
aggregate *es_models.Aggregate
|
|
|
|
eventType es_models.EventType
|
|
|
|
Events []*es_models.Event
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no events success",
|
|
|
|
args: args{
|
|
|
|
aggregate: &es_models.Aggregate{},
|
|
|
|
eventType: "object.reserved",
|
|
|
|
Events: []*es_models.Event{},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: nil,
|
|
|
|
agggregateSequence: 0,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "not reseved success",
|
|
|
|
args: args{
|
|
|
|
aggregate: &es_models.Aggregate{},
|
|
|
|
eventType: "object.reserved",
|
|
|
|
Events: []*es_models.Event{
|
|
|
|
{
|
|
|
|
AggregateID: "asdf",
|
|
|
|
AggregateType: "org",
|
|
|
|
Sequence: 45,
|
|
|
|
Type: "object.released",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: nil,
|
|
|
|
agggregateSequence: 45,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "reseved error",
|
|
|
|
args: args{
|
|
|
|
aggregate: &es_models.Aggregate{},
|
|
|
|
eventType: "object.reserved",
|
|
|
|
Events: []*es_models.Event{
|
|
|
|
{
|
|
|
|
AggregateID: "asdf",
|
|
|
|
AggregateType: "org",
|
|
|
|
Sequence: 45,
|
|
|
|
Type: "object.reserved",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
agggregateSequence: 0,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-06-16 09:40:18 +00:00
|
|
|
validate := isEventValidation(tt.args.aggregate, tt.args.eventType)
|
2020-05-13 12:22:29 +00:00
|
|
|
|
|
|
|
err := validate(tt.args.Events...)
|
|
|
|
|
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got: %v", err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got: %v", err)
|
|
|
|
}
|
|
|
|
if err == nil && tt.args.aggregate.PreviousSequence != tt.res.agggregateSequence {
|
|
|
|
t.Errorf("expected sequence %d got %d", tt.res.agggregateSequence, tt.args.aggregate.PreviousSequence)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func aggregateWithPrecondition() *es_models.Aggregate {
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func Test_uniqueNameAggregate(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
expected *es_models.Aggregate
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
orgName string
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no org name error",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
orgName: "",
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
expected: nil,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "aggregate created",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
orgName: "asdf",
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
expected: aggregateWithPrecondition(),
|
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-06-16 09:40:18 +00:00
|
|
|
got, err := reservedUniqueNameAggregate(tt.args.ctx, tt.args.aggCreator, "", tt.args.orgName)
|
2020-05-13 12:22:29 +00:00
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got: %v", err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && (got.Precondition == nil || got.Precondition.Query == nil || got.Precondition.Validation == nil) {
|
|
|
|
t.Errorf("precondition is not set correctly")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func Test_uniqueDomainAggregate(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
expected *es_models.Aggregate
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
orgDomain string
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no org domain error",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
orgDomain: "",
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
expected: nil,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "aggregate created",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
orgDomain: "asdf",
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
expected: aggregateWithPrecondition(),
|
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-06-16 09:40:18 +00:00
|
|
|
got, err := reservedUniqueDomainAggregate(tt.args.ctx, tt.args.aggCreator, "", tt.args.orgDomain)
|
2020-05-13 12:22:29 +00:00
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got: %v", err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && (got.Precondition == nil || got.Precondition.Query == nil || got.Precondition.Validation == nil) {
|
|
|
|
t.Errorf("precondition is not set correctly")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgReactivateAggregate(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
aggCreator *es_models.AggregateCreator
|
2020-06-05 05:50:04 +00:00
|
|
|
org *model.Org
|
2020-05-13 12:22:29 +00:00
|
|
|
ctx context.Context
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "correct",
|
|
|
|
args: args{
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "orgID",
|
|
|
|
Sequence: 2,
|
|
|
|
},
|
2020-06-23 12:47:47 +00:00
|
|
|
State: int32(org_model.OrgStateInactive),
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "already active error",
|
|
|
|
args: args{
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "orgID",
|
|
|
|
Sequence: 2,
|
|
|
|
},
|
2020-06-23 12:47:47 +00:00
|
|
|
State: int32(org_model.OrgStateActive),
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsErrorInvalidArgument,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "org nil error",
|
|
|
|
args: args{
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
org: nil,
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
aggregateCreator := orgReactivateAggregate(tt.args.aggCreator, tt.args.org)
|
|
|
|
aggregate, err := aggregateCreator(tt.args.ctx)
|
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got: %v", err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && aggregate == nil {
|
|
|
|
t.Error("aggregate must not be nil")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgDeactivateAggregate(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
aggCreator *es_models.AggregateCreator
|
2020-06-05 05:50:04 +00:00
|
|
|
org *model.Org
|
2020-05-13 12:22:29 +00:00
|
|
|
ctx context.Context
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "correct",
|
|
|
|
args: args{
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "orgID",
|
|
|
|
Sequence: 2,
|
|
|
|
},
|
2020-06-23 12:47:47 +00:00
|
|
|
State: int32(org_model.OrgStateActive),
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "already inactive error",
|
|
|
|
args: args{
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "orgID",
|
|
|
|
Sequence: 2,
|
|
|
|
},
|
2020-06-23 12:47:47 +00:00
|
|
|
State: int32(org_model.OrgStateInactive),
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsErrorInvalidArgument,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "org nil error",
|
|
|
|
args: args{
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
org: nil,
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
aggregateCreator := orgDeactivateAggregate(tt.args.aggCreator, tt.args.org)
|
|
|
|
aggregate, err := aggregateCreator(tt.args.ctx)
|
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got: %v", err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && aggregate == nil {
|
|
|
|
t.Error("aggregate must not be nil")
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgUpdateAggregates(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
aggregateCount int
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
existingOrg *model.Org
|
|
|
|
updated *model.Org
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no existing org error",
|
|
|
|
args: args{
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
existingOrg: nil,
|
|
|
|
updated: &model.Org{},
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 0,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no updated org error",
|
|
|
|
args: args{
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
existingOrg: &model.Org{},
|
|
|
|
updated: nil,
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 0,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no changes",
|
|
|
|
args: args{
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
existingOrg: &model.Org{},
|
|
|
|
updated: &model.Org{},
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 0,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "name changed",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
existingOrg: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
Name: "coas",
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
2020-06-05 05:50:04 +00:00
|
|
|
updated: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
Name: "caos",
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
2020-06-16 09:40:18 +00:00
|
|
|
aggregateCount: 3,
|
2020-05-13 12:22:29 +00:00
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
feat: split users into human and machine (#470)
* feat(management): service accounts
* chore: current go version
* init
* refactor: apis
* feat(internal): start impl of service account
* chore: start impl of machine/human users
* code compiles
* fix: tests
* fix: tests
* fix: add new event types to switches
* chore: add cases to event types
* fix(management): definitive proto messages
* fix: machine/human
* fix: add missing tables as todos
* fix: remove unused permissions
* fix: refactoring
* fix: refactor
* fix: human registered
* fix: user id
* fix: logid
* fix: proto remove //equal
* chore(management): remove no comment
* fix: human mfas
* fix: user subobjects
* chore: rename existing to better name
* fix: username in user (#634)
* fix: username in user
* fix: username
* fix remove unused code
* fix add validations
* fix: use new user in all apis
* fix: regexp for username in api
* fix: fill user data for human and machine (#638)
* fix: fill Display name grant/member handlers
fix: add description to grant/member objects in api
fix: check if user is human in login
* fix: remove description from member and grant
* chore: remove todos
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix partial authconfig prompt, domain c perm
* membership read check
* contributor refresh trigger, observe org write
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* user permissions, project deactivate
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* allow user grants for project.write
* management service
* fix mgmt service
* feat: Machine keys (#655)
* fix: memberships (#633)
* feat: add iam members to memberships
* fix: search project grants
* fix: rename
* feat: idp and login policy configurations (#619)
* feat: oidc config
* fix: oidc configurations
* feat: oidc idp config
* feat: add oidc config test
* fix: tests
* fix: tests
* feat: translate new events
* feat: idp eventstore
* feat: idp eventstore
* fix: tests
* feat: command side idp
* feat: query side idp
* feat: idp config on org
* fix: tests
* feat: authz idp on org
* feat: org idps
* feat: login policy
* feat: login policy
* feat: login policy
* feat: add idp func on login policy
* feat: add validation to loginpolicy and idp provider
* feat: add default login policy
* feat: login policy on org
* feat: login policy on org
* fix: id config handlers
* fix: id config handlers
* fix: create idp on org
* fix: create idp on org
* fix: not existing idp config
* fix: default login policy
* fix: add login policy on org
* fix: idp provider search on org
* fix: test
* fix: remove idp on org
* fix: test
* fix: test
* fix: remove admin idp
* fix: logo src as byte
* fix: migration
* fix: tests
* Update internal/iam/repository/eventsourcing/iam.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/iam_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/org/repository/eventsourcing/org_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* Update internal/iam/repository/eventsourcing/model/login_policy_test.go
Co-authored-by: Silvan <silvan.reusser@gmail.com>
* fix: pr comments
* fix: tests
* Update types.go
* fix: merge request changes
* fix: reduce optimization
Co-authored-by: Silvan <silvan.reusser@gmail.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix: reread user mfas, preferred loginname as otp account name (#636)
* fix: reread user mfas
* fix: use preferred login name as otp account name
* fix: tests
* fix: reduce (#635)
* fix: management reduce optimization
* fix: reduce optimization
* fix: reduce optimization
* fix: merge master
* chore(deps): bump github.com/gorilla/schema from 1.1.0 to 1.2.0 (#627)
Bumps [github.com/gorilla/schema](https://github.com/gorilla/schema) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/gorilla/schema/releases)
- [Commits](https://github.com/gorilla/schema/compare/v1.1.0...v1.2.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/gorilla/mux from 1.7.4 to 1.8.0 (#624)
Bumps [github.com/gorilla/mux](https://github.com/gorilla/mux) from 1.7.4 to 1.8.0.
- [Release notes](https://github.com/gorilla/mux/releases)
- [Commits](https://github.com/gorilla/mux/compare/v1.7.4...v1.8.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps): bump github.com/DATA-DOG/go-sqlmock from 1.4.1 to 1.5.0 (#591)
Bumps [github.com/DATA-DOG/go-sqlmock](https://github.com/DATA-DOG/go-sqlmock) from 1.4.1 to 1.5.0.
- [Release notes](https://github.com/DATA-DOG/go-sqlmock/releases)
- [Commits](https://github.com/DATA-DOG/go-sqlmock/compare/v1.4.1...v1.5.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: auto assign issues and PR to ZTIADEL project board (#643)
* Create main.yml
* Update main.yml
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
* fix(console): project grant members, update deps (#645)
* fix: searchprojectgrantmembers
* chore(deps-dev): bump @angular/cli from 10.0.6 to 10.0.7 in /console (#622)
Bumps [@angular/cli](https://github.com/angular/angular-cli) from 10.0.6 to 10.0.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/compare/v10.0.6...v10.0.7)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump @angular-devkit/build-angular in /console (#626)
Bumps [@angular-devkit/build-angular](https://github.com/angular/angular-cli) from 0.1000.6 to 0.1000.7.
- [Release notes](https://github.com/angular/angular-cli/releases)
- [Commits](https://github.com/angular/angular-cli/commits)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
* chore(deps-dev): bump @types/jasmine from 3.5.12 to 3.5.13 in /console (#623)
Bumps [@types/jasmine](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/jasmine) from 3.5.12 to 3.5.13.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/jasmine)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore(deps-dev): bump ts-node from 8.10.2 to 9.0.0 in /console (#629)
Bumps [ts-node](https://github.com/TypeStrong/ts-node) from 8.10.2 to 9.0.0.
- [Release notes](https://github.com/TypeStrong/ts-node/releases)
- [Commits](https://github.com/TypeStrong/ts-node/compare/v8.10.2...v9.0.0)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* update packlock
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* chore: delete main.yml (#648)
* fix: usergrant (#650)
* fix(console): mfa refresh after verification, member eventemitter (#651)
* refresh mfa
* fix: detail link from contributors
* lint
* feat: add domain verification notification (#649)
* fix: dont (re)generate client secret with auth type none
* fix(cors): allow Origin from request
* feat: add origin allow list and fix some core issues
* rename migration
* fix UserIDsByDomain
* feat: send email to users after domain claim
* username
* check origin on userinfo
* update oidc pkg
* fix: add migration 1.6
* change username
* change username
* remove unique email aggregate
* change username in mgmt
* search global user by login name
* fix test
* change user search in angular
* fix tests
* merge
* userview in angular
* fix merge
* Update pkg/grpc/management/proto/management.proto
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* Update internal/notification/static/i18n/de.yaml
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
* fix: translation (#647)
* fix: translation
* fix: translation
* fix: translation
* fix: remove unused code
* fix: log err
* fix: migration numbers (#652)
* chore: issue / feature templates (#642)
* feat: machine keys
* fix: implement missing parts
* feat: machine key management view
* fix: remove keys from machine view
* feat: global org read (#657)
* fix: set default expiration date
* fix: get key by ids
* feat: add machine keys in proto
* feat: machine keys
* fix: add migration
* fix: mig
* fix: correct method name
* feat: user search
* feat: user search
* fix: log ids
* fix: migrations
* fix(console): machine build (#660)
* frontend 1
* fix html bindings
* trailing comma
* fix(console): human view (#661)
* fix search user view, user detail form
* rm log
* feat(console): user services list and create (#663)
* fix search user view, user detail form
* rm log
* machine list
* generic table component
* create user service
* proove table for undefined values
* tmp disable user link if machine
* lint
* lint styles
* user table lint
* Update console/src/assets/i18n/de.json
Co-authored-by: Florian Forster <florian@caos.ch>
* feat(console): service user detail view, keys cr_d, fix search user autocomplete (#664)
* service users for sidenav, routing
* i18n
* back routes
* machine detail form
* update machine detail, fix svc user grants
* keys table
* add key dialog, timestamp creation
* check permission on create, delete, fix selection
* lint ts, scss
* Update console/src/assets/i18n/de.json
* Apply suggestions from code review
Co-authored-by: Florian Forster <florian@caos.ch>
* refactor: protos
* fix(management): key expiration date
* fix: check if user is human
* fix: marshal key details
* fix: correct generate login names
* fix: logid
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Florian Forster <florian@caos.ch>
* fix: naming
* refactor: findings
* fix: username
* fix: mfa upper case
* fix: tests
* fix: add translations
* reactivatemyorg req typeö
* fix: projectType for console
* fix: user changes
* fix: translate events
* fix: event type translation
* fix: remove unused types
Co-authored-by: Fabiennne <fabienne.gerschwiler@gmail.com>
Co-authored-by: Max Peintner <max@caos.ch>
Co-authored-by: Florian Forster <florian@caos.ch>
Co-authored-by: Fabi <38692350+fgerschwiler@users.noreply.github.com>
Co-authored-by: Livio Amstutz <livio.a@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-08-31 15:48:01 +00:00
|
|
|
got, err := OrgUpdateAggregates(tt.args.ctx, tt.args.aggCreator, tt.args.existingOrg, tt.args.updated)
|
2020-06-16 09:40:18 +00:00
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got: %v", err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && len(got) != tt.res.aggregateCount {
|
|
|
|
t.Errorf("OrgUpdateAggregates() aggregate count = %d, wanted count %d", len(got), tt.res.aggregateCount)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgCreatedAggregates(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
aggregateCount int
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
org *model.Org
|
2020-08-18 06:57:16 +00:00
|
|
|
users func(ctx context.Context, domain string) ([]*es_models.Aggregate, error)
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no org error",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
org: nil,
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 0,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
2020-05-13 12:22:29 +00:00
|
|
|
{
|
2020-06-16 09:40:18 +00:00
|
|
|
name: "org successful",
|
2020-05-13 12:22:29 +00:00
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-06-16 09:40:18 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
Name: "caos",
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 2,
|
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "org with domain successful",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
Name: "caos",
|
2020-07-08 11:56:37 +00:00
|
|
|
Domains: []*model.OrgDomain{{
|
2020-06-16 09:40:18 +00:00
|
|
|
Domain: "caos.ch",
|
|
|
|
}},
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 2,
|
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
2020-08-18 06:57:16 +00:00
|
|
|
{
|
|
|
|
name: "org with domain users aggregate error",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
org: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
|
|
|
Name: "caos",
|
|
|
|
Domains: []*model.OrgDomain{{
|
|
|
|
Domain: "caos.ch",
|
|
|
|
Verified: true,
|
|
|
|
}},
|
|
|
|
},
|
|
|
|
users: func(ctx context.Context, domain string) ([]*es_models.Aggregate, error) {
|
|
|
|
return nil, errors.ThrowInternal(nil, "id", "internal error")
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
{
|
|
|
|
name: "no name error",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
org: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 2,
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-08-18 06:57:16 +00:00
|
|
|
got, err := orgCreatedAggregates(tt.args.ctx, tt.args.aggCreator, tt.args.org, tt.args.users)
|
2020-05-13 12:22:29 +00:00
|
|
|
if tt.res.isErr == nil && err != nil {
|
2020-06-16 09:40:18 +00:00
|
|
|
t.Errorf("no error expected got %T: %v", err, err)
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && len(got) != tt.res.aggregateCount {
|
|
|
|
t.Errorf("OrgUpdateAggregates() aggregate count = %d, wanted count %d", len(got), tt.res.aggregateCount)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-06-16 09:40:18 +00:00
|
|
|
func TestOrgDomainAddedAggregates(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
eventCount int
|
|
|
|
eventType es_models.EventType
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
org *model.Org
|
|
|
|
domain *model.OrgDomain
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no domain error",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "domain successful",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
org: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
domain: &model.OrgDomain{
|
|
|
|
Domain: "caos.ch",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventCount: 1,
|
|
|
|
eventType: model.OrgDomainAdded,
|
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg := OrgDomainAddedAggregate(tt.args.aggCreator, tt.args.org, tt.args.domain)
|
|
|
|
got, err := agg(tt.args.ctx)
|
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if tt.res.isErr == nil && got.Events[0].Type != tt.res.eventType {
|
|
|
|
t.Errorf("OrgDomainAddedAggregate() event type = %v, wanted count %v", got.Events[0].Type, tt.res.eventType)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && len(got.Events) != tt.res.eventCount {
|
|
|
|
t.Errorf("OrgDomainAddedAggregate() event count = %v, wanted count %v", len(got.Events), tt.res.eventCount)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgDomainVerifiedAggregates(t *testing.T) {
|
2020-05-13 12:22:29 +00:00
|
|
|
type res struct {
|
|
|
|
aggregateCount int
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
2020-06-05 05:50:04 +00:00
|
|
|
org *model.Org
|
2020-06-16 09:40:18 +00:00
|
|
|
domain *model.OrgDomain
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
2020-06-16 09:40:18 +00:00
|
|
|
name: "no domain error",
|
2020-05-13 12:22:29 +00:00
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
},
|
|
|
|
res: res{
|
2020-06-16 09:40:18 +00:00
|
|
|
isErr: errors.IsPreconditionFailed,
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2020-06-16 09:40:18 +00:00
|
|
|
name: "domain successful",
|
2020-05-13 12:22:29 +00:00
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
},
|
|
|
|
domain: &model.OrgDomain{
|
2020-05-13 12:22:29 +00:00
|
|
|
Domain: "caos.ch",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
2020-06-16 09:40:18 +00:00
|
|
|
aggregateCount: 2,
|
2020-05-13 12:22:29 +00:00
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-08-18 06:57:16 +00:00
|
|
|
got, err := OrgDomainVerifiedAggregate(tt.args.ctx, tt.args.aggCreator, tt.args.org, tt.args.domain, nil)
|
2020-06-16 09:40:18 +00:00
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && len(got) != tt.res.aggregateCount {
|
|
|
|
t.Errorf("OrgDomainVerifiedAggregate() aggregate count = %d, wanted count %d", len(got), tt.res.aggregateCount)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgDomainSetPrimaryAggregates(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
eventsCount int
|
|
|
|
eventType es_models.EventType
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
org *model.Org
|
|
|
|
domain *model.OrgDomain
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
2020-05-13 12:22:29 +00:00
|
|
|
{
|
|
|
|
name: "no domain error",
|
2020-06-16 09:40:18 +00:00
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "domain successful",
|
2020-05-13 12:22:29 +00:00
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
},
|
|
|
|
domain: &model.OrgDomain{
|
|
|
|
Domain: "caos.ch",
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
2020-06-16 09:40:18 +00:00
|
|
|
eventsCount: 1,
|
|
|
|
eventType: model.OrgDomainPrimarySet,
|
|
|
|
isErr: nil,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg := OrgDomainSetPrimaryAggregate(tt.args.aggCreator, tt.args.org, tt.args.domain)
|
|
|
|
got, err := agg(tt.args.ctx)
|
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && got.Events[0].Type != tt.res.eventType {
|
|
|
|
t.Errorf("OrgDomainSetPrimaryAggregate() event type = %v, wanted count %v", got.Events[0].Type, tt.res.eventType)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && len(got.Events) != tt.res.eventsCount {
|
|
|
|
t.Errorf("OrgDomainSetPrimaryAggregate() event count = %d, wanted count %d", len(got.Events), tt.res.eventsCount)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOrgDomainRemovedAggregates(t *testing.T) {
|
|
|
|
type res struct {
|
|
|
|
aggregateCount int
|
|
|
|
isErr func(error) bool
|
|
|
|
}
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
org *model.Org
|
|
|
|
domain *model.OrgDomain
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "no domain error",
|
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-06-16 09:40:18 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 0,
|
2020-05-13 12:22:29 +00:00
|
|
|
isErr: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
2020-06-16 09:40:18 +00:00
|
|
|
name: "domain successful",
|
2020-05-13 12:22:29 +00:00
|
|
|
args: args{
|
2020-07-08 11:56:37 +00:00
|
|
|
ctx: authz.NewMockContext("org", "user"),
|
2020-05-13 12:22:29 +00:00
|
|
|
aggCreator: es_models.NewAggregateCreator("test"),
|
2020-06-05 05:50:04 +00:00
|
|
|
org: &model.Org{
|
2020-05-13 12:22:29 +00:00
|
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
|
|
AggregateID: "sdaf",
|
|
|
|
Sequence: 5,
|
|
|
|
},
|
2020-06-16 09:40:18 +00:00
|
|
|
},
|
|
|
|
domain: &model.OrgDomain{
|
2020-05-13 12:22:29 +00:00
|
|
|
Domain: "caos.ch",
|
|
|
|
},
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
aggregateCount: 2,
|
2020-06-16 09:40:18 +00:00
|
|
|
isErr: nil,
|
2020-05-13 12:22:29 +00:00
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
2020-06-16 09:40:18 +00:00
|
|
|
got, err := OrgDomainRemovedAggregate(tt.args.ctx, tt.args.aggCreator, tt.args.org, tt.args.domain)
|
2020-05-13 12:22:29 +00:00
|
|
|
if tt.res.isErr == nil && err != nil {
|
|
|
|
t.Errorf("no error expected got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr != nil && !tt.res.isErr(err) {
|
|
|
|
t.Errorf("wrong error got %T: %v", err, err)
|
|
|
|
}
|
|
|
|
if tt.res.isErr == nil && len(got) != tt.res.aggregateCount {
|
2020-06-16 09:40:18 +00:00
|
|
|
t.Errorf("OrgDomainRemovedAggregate() aggregate count = %d, wanted count %d", len(got), tt.res.aggregateCount)
|
2020-05-13 12:22:29 +00:00
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
2020-08-26 07:56:23 +00:00
|
|
|
|
|
|
|
func TestIdpConfigAddedAggregate(t *testing.T) {
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
existing *model.Org
|
|
|
|
new *iam_es_model.IDPConfig
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
}
|
|
|
|
type res struct {
|
|
|
|
eventLen int
|
|
|
|
eventTypes []es_models.EventType
|
|
|
|
wantErr bool
|
|
|
|
errFunc func(err error) bool
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "add oidc idp configuration",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: &iam_es_model.IDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
Name: "Name",
|
|
|
|
OIDCIDPConfig: &iam_es_model.OIDCIDPConfig{IDPConfigID: "IDPConfigID", ClientID: "ClientID"},
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 2,
|
|
|
|
eventTypes: []es_models.EventType{model.IDPConfigAdded, model.OIDCIDPConfigAdded},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "existing iam nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "idp config nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg, err := IDPConfigAddedAggregate(tt.args.aggCreator, tt.args.existing, tt.args.new)(tt.args.ctx)
|
|
|
|
|
|
|
|
if !tt.res.wantErr && len(agg.Events) != tt.res.eventLen {
|
|
|
|
t.Errorf("got wrong event len: expected: %v, actual: %v ", tt.res.eventLen, len(agg.Events))
|
|
|
|
}
|
|
|
|
for i := 0; i < tt.res.eventLen; i++ {
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Type != tt.res.eventTypes[i] {
|
|
|
|
t.Errorf("got wrong event type: expected: %v, actual: %v ", tt.res.eventTypes[i], agg.Events[i].Type.String())
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if tt.res.wantErr && !tt.res.errFunc(err) {
|
|
|
|
t.Errorf("got wrong err: %v ", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestIdpConfigurationChangedAggregate(t *testing.T) {
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
existing *model.Org
|
|
|
|
new *iam_es_model.IDPConfig
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
}
|
|
|
|
type res struct {
|
|
|
|
eventLen int
|
|
|
|
eventTypes []es_models.EventType
|
|
|
|
wantErr bool
|
|
|
|
errFunc func(err error) bool
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "change idp configuration",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "IDPName"},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.IDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
Name: "NameChanged",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 1,
|
|
|
|
eventTypes: []es_models.EventType{model.IDPConfigChanged},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "existing iam nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "idp config nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg, err := IDPConfigChangedAggregate(tt.args.aggCreator, tt.args.existing, tt.args.new)(tt.args.ctx)
|
|
|
|
|
|
|
|
if !tt.res.wantErr && len(agg.Events) != tt.res.eventLen {
|
|
|
|
t.Errorf("got wrong event len: expected: %v, actual: %v ", tt.res.eventLen, len(agg.Events))
|
|
|
|
}
|
|
|
|
for i := 0; i < tt.res.eventLen; i++ {
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Type != tt.res.eventTypes[i] {
|
|
|
|
t.Errorf("got wrong event type: expected: %v, actual: %v ", tt.res.eventTypes[i], agg.Events[i].Type.String())
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if tt.res.wantErr && !tt.res.errFunc(err) {
|
|
|
|
t.Errorf("got wrong err: %v ", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestIdpConfigurationRemovedAggregate(t *testing.T) {
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
existing *model.Org
|
|
|
|
new *iam_es_model.IDPConfig
|
|
|
|
provider *iam_es_model.IDPProvider
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
}
|
|
|
|
type res struct {
|
|
|
|
eventLen int
|
|
|
|
eventTypes []es_models.EventType
|
|
|
|
wantErr bool
|
|
|
|
errFunc func(err error) bool
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "remove idp config",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "Name"},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.IDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
Name: "Name",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 1,
|
|
|
|
eventTypes: []es_models.EventType{model.IDPConfigRemoved},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "remove idp config with provider",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "Name"},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.IDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
Name: "Name",
|
|
|
|
},
|
|
|
|
provider: &iam_es_model.IDPProvider{
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 2,
|
|
|
|
eventTypes: []es_models.EventType{model.IDPConfigRemoved, model.LoginPolicyIDPProviderCascadeRemoved},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "existing iam nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "idp config nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg, err := IDPConfigRemovedAggregate(tt.args.ctx, tt.args.aggCreator, tt.args.existing, tt.args.new, tt.args.provider)
|
|
|
|
|
|
|
|
if !tt.res.wantErr && len(agg.Events) != tt.res.eventLen {
|
|
|
|
t.Errorf("got wrong event len: expected: %v, actual: %v ", tt.res.eventLen, len(agg.Events))
|
|
|
|
}
|
|
|
|
for i := 0; i < tt.res.eventLen; i++ {
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Type != tt.res.eventTypes[i] {
|
|
|
|
t.Errorf("got wrong event type: expected: %v, actual: %v ", tt.res.eventTypes[i], agg.Events[i].Type.String())
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if tt.res.wantErr && !tt.res.errFunc(err) {
|
|
|
|
t.Errorf("got wrong err: %v ", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestIdpConfigurationDeactivatedAggregate(t *testing.T) {
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
existing *model.Org
|
|
|
|
new *iam_es_model.IDPConfig
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
}
|
|
|
|
type res struct {
|
|
|
|
eventLen int
|
|
|
|
eventTypes []es_models.EventType
|
|
|
|
wantErr bool
|
|
|
|
errFunc func(err error) bool
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "deactivate idp config",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "Name"},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.IDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
Name: "Name",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 1,
|
|
|
|
eventTypes: []es_models.EventType{model.IDPConfigDeactivated},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "existing iam nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "idp config nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg, err := IDPConfigDeactivatedAggregate(tt.args.aggCreator, tt.args.existing, tt.args.new)(tt.args.ctx)
|
|
|
|
|
|
|
|
if !tt.res.wantErr && len(agg.Events) != tt.res.eventLen {
|
|
|
|
t.Errorf("got wrong event len: expected: %v, actual: %v ", tt.res.eventLen, len(agg.Events))
|
|
|
|
}
|
|
|
|
for i := 0; i < tt.res.eventLen; i++ {
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Type != tt.res.eventTypes[i] {
|
|
|
|
t.Errorf("got wrong event type: expected: %v, actual: %v ", tt.res.eventTypes[i], agg.Events[i].Type.String())
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if tt.res.wantErr && !tt.res.errFunc(err) {
|
|
|
|
t.Errorf("got wrong err: %v ", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestIdpConfigurationReactivatedAggregate(t *testing.T) {
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
existing *model.Org
|
|
|
|
new *iam_es_model.IDPConfig
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
}
|
|
|
|
type res struct {
|
|
|
|
eventLen int
|
|
|
|
eventTypes []es_models.EventType
|
|
|
|
wantErr bool
|
|
|
|
errFunc func(err error) bool
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "deactivate app",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "Name"},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.IDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
Name: "Name",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 1,
|
|
|
|
eventTypes: []es_models.EventType{model.IDPConfigReactivated},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "existing iam nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "idp config nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg, err := IDPConfigReactivatedAggregate(tt.args.aggCreator, tt.args.existing, tt.args.new)(tt.args.ctx)
|
|
|
|
|
|
|
|
if !tt.res.wantErr && len(agg.Events) != tt.res.eventLen {
|
|
|
|
t.Errorf("got wrong event len: expected: %v, actual: %v ", tt.res.eventLen, len(agg.Events))
|
|
|
|
}
|
|
|
|
for i := 0; i < tt.res.eventLen; i++ {
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Type != tt.res.eventTypes[i] {
|
|
|
|
t.Errorf("got wrong event type: expected: %v, actual: %v ", tt.res.eventTypes[i], agg.Events[i].Type.String())
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if tt.res.wantErr && !tt.res.errFunc(err) {
|
|
|
|
t.Errorf("got wrong err: %v ", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func TestOIDCConfigChangedAggregate(t *testing.T) {
|
|
|
|
type args struct {
|
|
|
|
ctx context.Context
|
|
|
|
existing *model.Org
|
|
|
|
new *iam_es_model.OIDCIDPConfig
|
|
|
|
aggCreator *es_models.AggregateCreator
|
|
|
|
}
|
|
|
|
type res struct {
|
|
|
|
eventLen int
|
|
|
|
eventTypes []es_models.EventType
|
|
|
|
wantErr bool
|
|
|
|
errFunc func(err error) bool
|
|
|
|
}
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
args args
|
|
|
|
res res
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "change oidc config",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "Name", OIDCIDPConfig: &iam_es_model.OIDCIDPConfig{IDPConfigID: "IDPConfigID", ClientID: "ClientID"}},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.OIDCIDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
ClientID: "ClientIDChanged",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
eventLen: 1,
|
|
|
|
eventTypes: []es_models.EventType{model.OIDCIDPConfigChanged},
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "no changes",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
Name: "Name",
|
|
|
|
IDPs: []*iam_es_model.IDPConfig{
|
|
|
|
{IDPConfigID: "IDPConfigID", Name: "Name", OIDCIDPConfig: &iam_es_model.OIDCIDPConfig{IDPConfigID: "IDPConfigID", ClientID: "ClientID"}},
|
|
|
|
}},
|
|
|
|
new: &iam_es_model.OIDCIDPConfig{
|
|
|
|
ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"},
|
|
|
|
IDPConfigID: "IDPConfigID",
|
|
|
|
ClientID: "ClientID",
|
|
|
|
},
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "existing iam nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "oidc config nil",
|
|
|
|
args: args{
|
|
|
|
ctx: authz.NewMockContext("orgID", "userID"),
|
|
|
|
existing: &model.Org{ObjectRoot: es_models.ObjectRoot{AggregateID: "AggregateID"}, Name: "Name"},
|
|
|
|
new: nil,
|
|
|
|
aggCreator: es_models.NewAggregateCreator("Test"),
|
|
|
|
},
|
|
|
|
res: res{
|
|
|
|
wantErr: true,
|
|
|
|
errFunc: errors.IsPreconditionFailed,
|
|
|
|
},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
|
|
agg, err := OIDCIDPConfigChangedAggregate(tt.args.aggCreator, tt.args.existing, tt.args.new)(tt.args.ctx)
|
|
|
|
|
|
|
|
if !tt.res.wantErr && len(agg.Events) != tt.res.eventLen {
|
|
|
|
t.Errorf("got wrong event len: expected: %v, actual: %v ", tt.res.eventLen, len(agg.Events))
|
|
|
|
}
|
|
|
|
for i := 0; i < tt.res.eventLen; i++ {
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Type != tt.res.eventTypes[i] {
|
|
|
|
t.Errorf("got wrong event type: expected: %v, actual: %v ", tt.res.eventTypes[i], agg.Events[i].Type.String())
|
|
|
|
}
|
|
|
|
if !tt.res.wantErr && agg.Events[i].Data == nil {
|
|
|
|
t.Errorf("should have data in event")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if tt.res.wantErr && !tt.res.errFunc(err) {
|
|
|
|
t.Errorf("got wrong err: %v ", err)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|