mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 19:14:23 +00:00
f3e6f3b23b
* feat(command): remove org * refactor: imports, unused code, error handling * reduce org removed in action * add org deletion to projections * add org removal to projections * add org removal to projections * org removed projection * lint import * projections * fix: table names in tests * fix: table names in tests * logging * add org state * fix(domain): add Owner removed to object details * feat(ListQuery): add with owner removed * fix(org-delete): add bool to functions to select with owner removed * fix(org-delete): add bools to user grants with events to determine if dependencies lost owner * fix(org-delete): add unit tests for owner removed and org removed events * fix(org-delete): add handling of org remove for grants and members * fix(org-delete): correction of unit tests for owner removed * fix(org-delete): update projections, unit tests and get functions * fix(org-delete): add change date to authnkeys and owner removed to org metadata * fix(org-delete): include owner removed for login names * fix(org-delete): some column fixes in projections and build for queries with owner removed * indexes * fix(org-delete): include review changes * fix(org-delete): change user projection name after merge * fix(org-delete): include review changes for project grant where no project owner is necessary * fix(org-delete): include auth and adminapi tables with owner removed information * fix(org-delete): cleanup username and orgdomain uniqueconstraints when org is removed * fix(org-delete): add permissions for org.remove * remove unnecessary unique constraints * fix column order in primary keys * fix(org-delete): include review changes * fix(org-delete): add owner removed indexes and chang setup step to create tables * fix(org-delete): move PK order of instance_id and change added user_grant from review * fix(org-delete): no params for prepareUserQuery * change to step 6 * merge main * fix(org-delete): OldUserName rename to private * fix linting * cleanup * fix: remove org test * create prerelease * chore: delete org-delete as prerelease Co-authored-by: Stefan Benz <stefan@caos.ch> Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Fabi <38692350+hifabienne@users.noreply.github.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
126 lines
5.5 KiB
Go
126 lines
5.5 KiB
Go
package model
|
|
|
|
import (
|
|
"encoding/json"
|
|
"time"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/eventstore"
|
|
"github.com/zitadel/zitadel/internal/repository/instance"
|
|
"github.com/zitadel/zitadel/internal/repository/org"
|
|
|
|
"github.com/zitadel/logging"
|
|
|
|
caos_errs "github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/eventstore/v1/models"
|
|
"github.com/zitadel/zitadel/internal/iam/model"
|
|
)
|
|
|
|
const (
|
|
IDPConfigKeyIdpConfigID = "idp_config_id"
|
|
IDPConfigKeyAggregateID = "aggregate_id"
|
|
IDPConfigKeyName = "name"
|
|
IDPConfigKeyProviderType = "idp_provider_type"
|
|
IDPConfigKeyInstanceID = "instance_id"
|
|
IDPConfigKeyOwnerRemoved = "owner_removed"
|
|
)
|
|
|
|
type IDPConfigView struct {
|
|
IDPConfigID string `json:"idpConfigId" gorm:"column:idp_config_id;primary_key"`
|
|
AggregateID string `json:"-" gorm:"column:aggregate_id"`
|
|
Name string `json:"name" gorm:"column:name"`
|
|
StylingType int32 `json:"stylingType" gorm:"column:styling_type"`
|
|
CreationDate time.Time `json:"-" gorm:"column:creation_date"`
|
|
ChangeDate time.Time `json:"-" gorm:"column:change_date"`
|
|
IDPState int32 `json:"-" gorm:"column:idp_state"`
|
|
IDPProviderType int32 `json:"-" gorm:"column:idp_provider_type"`
|
|
AutoRegister bool `json:"autoRegister" gorm:"column:auto_register"`
|
|
|
|
IsOIDC bool `json:"-" gorm:"column:is_oidc"`
|
|
OIDCClientID string `json:"clientId" gorm:"column:oidc_client_id"`
|
|
OIDCClientSecret *crypto.CryptoValue `json:"clientSecret" gorm:"column:oidc_client_secret"`
|
|
OIDCIssuer string `json:"issuer" gorm:"column:oidc_issuer"`
|
|
OIDCScopes database.StringArray `json:"scopes" gorm:"column:oidc_scopes"`
|
|
OIDCIDPDisplayNameMapping int32 `json:"idpDisplayNameMapping" gorm:"column:oidc_idp_display_name_mapping"`
|
|
OIDCUsernameMapping int32 `json:"usernameMapping" gorm:"column:oidc_idp_username_mapping"`
|
|
OAuthAuthorizationEndpoint string `json:"authorizationEndpoint" gorm:"column:oauth_authorization_endpoint"`
|
|
OAuthTokenEndpoint string `json:"tokenEndpoint" gorm:"column:oauth_token_endpoint"`
|
|
JWTEndpoint string `json:"jwtEndpoint" gorm:"jwt_endpoint"`
|
|
JWTKeysEndpoint string `json:"keysEndpoint" gorm:"jwt_keys_endpoint"`
|
|
JWTHeaderName string `json:"headerName" gorm:"jwt_header_name"`
|
|
|
|
Sequence uint64 `json:"-" gorm:"column:sequence"`
|
|
InstanceID string `json:"instanceID" gorm:"column:instance_id;primary_key"`
|
|
}
|
|
|
|
func IDPConfigViewToModel(idp *IDPConfigView) *model.IDPConfigView {
|
|
view := &model.IDPConfigView{
|
|
IDPConfigID: idp.IDPConfigID,
|
|
AggregateID: idp.AggregateID,
|
|
State: model.IDPConfigState(idp.IDPState),
|
|
Name: idp.Name,
|
|
StylingType: model.IDPStylingType(idp.StylingType),
|
|
AutoRegister: idp.AutoRegister,
|
|
Sequence: idp.Sequence,
|
|
CreationDate: idp.CreationDate,
|
|
ChangeDate: idp.ChangeDate,
|
|
IDPProviderType: model.IDPProviderType(idp.IDPProviderType),
|
|
IsOIDC: idp.IsOIDC,
|
|
OIDCClientID: idp.OIDCClientID,
|
|
OIDCClientSecret: idp.OIDCClientSecret,
|
|
OIDCScopes: idp.OIDCScopes,
|
|
OIDCIDPDisplayNameMapping: model.OIDCMappingField(idp.OIDCIDPDisplayNameMapping),
|
|
OIDCUsernameMapping: model.OIDCMappingField(idp.OIDCUsernameMapping),
|
|
OAuthAuthorizationEndpoint: idp.OAuthAuthorizationEndpoint,
|
|
OAuthTokenEndpoint: idp.OAuthTokenEndpoint,
|
|
}
|
|
if idp.IsOIDC {
|
|
view.OIDCIssuer = idp.OIDCIssuer
|
|
return view
|
|
}
|
|
view.JWTEndpoint = idp.JWTEndpoint
|
|
view.JWTIssuer = idp.OIDCIssuer
|
|
view.JWTKeysEndpoint = idp.JWTKeysEndpoint
|
|
view.JWTHeaderName = idp.JWTHeaderName
|
|
return view
|
|
}
|
|
|
|
func (i *IDPConfigView) AppendEvent(providerType model.IDPProviderType, event *models.Event) (err error) {
|
|
i.Sequence = event.Sequence
|
|
i.ChangeDate = event.CreationDate
|
|
switch eventstore.EventType(event.Type) {
|
|
case instance.IDPConfigAddedEventType, org.IDPConfigAddedEventType:
|
|
i.setRootData(event)
|
|
i.CreationDate = event.CreationDate
|
|
i.IDPProviderType = int32(providerType)
|
|
err = i.SetData(event)
|
|
case instance.IDPOIDCConfigAddedEventType, org.IDPOIDCConfigAddedEventType:
|
|
i.IsOIDC = true
|
|
err = i.SetData(event)
|
|
case instance.IDPOIDCConfigChangedEventType, org.IDPOIDCConfigChangedEventType,
|
|
instance.IDPConfigChangedEventType, org.IDPConfigChangedEventType,
|
|
org.IDPJWTConfigAddedEventType, instance.IDPJWTConfigAddedEventType,
|
|
org.IDPJWTConfigChangedEventType, instance.IDPJWTConfigChangedEventType:
|
|
err = i.SetData(event)
|
|
case instance.IDPConfigDeactivatedEventType, org.IDPConfigDeactivatedEventType:
|
|
i.IDPState = int32(model.IDPConfigStateInactive)
|
|
case instance.IDPConfigReactivatedEventType, org.IDPConfigReactivatedEventType:
|
|
i.IDPState = int32(model.IDPConfigStateActive)
|
|
}
|
|
return err
|
|
}
|
|
|
|
func (r *IDPConfigView) setRootData(event *models.Event) {
|
|
r.AggregateID = event.AggregateID
|
|
r.InstanceID = event.InstanceID
|
|
}
|
|
|
|
func (r *IDPConfigView) SetData(event *models.Event) error {
|
|
if err := json.Unmarshal(event.Data, r); err != nil {
|
|
logging.New().WithError(err).Error("could not unmarshal event data")
|
|
return caos_errs.ThrowInternal(err, "MODEL-lub6s", "Could not unmarshal data")
|
|
}
|
|
return nil
|
|
}
|