mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 11:34:26 +00:00
c0e45b63d8
* reproduce #5808 Add an integration test that imports and gets N amount of human users. - With N set to 1-10 the operation seems to succeed always - With N set to 100 the operation seems to fail between 1 and 7 times. * fix merge issue * fix: reset the call timestamp after a bulk trigger With the use of `AS OF SYSTEM TIME` in queries, there was a change for the query package not finding the latest projection verson after a bulk trigger. If events where processed in the bulk trigger, the resulting row timestamp would be after the call start timestamp. This sometimes resulted in consistency issues when Set and Get API methods are called in short succession. For example a Import and Get user could sometimes result in a Not Found error. Although the issue was reported for the Management API user import, it is likely this bug contributed to the flaky integration and e2e tests. Fixes #5808 * trigger bulk action in GetSession * don't use the new context in handler schedule * disable reproduction test --------- Co-authored-by: Livio Spring <livio.a@gmail.com>
196 lines
5.3 KiB
Go
196 lines
5.3 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/api/call"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/errors"
|
|
"github.com/zitadel/zitadel/internal/query/projection"
|
|
"github.com/zitadel/zitadel/internal/telemetry/tracing"
|
|
)
|
|
|
|
type PrivacyPolicy struct {
|
|
ID string
|
|
Sequence uint64
|
|
CreationDate time.Time
|
|
ChangeDate time.Time
|
|
ResourceOwner string
|
|
State domain.PolicyState
|
|
|
|
TOSLink string
|
|
PrivacyLink string
|
|
HelpLink string
|
|
SupportEmail domain.EmailAddress
|
|
|
|
IsDefault bool
|
|
}
|
|
|
|
var (
|
|
privacyTable = table{
|
|
name: projection.PrivacyPolicyTable,
|
|
instanceIDCol: projection.PrivacyPolicyInstanceIDCol,
|
|
}
|
|
PrivacyColID = Column{
|
|
name: projection.PrivacyPolicyIDCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColSequence = Column{
|
|
name: projection.PrivacyPolicySequenceCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColCreationDate = Column{
|
|
name: projection.PrivacyPolicyCreationDateCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColChangeDate = Column{
|
|
name: projection.PrivacyPolicyChangeDateCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColResourceOwner = Column{
|
|
name: projection.PrivacyPolicyResourceOwnerCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColInstanceID = Column{
|
|
name: projection.PrivacyPolicyInstanceIDCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColPrivacyLink = Column{
|
|
name: projection.PrivacyPolicyPrivacyLinkCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColTOSLink = Column{
|
|
name: projection.PrivacyPolicyTOSLinkCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColHelpLink = Column{
|
|
name: projection.PrivacyPolicyHelpLinkCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColSupportEmail = Column{
|
|
name: projection.PrivacyPolicySupportEmailCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColIsDefault = Column{
|
|
name: projection.PrivacyPolicyIsDefaultCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColState = Column{
|
|
name: projection.PrivacyPolicyStateCol,
|
|
table: privacyTable,
|
|
}
|
|
PrivacyColOwnerRemoved = Column{
|
|
name: projection.PrivacyPolicyOwnerRemovedCol,
|
|
table: privacyTable,
|
|
}
|
|
)
|
|
|
|
func (q *Queries) PrivacyPolicyByOrg(ctx context.Context, shouldTriggerBulk bool, orgID string, withOwnerRemoved bool) (_ *PrivacyPolicy, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
if shouldTriggerBulk {
|
|
ctx = projection.PrivacyPolicyProjection.Trigger(ctx)
|
|
}
|
|
eq := sq.Eq{PrivacyColInstanceID.identifier(): authz.GetInstance(ctx).InstanceID()}
|
|
if !withOwnerRemoved {
|
|
eq[PrivacyColOwnerRemoved.identifier()] = false
|
|
}
|
|
stmt, scan := preparePrivacyPolicyQuery(ctx, q.client)
|
|
query, args, err := stmt.Where(
|
|
sq.And{
|
|
eq,
|
|
sq.Or{
|
|
sq.Eq{PrivacyColID.identifier(): orgID},
|
|
sq.Eq{PrivacyColID.identifier(): authz.GetInstance(ctx).InstanceID()},
|
|
},
|
|
}).
|
|
OrderBy(PrivacyColIsDefault.identifier()).Limit(1).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-UXuPI", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
row := q.client.QueryRowContext(ctx, query, args...)
|
|
return scan(row)
|
|
}
|
|
|
|
func (q *Queries) DefaultPrivacyPolicy(ctx context.Context, shouldTriggerBulk bool) (_ *PrivacyPolicy, err error) {
|
|
ctx, span := tracing.NewSpan(ctx)
|
|
defer func() { span.EndWithError(err) }()
|
|
|
|
if shouldTriggerBulk {
|
|
ctx = projection.PrivacyPolicyProjection.Trigger(ctx)
|
|
}
|
|
|
|
stmt, scan := preparePrivacyPolicyQuery(ctx, q.client)
|
|
query, args, err := stmt.Where(sq.Eq{
|
|
PrivacyColID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
PrivacyColInstanceID.identifier(): authz.GetInstance(ctx).InstanceID(),
|
|
}).
|
|
OrderBy(PrivacyColIsDefault.identifier()).
|
|
Limit(1).ToSql()
|
|
if err != nil {
|
|
return nil, errors.ThrowInternal(err, "QUERY-LkFZ7", "Errors.Query.SQLStatement")
|
|
}
|
|
|
|
row := q.client.QueryRowContext(ctx, query, args...)
|
|
return scan(row)
|
|
}
|
|
|
|
func preparePrivacyPolicyQuery(ctx context.Context, db prepareDatabase) (sq.SelectBuilder, func(*sql.Row) (*PrivacyPolicy, error)) {
|
|
return sq.Select(
|
|
PrivacyColID.identifier(),
|
|
PrivacyColSequence.identifier(),
|
|
PrivacyColCreationDate.identifier(),
|
|
PrivacyColChangeDate.identifier(),
|
|
PrivacyColResourceOwner.identifier(),
|
|
PrivacyColPrivacyLink.identifier(),
|
|
PrivacyColTOSLink.identifier(),
|
|
PrivacyColHelpLink.identifier(),
|
|
PrivacyColSupportEmail.identifier(),
|
|
PrivacyColIsDefault.identifier(),
|
|
PrivacyColState.identifier(),
|
|
).
|
|
From(privacyTable.identifier() + db.Timetravel(call.Took(ctx))).
|
|
PlaceholderFormat(sq.Dollar),
|
|
func(row *sql.Row) (*PrivacyPolicy, error) {
|
|
policy := new(PrivacyPolicy)
|
|
err := row.Scan(
|
|
&policy.ID,
|
|
&policy.Sequence,
|
|
&policy.CreationDate,
|
|
&policy.ChangeDate,
|
|
&policy.ResourceOwner,
|
|
&policy.PrivacyLink,
|
|
&policy.TOSLink,
|
|
&policy.HelpLink,
|
|
&policy.SupportEmail,
|
|
&policy.IsDefault,
|
|
&policy.State,
|
|
)
|
|
if err != nil {
|
|
if errs.Is(err, sql.ErrNoRows) {
|
|
return nil, errors.ThrowNotFound(err, "QUERY-vNMHL", "Errors.PrivacyPolicy.NotFound")
|
|
}
|
|
return nil, errors.ThrowInternal(err, "QUERY-csrdo", "Errors.Internal")
|
|
}
|
|
return policy, nil
|
|
}
|
|
}
|
|
|
|
func (p *PrivacyPolicy) ToDomain() *domain.PrivacyPolicy {
|
|
return &domain.PrivacyPolicy{
|
|
TOSLink: p.TOSLink,
|
|
PrivacyLink: p.PrivacyLink,
|
|
HelpLink: p.HelpLink,
|
|
SupportEmail: p.SupportEmail,
|
|
Default: p.IsDefault,
|
|
}
|
|
}
|