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

feat: port reduction (#323)

Browse Source 
* move mgmt pkg

* begin package restructure

* rename auth package to authz

* begin start api

* move auth

* move admin

* fix merge

* configs and interceptors

* interceptor

* revert generate-grpc.sh

* some cleanups

* console

* move console

* fix tests and merging

* js linting

* merge

* merging and configs

* change k8s base to current ports

* fixes

* cleanup

* regenerate proto

* remove unnecessary whitespace

* missing param

* go mod tidy

* fix merging

* move login pkg

* cleanup

* move api pkgs again

* fix pkg naming

* fix generate-static.sh for login

* update workflow

* fixes

* logging

* remove duplicate

* comment for optional gateway interfaces

* regenerate protos

* fix proto imports for grpc web

* protos

* grpc web generate

* grpc web generate

* fix changes

* add translation interceptor

* fix merging

* regenerate mgmt proto
This commit is contained in:
Livio Amstutz
2020-07-08 13:56:37 +02:00
committed by GitHub
parent 708652a655
commit 3549a8b64e
330 changed files with 30495 additions and 30809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
internal/org/repository/eventsourcing/eventstore_test.go
View File

@@ -6,15 +6,15 @@ import (
"testing"
"time"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
"github.com/golang/mock/gomock"
"github.com/caos/zitadel/internal/api/auth"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/errors"
caos_errs "github.com/caos/zitadel/internal/errors"
es_mock "github.com/caos/zitadel/internal/eventstore/mock"
es_models "github.com/caos/zitadel/internal/eventstore/models"
org_model "github.com/caos/zitadel/internal/org/model"
"github.com/golang/mock/gomock"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
)
type testOrgEventstore struct {
@@ -80,7 +80,7 @@ func TestOrgEventstore_OrgByID(t *testing.T) {
name: "no input org",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
org: nil,
},
res: res{
@@ -92,7 +92,7 @@ func TestOrgEventstore_OrgByID(t *testing.T) {
name: "no aggregate id in input org",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
org: &org_model.Org{ObjectRoot: es_models.ObjectRoot{Sequence: 4}},
},
res: res{
@@ -104,7 +104,7 @@ func TestOrgEventstore_OrgByID(t *testing.T) {
name: "no events found success",
fields: fields{Eventstore: newTestEventstore(t).expectFilterEvents([]*es_models.Event{}, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
org: &org_model.Org{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "hodor"}},
},
res: res{
@@ -116,7 +116,7 @@ func TestOrgEventstore_OrgByID(t *testing.T) {
name: "filter fail",
fields: fields{Eventstore: newTestEventstore(t).expectFilterEvents([]*es_models.Event{}, errors.ThrowInternal(nil, "EVENT-SAa1O", "message"))},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
org: &org_model.Org{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "hodor"}},
},
res: res{
@@ -130,7 +130,7 @@ func TestOrgEventstore_OrgByID(t *testing.T) {
{Sequence: 6},
}, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
org: &org_model.Org{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "hodor-org", ChangeDate: time.Now(), CreationDate: time.Now()}},
},
res: res{
@@ -181,7 +181,7 @@ func TestOrgEventstore_DeactivateOrg(t *testing.T) {
name: "no input org",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "",
},
res: res{
@@ -196,7 +196,7 @@ func TestOrgEventstore_DeactivateOrg(t *testing.T) {
expectAggregateCreator().
expectPushEvents(0, errors.ThrowInternal(nil, "EVENT-S8WzW", "test"))},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "hodor",
},
res: res{
@@ -211,7 +211,7 @@ func TestOrgEventstore_DeactivateOrg(t *testing.T) {
expectAggregateCreator().
expectPushEvents(6, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "hodor",
},
res: res{
@@ -226,7 +226,7 @@ func TestOrgEventstore_DeactivateOrg(t *testing.T) {
expectAggregateCreator().
expectPushEvents(6, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "hodor",
},
res: res{
@@ -277,7 +277,7 @@ func TestOrgEventstore_ReactivateOrg(t *testing.T) {
name: "no input org",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "",
},
res: res{
@@ -292,7 +292,7 @@ func TestOrgEventstore_ReactivateOrg(t *testing.T) {
expectAggregateCreator().
expectPushEvents(0, errors.ThrowInternal(nil, "EVENT-S8WzW", "test"))},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "hodor",
},
res: res{
@@ -307,7 +307,7 @@ func TestOrgEventstore_ReactivateOrg(t *testing.T) {
expectAggregateCreator().
expectPushEvents(6, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "hodor",
},
res: res{
@@ -322,7 +322,7 @@ func TestOrgEventstore_ReactivateOrg(t *testing.T) {
expectAggregateCreator().
expectPushEvents(6, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
orgID: "hodor",
},
res: res{
@@ -373,7 +373,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
name: "no input member",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: nil,
},
res: res{
@@ -385,7 +385,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
name: "no aggregate id in input member",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{ObjectRoot: es_models.ObjectRoot{Sequence: 4}, UserID: "asdf"},
},
res: res{
@@ -397,7 +397,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
name: "no aggregate id in input member",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "asdf"}},
},
res: res{
@@ -409,7 +409,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
name: "no events found success",
fields: fields{Eventstore: newTestEventstore(t).expectFilterEvents([]*es_models.Event{}, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "plants"}, UserID: "banana"},
},
res: res{
@@ -421,7 +421,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
name: "filter fail",
fields: fields{Eventstore: newTestEventstore(t).expectFilterEvents([]*es_models.Event{}, errors.ThrowInternal(nil, "EVENT-SAa1O", "message"))},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "plants"}, UserID: "banana"},
},
res: res{
@@ -435,7 +435,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
{Sequence: 6, Data: []byte("{\"userId\": \"banana\", \"roles\": [\"bananaa\"]}"), Type: model.OrgMemberChanged},
}, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "plants", ChangeDate: time.Now(), CreationDate: time.Now()}, UserID: "banana"},
},
res: res{
@@ -450,7 +450,7 @@ func TestOrgEventstore_OrgMemberByIDs(t *testing.T) {
{Sequence: 7, Data: []byte("{\"userId\": \"apple\"}"), Type: model.OrgMemberRemoved},
}, nil)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{ObjectRoot: es_models.ObjectRoot{Sequence: 4, AggregateID: "plants", ChangeDate: time.Now(), CreationDate: time.Now()}, UserID: "apple"},
},
res: res{
@@ -501,7 +501,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
name: "no input member",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: nil,
},
res: res{
@@ -523,7 +523,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
expectAggregateCreator().
expectPushEvents(0, errors.ThrowInternal(nil, "EVENT-S8WzW", "test"))},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{
Sequence: 4,
@@ -553,7 +553,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
expectPushEvents(6, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{
Sequence: 4,
@@ -582,7 +582,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
expectPushEvents(0, errors.ThrowAlreadyExists(nil, "EVENT-yLTI6", "weiss nöd wie teste")),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{
Sequence: 4,
@@ -616,7 +616,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
}, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{
Sequence: 4,
@@ -639,7 +639,7 @@ func TestOrgEventstore_AddOrgMember(t *testing.T) {
expectPushEvents(0, errors.ThrowAlreadyExists(nil, "EVENT-yLTI6", "weiss nöd wie teste")),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{
Sequence: 4,
@@ -697,7 +697,7 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
name: "no input member",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: nil,
},
res: res{
@@ -725,7 +725,7 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
}, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -757,7 +757,7 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
}, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -790,7 +790,7 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
expectPushEvents(0, errors.ThrowInternal(nil, "PEVENT-3wqa2", "test")),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -823,7 +823,7 @@ func TestOrgEventstore_ChangeOrgMember(t *testing.T) {
expectPushEvents(7, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -880,7 +880,7 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
name: "no input member",
fields: fields{Eventstore: newTestEventstore(t)},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: nil,
},
res: res{
@@ -907,7 +907,7 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
}, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -939,7 +939,7 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
expectPushEvents(0, errors.ThrowInternal(nil, "PEVENT-3wqa2", "test")),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -970,7 +970,7 @@ func TestOrgEventstore_RemoveOrgMember(t *testing.T) {
expectPushEvents(7, nil),
},
args: args{
ctx: auth.NewMockContext("user", "org"),
ctx: authz.NewMockContext("user", "org"),
member: &org_model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "hodor-org", Sequence: 5},
UserID: "hodor",
@@ -1057,7 +1057,7 @@ func TestChangesOrg(t *testing.T) {
limit: 0,
},
res: res{
changes: &org_model.OrgChanges{Changes: []*org_model.OrgChange{&org_model.OrgChange{EventType: "", Sequence: 1, ModifierId: ""}}, LastSequence: 1},
changes: &org_model.OrgChanges{Changes: []*org_model.OrgChange{{EventType: "", Sequence: 1, ModifierId: ""}}, LastSequence: 1},
org: &model.Org{Name: "MusterOrg"},
},
},

17
internal/org/repository/eventsourcing/org_iam_policy_test.go
View File

@@ -2,11 +2,12 @@ package eventsourcing
import (
"context"
"github.com/caos/zitadel/internal/api/auth"
"testing"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/errors"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
"testing"
)
func TestOrgIamPolicyAddedAggregates(t *testing.T) {
@@ -29,7 +30,7 @@ func TestOrgIamPolicyAddedAggregates(t *testing.T) {
{
name: "no policy error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
},
res: res{
@@ -39,7 +40,7 @@ func TestOrgIamPolicyAddedAggregates(t *testing.T) {
{
name: "policy successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -99,7 +100,7 @@ func TestOrgIamPolicyChangedAggregates(t *testing.T) {
{
name: "no policy error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
},
res: res{
@@ -109,7 +110,7 @@ func TestOrgIamPolicyChangedAggregates(t *testing.T) {
{
name: "policy successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -135,7 +136,7 @@ func TestOrgIamPolicyChangedAggregates(t *testing.T) {
{
name: "policy no changes",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -196,7 +197,7 @@ func TestOrgIamPolicyRemovedAggregates(t *testing.T) {
{
name: "policy successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{

20
internal/org/repository/eventsourcing/org_member_test.go
View File

@@ -2,12 +2,12 @@ package eventsourcing
import (
"context"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
"testing"
"github.com/caos/zitadel/internal/api/auth"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/errors"
es_models "github.com/caos/zitadel/internal/eventstore/models"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
usr_model "github.com/caos/zitadel/internal/user/repository/eventsourcing/model"
)
@@ -30,7 +30,7 @@ func TestOrgMemberAddedAggregate(t *testing.T) {
name: "no member",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: nil,
},
res: res{
@@ -41,7 +41,7 @@ func TestOrgMemberAddedAggregate(t *testing.T) {
name: "member added sucessfully",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: &model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "asdf", Sequence: 234},
},
@@ -91,7 +91,7 @@ func TestOrgMemberChangedAggregate(t *testing.T) {
name: "no member",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: nil,
existingMember: &model.OrgMember{},
},
@@ -103,7 +103,7 @@ func TestOrgMemberChangedAggregate(t *testing.T) {
name: "no existing member",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
existingMember: nil,
member: &model.OrgMember{},
},
@@ -115,7 +115,7 @@ func TestOrgMemberChangedAggregate(t *testing.T) {
name: "no changes",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: &model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "asdf", Sequence: 234},
},
@@ -131,7 +131,7 @@ func TestOrgMemberChangedAggregate(t *testing.T) {
name: "with changes success",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: &model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "asdf", Sequence: 234},
Roles: []string{"asdf"},
@@ -186,7 +186,7 @@ func TestOrgMemberRemovedAggregate(t *testing.T) {
name: "no member",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: nil,
},
res: res{
@@ -197,7 +197,7 @@ func TestOrgMemberRemovedAggregate(t *testing.T) {
name: "member added sucessfully",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
member: &model.OrgMember{
ObjectRoot: es_models.ObjectRoot{AggregateID: "asdf", Sequence: 234},
},

58
internal/org/repository/eventsourcing/org_test.go
View File

@@ -2,13 +2,13 @@ package eventsourcing
import (
"context"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
"testing"
"github.com/caos/zitadel/internal/api/auth"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/errors"
es_models "github.com/caos/zitadel/internal/eventstore/models"
org_model "github.com/caos/zitadel/internal/org/model"
"github.com/caos/zitadel/internal/org/repository/eventsourcing/model"
)
func Test_isReservedValidation(t *testing.T) {
@@ -118,7 +118,7 @@ func Test_uniqueNameAggregate(t *testing.T) {
{
name: "no org name error",
args: args{
ctx: auth.NewMockContext("orgID", "userID"),
ctx: authz.NewMockContext("orgID", "userID"),
aggCreator: es_models.NewAggregateCreator("test"),
orgName: "",
},
@@ -130,7 +130,7 @@ func Test_uniqueNameAggregate(t *testing.T) {
{
name: "aggregate created",
args: args{
ctx: auth.NewMockContext("orgID", "userID"),
ctx: authz.NewMockContext("orgID", "userID"),
aggCreator: es_models.NewAggregateCreator("test"),
orgName: "asdf",
},
@@ -174,7 +174,7 @@ func Test_uniqueDomainAggregate(t *testing.T) {
{
name: "no org domain error",
args: args{
ctx: auth.NewMockContext("orgID", "userID"),
ctx: authz.NewMockContext("orgID", "userID"),
aggCreator: es_models.NewAggregateCreator("test"),
orgDomain: "",
},
@@ -186,7 +186,7 @@ func Test_uniqueDomainAggregate(t *testing.T) {
{
name: "aggregate created",
args: args{
ctx: auth.NewMockContext("orgID", "userID"),
ctx: authz.NewMockContext("orgID", "userID"),
aggCreator: es_models.NewAggregateCreator("test"),
orgDomain: "asdf",
},
@@ -230,7 +230,7 @@ func TestOrgReactivateAggregate(t *testing.T) {
name: "correct",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
AggregateID: "orgID",
@@ -244,7 +244,7 @@ func TestOrgReactivateAggregate(t *testing.T) {
name: "already active error",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
AggregateID: "orgID",
@@ -261,7 +261,7 @@ func TestOrgReactivateAggregate(t *testing.T) {
name: "org nil error",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
org: nil,
},
res: res{
@@ -304,7 +304,7 @@ func TestOrgDeactivateAggregate(t *testing.T) {
name: "correct",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
AggregateID: "orgID",
@@ -318,7 +318,7 @@ func TestOrgDeactivateAggregate(t *testing.T) {
name: "already inactive error",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
AggregateID: "orgID",
@@ -335,7 +335,7 @@ func TestOrgDeactivateAggregate(t *testing.T) {
name: "org nil error",
args: args{
aggCreator: es_models.NewAggregateCreator("test"),
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
org: nil,
},
res: res{
@@ -379,7 +379,7 @@ func TestOrgUpdateAggregates(t *testing.T) {
{
name: "no existing org error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
existing: nil,
updated: &model.Org{},
@@ -392,7 +392,7 @@ func TestOrgUpdateAggregates(t *testing.T) {
{
name: "no updated org error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
existing: &model.Org{},
updated: nil,
@@ -405,7 +405,7 @@ func TestOrgUpdateAggregates(t *testing.T) {
{
name: "no changes",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
existing: &model.Org{},
updated: &model.Org{},
@@ -418,7 +418,7 @@ func TestOrgUpdateAggregates(t *testing.T) {
{
name: "name changed",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
existing: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -475,7 +475,7 @@ func TestOrgCreatedAggregates(t *testing.T) {
{
name: "no org error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: nil,
},
@@ -487,7 +487,7 @@ func TestOrgCreatedAggregates(t *testing.T) {
{
name: "org successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -505,7 +505,7 @@ func TestOrgCreatedAggregates(t *testing.T) {
{
name: "org with domain successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -513,7 +513,7 @@ func TestOrgCreatedAggregates(t *testing.T) {
Sequence: 5,
},
Name: "caos",
Domains: []*model.OrgDomain{&model.OrgDomain{
Domains: []*model.OrgDomain{{
Domain: "caos.ch",
}},
},
@@ -526,7 +526,7 @@ func TestOrgCreatedAggregates(t *testing.T) {
{
name: "no name error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -577,7 +577,7 @@ func TestOrgDomainAddedAggregates(t *testing.T) {
{
name: "no domain error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
},
res: res{
@@ -587,7 +587,7 @@ func TestOrgDomainAddedAggregates(t *testing.T) {
{
name: "domain successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -646,7 +646,7 @@ func TestOrgDomainVerifiedAggregates(t *testing.T) {
{
name: "no domain error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
},
res: res{
@@ -656,7 +656,7 @@ func TestOrgDomainVerifiedAggregates(t *testing.T) {
{
name: "domain successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -711,7 +711,7 @@ func TestOrgDomainSetPrimaryAggregates(t *testing.T) {
{
name: "no domain error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
},
res: res{
@@ -721,7 +721,7 @@ func TestOrgDomainSetPrimaryAggregates(t *testing.T) {
{
name: "domain successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{
@@ -779,7 +779,7 @@ func TestOrgDomainRemovedAggregates(t *testing.T) {
{
name: "no domain error",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
},
res: res{
@@ -790,7 +790,7 @@ func TestOrgDomainRemovedAggregates(t *testing.T) {
{
name: "domain successful",
args: args{
ctx: auth.NewMockContext("org", "user"),
ctx: authz.NewMockContext("org", "user"),
aggCreator: es_models.NewAggregateCreator("test"),
org: &model.Org{
ObjectRoot: es_models.ObjectRoot{