mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-14 03:54:21 +00:00
8464cfa4fe
* feat: eventstore repository * fix: remove gorm * version * feat: pkg * feat: add some files for project * feat: eventstore without eventstore-lib * rename files * gnueg * fix: key json * fix: add object * fix: change imports * fix: internal models * fix: some imports * fix: global model * feat: add global view functions * fix: add some functions on repo * feat(eventstore): sdk * fix(eventstore): search query * fix(eventstore): rename app to eventstore * delete empty test * remove unused func * merge master * fix(eventstore): tests * fix(models): delete unused struct * fix: some funcitons * feat(eventstore): implemented push events * fix: move project eventstore to project package * fix: change project eventstore funcs * feat(eventstore): overwrite context data * fix: change project eventstore * fix: add project repo to mgmt server * feat(types): SQL-config * fix: commented code * feat(eventstore): options to overwrite editor * feat: auth interceptor and cockroach migrations * fix: migrations * fix: fix filter * fix: not found on getbyid * fix: use global sql config * fix: add sequence * fix: add some tests * fix(eventstore): nullable sequence * fix: add some tests * merge * fix: add some tests * fix(migrations): correct statements for sequence * fix: add some tests * fix: add some tests * fix: changes from mr * fix: changes from mr * fix: add some tests * Update internal/eventstore/models/field.go Co-Authored-By: livio-a <livio.a@gmail.com> * fix(eventstore): code quality * fix: add types to aggregate/Event-types * fix: try tests * fix(eventstore): rename modifier* to editor* * fix(eventstore): delete editor_org * fix(migrations): remove editor_org field, rename modifier_* to editor_* * fix: query tests * fix: use prepare funcs * fix: go mod * fix: generate files * fix(eventstore): tests * fix(eventstore): rename modifier to editor * fix(migrations): add cluster migration, fix(migrations): fix typo of host in clean clsuter * fix(eventstore): move health * fix(eventstore): AggregateTypeFilter aggregateType as param * code quality * fix: go tests * feat: add member funcs * feat: add member model * feat: add member events * feat: add member repo model * fix: better error func testing * fix: project member funcs * fix: add tests * fix: add tests * feat: implement member requests * fix: merge master * fix: merge master * fix: read existing in project repo * fix: fix tests * feat: add internal cache * feat: add cache mock * fix: return values of cache mock * feat: add project role * fix: add cache config * fix: add role to eventstore * fix: use eventstore sdk * fix: use eventstore sdk * fix: add project role grpc requests * fix: fix getby id * fix: changes for mr * fix: change value to interface * feat: add app event creations * fix: searchmethods * Update internal/project/model/project_member.go Co-Authored-By: Silvan <silvan.reusser@gmail.com> * fix: use get project func * fix: append events * fix: check if value is string on equal ignore case * fix: add changes test * fix: add go mod * fix: add some tests * fix: return err not nil * fix: return err not nil * fix: add aggregate funcs and tests * fix: add oidc aggregate funcs and tests * fix: add oidc * fix: add some tests * fix: tests * fix: oidc validation * fix: generate client secret * fix: generate client id * fix: test change app * fix: deactivate/reactivate application * fix: change oidc config * fix: change oidc config secret * fix: implement grpc app funcs * fix: add application requests * fix: converter * fix: converter * fix: converter and generate clientid * fix: tests * feat: project grant aggregate * feat: project grant * fix: project grant check if role existing * fix: project grant requests * fix: project grant fixes * fix: project grant member model * fix: project grant member aggregate * fix: project grant member eventstore * fix: project grant member requests * fix: problems after merger * fix: new commit * fix: remove enum converter * Update internal/project/model/project_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/project/model/project_grant.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * Update internal/project/model/project.go Co-Authored-By: Livio Amstutz <livio.a@gmail.com> * fix: better sub object handling * fix: imports Co-authored-by: adlerhurst <silvan.reusser@gmail.com> Co-authored-by: livio-a <livio.a@gmail.com>
140 lines
4.7 KiB
Go
140 lines
4.7 KiB
Go
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"github.com/caos/logging"
|
|
"github.com/caos/zitadel/internal/crypto"
|
|
es_models "github.com/caos/zitadel/internal/eventstore/models"
|
|
"github.com/caos/zitadel/internal/project/model"
|
|
"reflect"
|
|
)
|
|
|
|
type OIDCConfig struct {
|
|
es_models.ObjectRoot
|
|
AppID string `json:"appId"`
|
|
ClientID string `json:"clientId,omitempty"`
|
|
ClientSecret *crypto.CryptoValue `json:"clientSecret,omitempty"`
|
|
RedirectUris []string `json:"redirectUris,omitempty"`
|
|
ResponseTypes []int32 `json:"responseTypes,omitempty"`
|
|
GrantTypes []int32 `json:"grantTypes,omitempty"`
|
|
ApplicationType int32 `json:"applicationType,omitempty"`
|
|
AuthMethodType int32 `json:"authMethodType,omitempty"`
|
|
PostLogoutRedirectUris []string `json:"postLogoutRedirectUris,omitempty"`
|
|
}
|
|
|
|
func (c *OIDCConfig) Changes(changed *OIDCConfig) map[string]interface{} {
|
|
changes := make(map[string]interface{}, 1)
|
|
changes["appId"] = c.AppID
|
|
if !reflect.DeepEqual(c.RedirectUris, changed.RedirectUris) {
|
|
changes["redirectUris"] = changed.RedirectUris
|
|
}
|
|
if !reflect.DeepEqual(c.ResponseTypes, changed.ResponseTypes) {
|
|
changes["responseTypes"] = changed.ResponseTypes
|
|
}
|
|
if !reflect.DeepEqual(c.GrantTypes, changed.GrantTypes) {
|
|
changes["grantTypes"] = changed.GrantTypes
|
|
}
|
|
if c.ApplicationType != changed.ApplicationType {
|
|
changes["applicationType"] = changed.ApplicationType
|
|
}
|
|
if c.AuthMethodType != changed.AuthMethodType {
|
|
changes["authMethodType"] = changed.AuthMethodType
|
|
}
|
|
if !reflect.DeepEqual(c.PostLogoutRedirectUris, changed.PostLogoutRedirectUris) {
|
|
changes["postLogoutRedirectUris"] = changed.PostLogoutRedirectUris
|
|
}
|
|
return changes
|
|
}
|
|
|
|
func OIDCConfigFromModel(config *model.OIDCConfig) *OIDCConfig {
|
|
responseTypes := make([]int32, len(config.ResponseTypes))
|
|
for i, rt := range config.ResponseTypes {
|
|
responseTypes[i] = int32(rt)
|
|
}
|
|
grantTypes := make([]int32, len(config.GrantTypes))
|
|
for i, rt := range config.GrantTypes {
|
|
grantTypes[i] = int32(rt)
|
|
}
|
|
return &OIDCConfig{
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
AggregateID: config.ObjectRoot.AggregateID,
|
|
Sequence: config.Sequence,
|
|
ChangeDate: config.ChangeDate,
|
|
CreationDate: config.CreationDate,
|
|
},
|
|
AppID: config.AppID,
|
|
ClientID: config.ClientID,
|
|
ClientSecret: config.ClientSecret,
|
|
RedirectUris: config.RedirectUris,
|
|
ResponseTypes: responseTypes,
|
|
GrantTypes: grantTypes,
|
|
ApplicationType: int32(config.ApplicationType),
|
|
AuthMethodType: int32(config.AuthMethodType),
|
|
PostLogoutRedirectUris: config.PostLogoutRedirectUris,
|
|
}
|
|
}
|
|
|
|
func OIDCConfigToModel(config *OIDCConfig) *model.OIDCConfig {
|
|
responseTypes := make([]model.OIDCResponseType, len(config.ResponseTypes))
|
|
for i, rt := range config.ResponseTypes {
|
|
responseTypes[i] = model.OIDCResponseType(rt)
|
|
}
|
|
grantTypes := make([]model.OIDCGrantType, len(config.GrantTypes))
|
|
for i, rt := range config.GrantTypes {
|
|
grantTypes[i] = model.OIDCGrantType(rt)
|
|
}
|
|
return &model.OIDCConfig{
|
|
ObjectRoot: es_models.ObjectRoot{
|
|
AggregateID: config.ObjectRoot.AggregateID,
|
|
Sequence: config.Sequence,
|
|
ChangeDate: config.ChangeDate,
|
|
CreationDate: config.CreationDate,
|
|
},
|
|
AppID: config.AppID,
|
|
ClientID: config.ClientID,
|
|
ClientSecret: config.ClientSecret,
|
|
RedirectUris: config.RedirectUris,
|
|
ResponseTypes: responseTypes,
|
|
GrantTypes: grantTypes,
|
|
ApplicationType: model.OIDCApplicationType(config.ApplicationType),
|
|
AuthMethodType: model.OIDCAuthMethodType(config.AuthMethodType),
|
|
PostLogoutRedirectUris: config.PostLogoutRedirectUris,
|
|
}
|
|
}
|
|
|
|
func (p *Project) appendAddOIDCConfigEvent(event *es_models.Event) error {
|
|
config := new(OIDCConfig)
|
|
err := config.setData(event)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
config.ObjectRoot.CreationDate = event.CreationDate
|
|
if i, a := GetApplication(p.Applications, config.AppID); a != nil {
|
|
p.Applications[i].Type = int32(model.APPTYPE_OIDC)
|
|
p.Applications[i].OIDCConfig = config
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (p *Project) appendChangeOIDCConfigEvent(event *es_models.Event) error {
|
|
config := new(OIDCConfig)
|
|
err := config.setData(event)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
if i, a := GetApplication(p.Applications, config.AppID); a != nil {
|
|
p.Applications[i].OIDCConfig.setData(event)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (o *OIDCConfig) setData(event *es_models.Event) error {
|
|
o.ObjectRoot.AppendEvent(event)
|
|
if err := json.Unmarshal(event.Data, o); err != nil {
|
|
logging.Log("EVEN-d8e3s").WithError(err).Error("could not unmarshal event data")
|
|
return err
|
|
}
|
|
return nil
|
|
}
|