fix: cherry pick fixes from master (#1339)

* fix: return api config in ApplicationView (#1330)


(cherry picked from commit 16a47c6542)

* fix tests
This commit is contained in:
Livio Amstutz
2021-02-23 17:05:47 +01:00
committed by GitHub
parent d8e42744b4
commit 438daebdb9
13 changed files with 160 additions and 148 deletions

View File

@@ -4,11 +4,11 @@ import (
"context"
"encoding/json"
"fmt"
"github.com/caos/zitadel/internal/eventstore"
"testing"
"time"
"github.com/caos/zitadel/internal/api/authz"
"github.com/caos/zitadel/internal/eventstore"
"github.com/caos/zitadel/internal/eventstore/repository"
"github.com/caos/zitadel/internal/eventstore/repository/sql"
)
@@ -30,7 +30,7 @@ func NewUserAggregate(id string) *eventstore.Aggregate {
// ------------------------------------------------------------
type UserAddedEvent struct {
eventstore.eventstore `json:"-"`
eventstore.BaseEvent `json:"-"`
FirstName string `json:"firstName"`
}