mirror of
https://github.com/zitadel/zitadel.git
synced 2025-07-12 02:38:31 +00:00

This PR summarizes multiple changes specifically only available with ZITADEL v3: - feat: Web Keys management (https://github.com/zitadel/zitadel/pull/9526) - fix(cmd): ensure proper working of mirror (https://github.com/zitadel/zitadel/pull/9509) - feat(Authz): system user support for permission check v2 (https://github.com/zitadel/zitadel/pull/9640) - chore(license): change from Apache to AGPL (https://github.com/zitadel/zitadel/pull/9597) - feat(console): list v2 sessions (https://github.com/zitadel/zitadel/pull/9539) - fix(console): add loginV2 feature flag (https://github.com/zitadel/zitadel/pull/9682) - fix(feature flags): allow reading "own" flags (https://github.com/zitadel/zitadel/pull/9649) - feat(console): add Actions V2 UI (https://github.com/zitadel/zitadel/pull/9591) BREAKING CHANGE - feat(webkey): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9445) - chore!: remove CockroachDB Support (https://github.com/zitadel/zitadel/pull/9444) - feat(actions): migrate to v2beta API (https://github.com/zitadel/zitadel/pull/9489) --------- Co-authored-by: Livio Spring <livio.a@gmail.com> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com> Co-authored-by: Silvan <27845747+adlerhurst@users.noreply.github.com> Co-authored-by: Ramon <mail@conblem.me> Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Kenta Yamaguchi <56732734+KEY60228@users.noreply.github.com> Co-authored-by: Harsha Reddy <harsha.reddy@klaviyo.com> Co-authored-by: Livio Spring <livio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Iraq <66622793+kkrime@users.noreply.github.com> Co-authored-by: Florian Forster <florian@zitadel.com> Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: Max Peintner <peintnerm@gmail.com>
110 lines
2.9 KiB
Go
110 lines
2.9 KiB
Go
package query
|
|
|
|
import (
|
|
"context"
|
|
"database/sql"
|
|
|
|
sq "github.com/Masterminds/squirrel"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/database"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
func genericRowsQuery[R any](
|
|
ctx context.Context,
|
|
client *database.DB,
|
|
query sq.SelectBuilder,
|
|
scan func(rows *sql.Rows) (R, error),
|
|
) (resp R, err error) {
|
|
var rnil R
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, args, err := query.ToSql()
|
|
if err != nil {
|
|
return rnil, zerrors.ThrowInvalidArgument(err, "QUERY-05wf2q36ji", "Errors.Query.InvalidRequest")
|
|
}
|
|
err = client.QueryContext(ctx, func(rows *sql.Rows) error {
|
|
resp, err = scan(rows)
|
|
return err
|
|
}, stmt, args...)
|
|
if err != nil {
|
|
return rnil, zerrors.ThrowInternal(err, "QUERY-y2u7vctrha", "Errors.Internal")
|
|
}
|
|
return resp, err
|
|
}
|
|
|
|
func genericRowsQueryWithState[R Stateful](
|
|
ctx context.Context,
|
|
client *database.DB,
|
|
projection table,
|
|
query sq.SelectBuilder,
|
|
scan func(rows *sql.Rows) (R, error),
|
|
) (resp R, err error) {
|
|
var rnil R
|
|
resp, err = genericRowsQuery(ctx, client, query, scan)
|
|
if err != nil {
|
|
return rnil, err
|
|
}
|
|
state, err := latestState(ctx, client, projection)
|
|
if err != nil {
|
|
return rnil, err
|
|
}
|
|
resp.SetState(state)
|
|
return resp, err
|
|
}
|
|
|
|
func latestState(ctx context.Context, client *database.DB, projections ...table) (state *State, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
query, scan := prepareLatestState()
|
|
or := make(sq.Or, len(projections))
|
|
for i, projection := range projections {
|
|
or[i] = sq.Eq{CurrentStateColProjectionName.identifier(): projection.name}
|
|
}
|
|
stmt, args, err := query.
|
|
Where(or).
|
|
Where(sq.Eq{CurrentStateColInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}).
|
|
OrderBy(CurrentStateColEventDate.identifier() + " DESC").
|
|
ToSql()
|
|
if err != nil {
|
|
return nil, zerrors.ThrowInternal(err, "QUERY-5CfX9", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
state, err = scan(row)
|
|
return err
|
|
}, stmt, args...)
|
|
|
|
return state, err
|
|
}
|
|
|
|
func genericRowQuery[R any](
|
|
ctx context.Context,
|
|
client *database.DB,
|
|
query sq.SelectBuilder,
|
|
scan func(row *sql.Row) (R, error),
|
|
) (resp R, err error) {
|
|
var rnil R
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
stmt, args, err := query.ToSql()
|
|
if err != nil {
|
|
return rnil, zerrors.ThrowInternal(err, "QUERY-s969t763z4", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
err = client.QueryRowContext(ctx, func(row *sql.Row) error {
|
|
resp, err = scan(row)
|
|
return err
|
|
}, stmt, args...)
|
|
return resp, err
|
|
}
|
|
|
|
func combineToWhereStmt(query sq.SelectBuilder, toQuery func(query sq.SelectBuilder) sq.SelectBuilder, eq interface{}) sq.SelectBuilder {
|
|
return toQuery(query).Where(eq)
|
|
}
|