mirror of
https://github.com/zitadel/zitadel.git
synced 2025-01-11 19:53:41 +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>
262 lines
6.7 KiB
Go
262 lines
6.7 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
errs "errors"
|
|
"time"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
)
|
|
|
|
const (
|
|
maxTimeout = 20 * time.Second
|
|
)
|
|
|
|
var (
|
|
actionTable = table{
|
|
name: projection.ActionTable,
|
|
instanceIDCol: projection.ActionInstanceIDCol,
|
|
}
|
|
ActionColumnID = Column{
|
|
name: projection.ActionIDCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnCreationDate = Column{
|
|
name: projection.ActionCreationDateCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnChangeDate = Column{
|
|
name: projection.ActionChangeDateCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnResourceOwner = Column{
|
|
name: projection.ActionResourceOwnerCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnInstanceID = Column{
|
|
name: projection.ActionInstanceIDCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnSequence = Column{
|
|
name: projection.ActionSequenceCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnState = Column{
|
|
name: projection.ActionStateCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnName = Column{
|
|
name: projection.ActionNameCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnScript = Column{
|
|
name: projection.ActionScriptCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnTimeout = Column{
|
|
name: projection.ActionTimeoutCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnAllowedToFail = Column{
|
|
name: projection.ActionAllowedToFailCol,
|
|
table: actionTable,
|
|
}
|
|
ActionColumnOwnerRemoved = Column{
|
|
name: projection.ActionOwnerRemovedCol,
|
|
table: actionTable,
|
|
}
|
|
)
|
|
|
|
type Actions struct {
|
|
SearchResponse
|
|
Actions []*Action
|
|
}
|
|
|
|
type Action struct {
|
|
ID string
|
|
CreationDate time.Time
|
|
ChangeDate time.Time
|
|
ResourceOwner string
|
|
State domain.ActionState
|
|
Sequence uint64
|
|
|
|
Name string
|
|
Script string
|
|
timeout time.Duration
|
|
AllowedToFail bool
|
|
}
|
|
|
|
func (a *Action) Timeout() time.Duration {
|
|
if a.timeout > 0 && a.timeout < maxTimeout {
|
|
return a.timeout
|
|
}
|
|
return maxTimeout
|
|
}
|
|
|
|
type ActionSearchQueries struct {
|
|
SearchRequest
|
|
Queries []SearchQuery
|
|
}
|
|
|
|
func (q *ActionSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
|
query = q.SearchRequest.toQuery(query)
|
|
for _, q := range q.Queries {
|
|
query = q.toQuery(query)
|
|
}
|
|
return query
|
|
}
|
|
|
|
func (q *Queries) SearchActions(ctx context.Context, queries *ActionSearchQueries, withOwnerRemoved bool) (actions *Actions, err error) {
|
|
query, scan := prepareActionsQuery()
|
|
eq := sq.Eq{
|
|
ActionColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}
|
|
if !withOwnerRemoved {
|
|
eq[ActionColumnOwnerRemoved.identifier()] = false
|
|
}
|
|
stmt, args, err := queries.toQuery(query).Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInvalidArgument(err, "QUERY-SDgwg", "Errors.Query.InvalidRequest")
|
|
}
|
|
|
|
rows, err := q.client.QueryContext(ctx, stmt, args...)
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-SDfr52", "Errors.Internal")
|
|
}
|
|
actions, err = scan(rows)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
actions.LatestSequence, err = q.latestSequence(ctx, actionTable)
|
|
return actions, err
|
|
}
|
|
|
|
func (q *Queries) GetActionByID(ctx context.Context, id string, orgID string, withOwnerRemoved bool) (*Action, error) {
|
|
stmt, scan := prepareActionQuery()
|
|
eq := sq.Eq{
|
|
ActionColumnID.identifier(): id,
|
|
ActionColumnResourceOwner.identifier(): orgID,
|
|
ActionColumnInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}
|
|
if !withOwnerRemoved {
|
|
eq[ActionColumnOwnerRemoved.identifier()] = false
|
|
}
|
|
query, args, err := stmt.Where(eq).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-Dgff3", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
row := q.client.QueryRowContext(ctx, query, args...)
|
|
return scan(row)
|
|
}
|
|
|
|
func NewActionResourceOwnerQuery(id string) (SearchQuery, error) {
|
|
return NewTextQuery(ActionColumnResourceOwner, id, TextEquals)
|
|
}
|
|
|
|
func NewActionNameSearchQuery(method TextComparison, value string) (SearchQuery, error) {
|
|
return NewTextQuery(ActionColumnName, value, method)
|
|
}
|
|
|
|
func NewActionStateSearchQuery(value domain.ActionState) (SearchQuery, error) {
|
|
return NewNumberQuery(ActionColumnState, int(value), NumberEquals)
|
|
}
|
|
|
|
func NewActionIDSearchQuery(id string) (SearchQuery, error) {
|
|
return NewTextQuery(ActionColumnID, id, TextEquals)
|
|
}
|
|
|
|
func prepareActionsQuery() (sq.SelectBuilder, func(rows *sql.Rows) (*Actions, error)) {
|
|
return sq.Select(
|
|
ActionColumnID.identifier(),
|
|
ActionColumnCreationDate.identifier(),
|
|
ActionColumnChangeDate.identifier(),
|
|
ActionColumnResourceOwner.identifier(),
|
|
ActionColumnSequence.identifier(),
|
|
ActionColumnState.identifier(),
|
|
ActionColumnName.identifier(),
|
|
ActionColumnScript.identifier(),
|
|
ActionColumnTimeout.identifier(),
|
|
ActionColumnAllowedToFail.identifier(),
|
|
countColumn.identifier(),
|
|
).From(actionTable.identifier()).PlaceholderFormat(sq.Dollar),
|
|
func(rows *sql.Rows) (*Actions, error) {
|
|
actions := make([]*Action, 0)
|
|
var count uint64
|
|
for rows.Next() {
|
|
action := new(Action)
|
|
err := rows.Scan(
|
|
&action.ID,
|
|
&action.CreationDate,
|
|
&action.ChangeDate,
|
|
&action.ResourceOwner,
|
|
&action.Sequence,
|
|
&action.State,
|
|
&action.Name,
|
|
&action.Script,
|
|
&action.timeout,
|
|
&action.AllowedToFail,
|
|
&count,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
actions = append(actions, action)
|
|
}
|
|
|
|
if err := rows.Close(); err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-EGdff", "Errors.Query.CloseRows")
|
|
}
|
|
|
|
return &Actions{
|
|
Actions: actions,
|
|
SearchResponse: SearchResponse{
|
|
Count: count,
|
|
},
|
|
}, nil
|
|
}
|
|
}
|
|
|
|
func prepareActionQuery() (sq.SelectBuilder, func(row *sql.Row) (*Action, error)) {
|
|
return sq.Select(
|
|
ActionColumnID.identifier(),
|
|
ActionColumnCreationDate.identifier(),
|
|
ActionColumnChangeDate.identifier(),
|
|
ActionColumnResourceOwner.identifier(),
|
|
ActionColumnSequence.identifier(),
|
|
ActionColumnState.identifier(),
|
|
ActionColumnName.identifier(),
|
|
ActionColumnScript.identifier(),
|
|
ActionColumnTimeout.identifier(),
|
|
ActionColumnAllowedToFail.identifier(),
|
|
).From(actionTable.identifier()).PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*Action, error) {
|
|
action := new(Action)
|
|
err := row.Scan(
|
|
&action.ID,
|
|
&action.CreationDate,
|
|
&action.ChangeDate,
|
|
&action.ResourceOwner,
|
|
&action.Sequence,
|
|
&action.State,
|
|
&action.Name,
|
|
&action.Script,
|
|
&action.timeout,
|
|
&action.AllowedToFail,
|
|
)
|
|
if err != nil {
|
|
if errs.Is(err, sql.ErrNoRows) {
|
|
return nil, errors.ThrowNotFound(err, "QUERY-GEfnb", "Errors.Action.NotFound")
|
|
}
|
|
return nil, errors.ThrowInternal(err, "QUERY-Dbnt4", "Errors.Internal")
|
|
}
|
|
return action, nil
|
|
}
|
|
}
|