mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 03:57:32 +00:00
feat: Default configs sms provider (#3187)
* feat: sms config * feat: twilio as sms provider * feat:sms projection * feat: sms queries * feat: sms queries test * feat: sms configs * feat: sms configs sql file * fix merge * fix: rename from to sendername * fix: proto comments * fix: token as crypto * fix: tests * fix: sms config sender name to sender number * fix: sms config sender name to sender number * Update email.go * Update channel.go * Update V1.111__settings.sql Co-authored-by: Livio Amstutz <livio.a@gmail.com>
This commit is contained in:
Fabi
@@ -71,6 +71,7 @@ func Start(ctx context.Context, sqlClient *sql.DB, es *eventstore.Eventstore, co
|
||||
NewIAMProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["iam"]))
|
||||
NewSecretGeneratorProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["secret_generators"]))
|
||||
NewSMTPConfigProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["smtp_configs"]))
|
||||
NewSMSConfigProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["sms_config"]))
|
||||
_, err := NewKeyProjection(ctx, applyCustomConfig(projectionConfig, config.Customizations["keys"]), keyConfig, keyChan)
|
||||
|
||||
return err
|
||||
|
||||
195
internal/query/projection/sms.go
Normal file
195
internal/query/projection/sms.go
Normal file
@@ -0,0 +1,195 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/caos/logging"
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler/crdb"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
)
|
||||
|
||||
type SMSConfigProjection struct {
|
||||
crdb.StatementHandler
|
||||
}
|
||||
|
||||
const (
|
||||
SMSConfigProjectionTable = "zitadel.projections.sms_configs"
|
||||
SMSTwilioTable = SMSConfigProjectionTable + "_" + smsTwilioTableSuffix
|
||||
)
|
||||
|
||||
func NewSMSConfigProjection(ctx context.Context, config crdb.StatementHandlerConfig) *SMSConfigProjection {
|
||||
p := &SMSConfigProjection{}
|
||||
config.ProjectionName = SMSConfigProjectionTable
|
||||
config.Reducers = p.reducers()
|
||||
p.StatementHandler = crdb.NewStatementHandler(ctx, config)
|
||||
return p
|
||||
}
|
||||
|
||||
func (p *SMSConfigProjection) reducers() []handler.AggregateReducer {
|
||||
return []handler.AggregateReducer{
|
||||
{
|
||||
Aggregate: iam.AggregateType,
|
||||
EventRedusers: []handler.EventReducer{
|
||||
{
|
||||
Event: iam.SMSConfigTwilioAddedEventType,
|
||||
Reduce: p.reduceSMSConfigTwilioAdded,
|
||||
},
|
||||
{
|
||||
Event: iam.SMSConfigTwilioChangedEventType,
|
||||
Reduce: p.reduceSMSConfigTwilioChanged,
|
||||
},
|
||||
{
|
||||
Event: iam.SMSConfigActivatedEventType,
|
||||
Reduce: p.reduceSMSConfigActivated,
|
||||
},
|
||||
{
|
||||
Event: iam.SMSConfigDeactivatedEventType,
|
||||
Reduce: p.reduceSMSConfigDeactivated,
|
||||
},
|
||||
{
|
||||
Event: iam.SMSConfigRemovedEventType,
|
||||
Reduce: p.reduceSMSConfigRemoved,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
const (
|
||||
SMSColumnID = "id"
|
||||
SMSColumnAggregateID = "aggregate_id"
|
||||
SMSColumnCreationDate = "creation_date"
|
||||
SMSColumnChangeDate = "change_date"
|
||||
SMSColumnResourceOwner = "resource_owner"
|
||||
SMSColumnState = "state"
|
||||
SMSColumnSequence = "sequence"
|
||||
|
||||
smsTwilioTableSuffix = "twilio"
|
||||
SMSTwilioConfigColumnSMSID = "sms_id"
|
||||
SMSTwilioConfigColumnSID = "sid"
|
||||
SMSTwilioConfigColumnToken = "token"
|
||||
SMSTwilioConfigColumnSenderNumber = "sender_number"
|
||||
)
|
||||
|
||||
func (p *SMSConfigProjection) reduceSMSConfigTwilioAdded(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMSConfigTwilioAddedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-9jiWf", "seq", event.Sequence(), "expectedType", iam.SMSConfigTwilioAddedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-s8efs", "reduce.wrong.event.type")
|
||||
}
|
||||
|
||||
return crdb.NewMultiStatement(
|
||||
e,
|
||||
crdb.AddCreateStatement(
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMSColumnID, e.ID),
|
||||
handler.NewCol(SMSColumnAggregateID, e.Aggregate().ID),
|
||||
handler.NewCol(SMSColumnCreationDate, e.CreationDate()),
|
||||
handler.NewCol(SMSColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMSColumnResourceOwner, e.Aggregate().ResourceOwner),
|
||||
handler.NewCol(SMSColumnState, domain.SMSConfigStateInactive),
|
||||
handler.NewCol(SMSColumnSequence, e.Sequence()),
|
||||
},
|
||||
),
|
||||
crdb.AddCreateStatement(
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMSTwilioConfigColumnSMSID, e.ID),
|
||||
handler.NewCol(SMSTwilioConfigColumnSID, e.SID),
|
||||
handler.NewCol(SMSTwilioConfigColumnToken, e.Token),
|
||||
handler.NewCol(SMSTwilioConfigColumnSenderNumber, e.SenderNumber),
|
||||
},
|
||||
crdb.WithTableSuffix(smsTwilioTableSuffix),
|
||||
),
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SMSConfigProjection) reduceSMSConfigTwilioChanged(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMSConfigTwilioChangedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-fm9el", "seq", event.Sequence(), "expectedType", iam.SMSConfigTwilioChangedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-fi99F", "reduce.wrong.event.type")
|
||||
}
|
||||
columns := make([]handler.Column, 0)
|
||||
if e.SID != nil {
|
||||
columns = append(columns, handler.NewCol(SMSTwilioConfigColumnSID, e.SID))
|
||||
}
|
||||
if e.SenderNumber != nil {
|
||||
columns = append(columns, handler.NewCol(SMSTwilioConfigColumnSenderNumber, e.SenderNumber))
|
||||
}
|
||||
|
||||
return crdb.NewMultiStatement(
|
||||
e,
|
||||
crdb.AddUpdateStatement(
|
||||
columns,
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMSTwilioConfigColumnSMSID, e.ID),
|
||||
},
|
||||
crdb.WithTableSuffix(smsTwilioTableSuffix),
|
||||
),
|
||||
crdb.AddUpdateStatement(
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMSColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMSColumnSequence, e.Sequence()),
|
||||
},
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMSColumnID, e.ID),
|
||||
},
|
||||
),
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SMSConfigProjection) reduceSMSConfigActivated(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMSConfigActivatedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-fm03F", "seq", event.Sequence(), "expectedType", iam.SMSConfigActivatedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-fj9Ef", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewUpdateStatement(
|
||||
e,
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMSColumnState, domain.SMSConfigStateActive),
|
||||
handler.NewCol(SMSColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMSColumnSequence, e.Sequence()),
|
||||
},
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMSColumnID, e.ID),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SMSConfigProjection) reduceSMSConfigDeactivated(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMSConfigDeactivatedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-9fnHS", "seq", event.Sequence(), "expectedType", iam.SMSConfigDeactivatedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-dj9Js", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewUpdateStatement(
|
||||
e,
|
||||
[]handler.Column{
|
||||
handler.NewCol(SMSColumnState, domain.SMSConfigStateInactive),
|
||||
handler.NewCol(SMSColumnChangeDate, e.CreationDate()),
|
||||
handler.NewCol(SMSColumnSequence, e.Sequence()),
|
||||
},
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMSColumnID, e.ID),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
|
||||
func (p *SMSConfigProjection) reduceSMSConfigRemoved(event eventstore.Event) (*handler.Statement, error) {
|
||||
e, ok := event.(*iam.SMSConfigRemovedEvent)
|
||||
if !ok {
|
||||
logging.LogWithFields("HANDL-0Opew", "seq", event.Sequence(), "expectedType", iam.SMSConfigRemovedEventType).Error("wrong event type")
|
||||
return nil, errors.ThrowInvalidArgument(nil, "HANDL-s9JJf", "reduce.wrong.event.type")
|
||||
}
|
||||
return crdb.NewDeleteStatement(
|
||||
e,
|
||||
[]handler.Condition{
|
||||
handler.NewCond(SMSColumnID, e.ID),
|
||||
},
|
||||
), nil
|
||||
}
|
||||
229
internal/query/projection/sms_test.go
Normal file
229
internal/query/projection/sms_test.go
Normal file
@@ -0,0 +1,229 @@
|
||||
package projection
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/eventstore"
|
||||
"github.com/caos/zitadel/internal/eventstore/handler"
|
||||
"github.com/caos/zitadel/internal/eventstore/repository"
|
||||
"github.com/caos/zitadel/internal/repository/iam"
|
||||
)
|
||||
|
||||
var (
|
||||
sid = "sid"
|
||||
token = "token"
|
||||
senderNumber = "sender-number"
|
||||
)
|
||||
|
||||
func TestSMSProjection_reduces(t *testing.T) {
|
||||
type args struct {
|
||||
event func(t *testing.T) eventstore.Event
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
reduce func(event eventstore.Event) (*handler.Statement, error)
|
||||
want wantReduce
|
||||
}{
|
||||
{
|
||||
name: "iam.reduceSMSTwilioAdded",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMSConfigTwilioAddedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"id": "id",
|
||||
"sid": "sid",
|
||||
"token": {
|
||||
"cryptoType": 0,
|
||||
"algorithm": "RSA-265",
|
||||
"keyId": "key-id"
|
||||
},
|
||||
"senderNumber": "sender-number"
|
||||
}`),
|
||||
), iam.SMSConfigTwilioAddedEventMapper),
|
||||
},
|
||||
reduce: (&SMSConfigProjection{}).reduceSMSConfigTwilioAdded,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: SMSConfigProjectionTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "INSERT INTO zitadel.projections.sms_configs (id, aggregate_id, creation_date, change_date, resource_owner, state, sequence) VALUES ($1, $2, $3, $4, $5, $6, $7)",
|
||||
expectedArgs: []interface{}{
|
||||
"id",
|
||||
"agg-id",
|
||||
anyArg{},
|
||||
anyArg{},
|
||||
"ro-id",
|
||||
domain.SMSConfigStateInactive,
|
||||
uint64(15),
|
||||
},
|
||||
},
|
||||
{
|
||||
expectedStmt: "INSERT INTO zitadel.projections.sms_configs_twilio (sms_id, sid, token, sender_number) VALUES ($1, $2, $3, $4)",
|
||||
expectedArgs: []interface{}{
|
||||
"id",
|
||||
"sid",
|
||||
anyArg{},
|
||||
"sender-number",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "iam.reduceSMSConfigTwilioChanged",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMSConfigTwilioChangedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"id": "id",
|
||||
"sid": "sid",
|
||||
"senderNumber": "sender-number"
|
||||
}`),
|
||||
), iam.SMSConfigTwilioChangedEventMapper),
|
||||
},
|
||||
reduce: (&SMSConfigProjection{}).reduceSMSConfigTwilioChanged,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: SMSConfigProjectionTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.sms_configs_twilio SET (sid, sender_number) = ($1, $2) WHERE (sms_id = $3)",
|
||||
expectedArgs: []interface{}{
|
||||
&sid,
|
||||
&senderNumber,
|
||||
"id",
|
||||
},
|
||||
},
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.sms_configs SET (change_date, sequence) = ($1, $2) WHERE (id = $3)",
|
||||
expectedArgs: []interface{}{
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
"id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "iam.reduceSMSConfigActivated",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMSConfigActivatedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"id": "id"
|
||||
}`),
|
||||
), iam.SMSConfigActivatedEventMapper),
|
||||
},
|
||||
reduce: (&SMSConfigProjection{}).reduceSMSConfigActivated,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: SMSConfigProjectionTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.sms_configs SET (state, change_date, sequence) = ($1, $2, $3) WHERE (id = $4)",
|
||||
expectedArgs: []interface{}{
|
||||
domain.SMSConfigStateActive,
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
"id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "iam.reduceSMSConfigDeactivated",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMSConfigDeactivatedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"id": "id"
|
||||
}`),
|
||||
), iam.SMSConfigDeactivatedEventMapper),
|
||||
},
|
||||
reduce: (&SMSConfigProjection{}).reduceSMSConfigDeactivated,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: SMSConfigProjectionTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "UPDATE zitadel.projections.sms_configs SET (state, change_date, sequence) = ($1, $2, $3) WHERE (id = $4)",
|
||||
expectedArgs: []interface{}{
|
||||
domain.SMSConfigStateInactive,
|
||||
anyArg{},
|
||||
uint64(15),
|
||||
"id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "iam.reduceSMSConfigRemoved",
|
||||
args: args{
|
||||
event: getEvent(testEvent(
|
||||
repository.EventType(iam.SMSConfigRemovedEventType),
|
||||
iam.AggregateType,
|
||||
[]byte(`{
|
||||
"id": "id"
|
||||
}`),
|
||||
), iam.SMSConfigRemovedEventMapper),
|
||||
},
|
||||
reduce: (&SMSConfigProjection{}).reduceSMSConfigRemoved,
|
||||
want: wantReduce{
|
||||
aggregateType: eventstore.AggregateType("iam"),
|
||||
sequence: 15,
|
||||
previousSequence: 10,
|
||||
projection: SMSConfigProjectionTable,
|
||||
executer: &testExecuter{
|
||||
executions: []execution{
|
||||
{
|
||||
expectedStmt: "DELETE FROM zitadel.projections.sms_configs WHERE (id = $1)",
|
||||
expectedArgs: []interface{}{
|
||||
"id",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
event := baseEvent(t)
|
||||
got, err := tt.reduce(event)
|
||||
if _, ok := err.(errors.InvalidArgument); !ok {
|
||||
t.Errorf("no wrong event mapping: %v, got: %v", err, got)
|
||||
}
|
||||
|
||||
event = tt.args.event(t)
|
||||
got, err = tt.reduce(event)
|
||||
assertReduce(t, got, err, tt.want)
|
||||
})
|
||||
}
|
||||
}
|
||||
264
internal/query/sms.go
Normal file
264
internal/query/sms.go
Normal file
@@ -0,0 +1,264 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
errs "errors"
|
||||
"time"
|
||||
|
||||
sq "github.com/Masterminds/squirrel"
|
||||
"github.com/caos/zitadel/internal/crypto"
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
"github.com/caos/zitadel/internal/errors"
|
||||
"github.com/caos/zitadel/internal/query/projection"
|
||||
)
|
||||
|
||||
type SMSConfigs struct {
|
||||
SearchResponse
|
||||
Configs []*SMSConfig
|
||||
}
|
||||
|
||||
type SMSConfig struct {
|
||||
AggregateID string
|
||||
ID string
|
||||
CreationDate time.Time
|
||||
ChangeDate time.Time
|
||||
ResourceOwner string
|
||||
State domain.SMSConfigState
|
||||
Sequence uint64
|
||||
|
||||
TwilioConfig *Twilio
|
||||
}
|
||||
|
||||
type Twilio struct {
|
||||
SID string
|
||||
Token *crypto.CryptoValue
|
||||
SenderNumber string
|
||||
}
|
||||
|
||||
type SMSConfigsSearchQueries struct {
|
||||
SearchRequest
|
||||
Queries []SearchQuery
|
||||
}
|
||||
|
||||
func (q *SMSConfigsSearchQueries) toQuery(query sq.SelectBuilder) sq.SelectBuilder {
|
||||
query = q.SearchRequest.toQuery(query)
|
||||
for _, q := range q.Queries {
|
||||
query = q.toQuery(query)
|
||||
}
|
||||
return query
|
||||
}
|
||||
|
||||
var (
|
||||
smsConfigsTable = table{
|
||||
name: projection.SMSConfigProjectionTable,
|
||||
}
|
||||
SMSConfigColumnID = Column{
|
||||
name: projection.SMSColumnID,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
SMSConfigColumnAggregateID = Column{
|
||||
name: projection.SMSColumnAggregateID,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
SMSConfigColumnCreationDate = Column{
|
||||
name: projection.SMSColumnCreationDate,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
SMSConfigColumnChangeDate = Column{
|
||||
name: projection.SMSColumnChangeDate,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
SMSConfigColumnResourceOwner = Column{
|
||||
name: projection.SMSColumnResourceOwner,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
SMSConfigColumnState = Column{
|
||||
name: projection.SMSColumnState,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
SMSConfigColumnSequence = Column{
|
||||
name: projection.SMSColumnSequence,
|
||||
table: smsConfigsTable,
|
||||
}
|
||||
)
|
||||
|
||||
var (
|
||||
smsTwilioConfigsTable = table{
|
||||
name: projection.SMSTwilioTable,
|
||||
}
|
||||
SMSTwilioConfigColumnSMSID = Column{
|
||||
name: projection.SMSTwilioConfigColumnSMSID,
|
||||
table: smsTwilioConfigsTable,
|
||||
}
|
||||
SMSTwilioConfigColumnSID = Column{
|
||||
name: projection.SMSTwilioConfigColumnSID,
|
||||
table: smsTwilioConfigsTable,
|
||||
}
|
||||
SMSTwilioConfigColumnToken = Column{
|
||||
name: projection.SMSTwilioConfigColumnToken,
|
||||
table: smsTwilioConfigsTable,
|
||||
}
|
||||
SMSTwilioConfigColumnSenderNumber = Column{
|
||||
name: projection.SMSTwilioConfigColumnSenderNumber,
|
||||
table: smsTwilioConfigsTable,
|
||||
}
|
||||
)
|
||||
|
||||
func (q *Queries) SMSProviderConfigByID(ctx context.Context, id string) (*SMSConfig, error) {
|
||||
stmt, scan := prepareSMSConfigQuery()
|
||||
query, args, err := stmt.Where(
|
||||
sq.Eq{
|
||||
SMSConfigColumnID.identifier(): id,
|
||||
},
|
||||
).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-dn9JW", "Errors.Query.SQLStatement")
|
||||
}
|
||||
|
||||
row := q.client.QueryRowContext(ctx, query, args...)
|
||||
return scan(row)
|
||||
}
|
||||
|
||||
func (q *Queries) SearchSMSConfigs(ctx context.Context, queries *SMSConfigsSearchQueries) (*SMSConfigs, error) {
|
||||
query, scan := prepareSMSConfigsQuery()
|
||||
stmt, args, err := queries.toQuery(query).ToSql()
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInvalidArgument(err, "QUERY-sn9Jf", "Errors.Query.InvalidRequest")
|
||||
}
|
||||
|
||||
rows, err := q.client.QueryContext(ctx, stmt, args...)
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-aJnZL", "Errors.Internal")
|
||||
}
|
||||
apps, err := scan(rows)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
apps.LatestSequence, err = q.latestSequence(ctx, smsConfigsTable)
|
||||
return apps, err
|
||||
}
|
||||
|
||||
func prepareSMSConfigQuery() (sq.SelectBuilder, func(*sql.Row) (*SMSConfig, error)) {
|
||||
return sq.Select(
|
||||
SMSConfigColumnID.identifier(),
|
||||
SMSConfigColumnAggregateID.identifier(),
|
||||
SMSConfigColumnCreationDate.identifier(),
|
||||
SMSConfigColumnChangeDate.identifier(),
|
||||
SMSConfigColumnResourceOwner.identifier(),
|
||||
SMSConfigColumnState.identifier(),
|
||||
SMSConfigColumnSequence.identifier(),
|
||||
|
||||
SMSTwilioConfigColumnSMSID.identifier(),
|
||||
SMSTwilioConfigColumnSID.identifier(),
|
||||
SMSTwilioConfigColumnToken.identifier(),
|
||||
SMSTwilioConfigColumnSenderNumber.identifier(),
|
||||
).From(smsConfigsTable.identifier()).
|
||||
LeftJoin(join(SMSTwilioConfigColumnSMSID, SMSConfigColumnID)).
|
||||
PlaceholderFormat(sq.Dollar), func(row *sql.Row) (*SMSConfig, error) {
|
||||
config := new(SMSConfig)
|
||||
|
||||
var (
|
||||
twilioConfig = sqlTwilioConfig{}
|
||||
)
|
||||
|
||||
err := row.Scan(
|
||||
&config.ID,
|
||||
&config.AggregateID,
|
||||
&config.CreationDate,
|
||||
&config.ChangeDate,
|
||||
&config.ResourceOwner,
|
||||
&config.State,
|
||||
&config.Sequence,
|
||||
|
||||
&twilioConfig.smsID,
|
||||
&twilioConfig.sid,
|
||||
&twilioConfig.token,
|
||||
&twilioConfig.senderNumber,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
if errs.Is(err, sql.ErrNoRows) {
|
||||
return nil, errors.ThrowNotFound(err, "QUERY-fn99w", "Errors.SMSConfig.NotExisting")
|
||||
}
|
||||
return nil, errors.ThrowInternal(err, "QUERY-3n9Js", "Errors.Internal")
|
||||
}
|
||||
|
||||
twilioConfig.set(config)
|
||||
|
||||
return config, nil
|
||||
}
|
||||
}
|
||||
|
||||
func prepareSMSConfigsQuery() (sq.SelectBuilder, func(*sql.Rows) (*SMSConfigs, error)) {
|
||||
return sq.Select(
|
||||
SMSConfigColumnID.identifier(),
|
||||
SMSConfigColumnAggregateID.identifier(),
|
||||
SMSConfigColumnCreationDate.identifier(),
|
||||
SMSConfigColumnChangeDate.identifier(),
|
||||
SMSConfigColumnResourceOwner.identifier(),
|
||||
SMSConfigColumnState.identifier(),
|
||||
SMSConfigColumnSequence.identifier(),
|
||||
|
||||
SMSTwilioConfigColumnSMSID.identifier(),
|
||||
SMSTwilioConfigColumnSID.identifier(),
|
||||
SMSTwilioConfigColumnToken.identifier(),
|
||||
SMSTwilioConfigColumnSenderNumber.identifier(),
|
||||
countColumn.identifier(),
|
||||
).From(smsConfigsTable.identifier()).
|
||||
LeftJoin(join(SMSTwilioConfigColumnSMSID, SMSConfigColumnID)).
|
||||
PlaceholderFormat(sq.Dollar), func(row *sql.Rows) (*SMSConfigs, error) {
|
||||
configs := &SMSConfigs{Configs: []*SMSConfig{}}
|
||||
|
||||
for row.Next() {
|
||||
config := new(SMSConfig)
|
||||
var (
|
||||
twilioConfig = sqlTwilioConfig{}
|
||||
)
|
||||
|
||||
err := row.Scan(
|
||||
&config.ID,
|
||||
&config.AggregateID,
|
||||
&config.CreationDate,
|
||||
&config.ChangeDate,
|
||||
&config.ResourceOwner,
|
||||
&config.State,
|
||||
&config.Sequence,
|
||||
|
||||
&twilioConfig.smsID,
|
||||
&twilioConfig.sid,
|
||||
&twilioConfig.token,
|
||||
&twilioConfig.senderNumber,
|
||||
&configs.Count,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return nil, errors.ThrowInternal(err, "QUERY-d9jJd", "Errors.Internal")
|
||||
}
|
||||
|
||||
twilioConfig.set(config)
|
||||
|
||||
configs.Configs = append(configs.Configs, config)
|
||||
}
|
||||
|
||||
return configs, nil
|
||||
}
|
||||
}
|
||||
|
||||
type sqlTwilioConfig struct {
|
||||
smsID sql.NullString
|
||||
sid sql.NullString
|
||||
token *crypto.CryptoValue
|
||||
senderNumber sql.NullString
|
||||
}
|
||||
|
||||
func (c sqlTwilioConfig) set(smsConfig *SMSConfig) {
|
||||
if !c.smsID.Valid {
|
||||
return
|
||||
}
|
||||
smsConfig.TwilioConfig = &Twilio{
|
||||
SID: c.sid.String,
|
||||
Token: c.token,
|
||||
SenderNumber: c.senderNumber.String,
|
||||
}
|
||||
}
|
||||
326
internal/query/sms_test.go
Normal file
326
internal/query/sms_test.go
Normal file
@@ -0,0 +1,326 @@
|
||||
package query
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"database/sql/driver"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"testing"
|
||||
|
||||
"github.com/caos/zitadel/internal/crypto"
|
||||
"github.com/caos/zitadel/internal/domain"
|
||||
errs "github.com/caos/zitadel/internal/errors"
|
||||
)
|
||||
|
||||
var (
|
||||
expectedSMSConfigQuery = regexp.QuoteMeta(`SELECT zitadel.projections.sms_configs.id,` +
|
||||
` zitadel.projections.sms_configs.aggregate_id,` +
|
||||
` zitadel.projections.sms_configs.creation_date,` +
|
||||
` zitadel.projections.sms_configs.change_date,` +
|
||||
` zitadel.projections.sms_configs.resource_owner,` +
|
||||
` zitadel.projections.sms_configs.state,` +
|
||||
` zitadel.projections.sms_configs.sequence,` +
|
||||
|
||||
// twilio config
|
||||
` zitadel.projections.sms_configs_twilio.sms_id,` +
|
||||
` zitadel.projections.sms_configs_twilio.sid,` +
|
||||
` zitadel.projections.sms_configs_twilio.token,` +
|
||||
` zitadel.projections.sms_configs_twilio.sender_number` +
|
||||
` FROM zitadel.projections.sms_configs` +
|
||||
` LEFT JOIN zitadel.projections.sms_configs_twilio ON zitadel.projections.sms_configs.id = zitadel.projections.sms_configs_twilio.sms_id`)
|
||||
expectedSMSConfigsQuery = regexp.QuoteMeta(`SELECT zitadel.projections.sms_configs.id,` +
|
||||
` zitadel.projections.sms_configs.aggregate_id,` +
|
||||
` zitadel.projections.sms_configs.creation_date,` +
|
||||
` zitadel.projections.sms_configs.change_date,` +
|
||||
` zitadel.projections.sms_configs.resource_owner,` +
|
||||
` zitadel.projections.sms_configs.state,` +
|
||||
` zitadel.projections.sms_configs.sequence,` +
|
||||
|
||||
// twilio config
|
||||
` zitadel.projections.sms_configs_twilio.sms_id,` +
|
||||
` zitadel.projections.sms_configs_twilio.sid,` +
|
||||
` zitadel.projections.sms_configs_twilio.token,` +
|
||||
` zitadel.projections.sms_configs_twilio.sender_number,` +
|
||||
` COUNT(*) OVER ()` +
|
||||
` FROM zitadel.projections.sms_configs` +
|
||||
` LEFT JOIN zitadel.projections.sms_configs_twilio ON zitadel.projections.sms_configs.id = zitadel.projections.sms_configs_twilio.sms_id`)
|
||||
|
||||
smsConfigCols = []string{
|
||||
"id",
|
||||
"aggregate_id",
|
||||
"creation_date",
|
||||
"change_date",
|
||||
"resource_owner",
|
||||
"state",
|
||||
"sequence",
|
||||
// twilio config
|
||||
"sms_id",
|
||||
"sid",
|
||||
"token",
|
||||
"sender-number",
|
||||
}
|
||||
smsConfigsCols = append(smsConfigCols, "count")
|
||||
)
|
||||
|
||||
func Test_SMSConfigssPrepare(t *testing.T) {
|
||||
type want struct {
|
||||
sqlExpectations sqlExpectation
|
||||
err checkErr
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
prepare interface{}
|
||||
want want
|
||||
object interface{}
|
||||
}{
|
||||
{
|
||||
name: "prepareSMSConfigsQuery no result",
|
||||
prepare: prepareSMSConfigsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
expectedSMSConfigsQuery,
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
},
|
||||
object: &SMSConfigs{Configs: []*SMSConfig{}},
|
||||
},
|
||||
{
|
||||
name: "prepareSMSQuery twilio config",
|
||||
prepare: prepareSMSConfigsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
expectedSMSConfigsQuery,
|
||||
smsConfigsCols,
|
||||
[][]driver.Value{
|
||||
{
|
||||
"sms-id",
|
||||
"agg-id",
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
domain.SMSConfigStateInactive,
|
||||
uint64(20211109),
|
||||
// twilio config
|
||||
"sms-id",
|
||||
"sid",
|
||||
&crypto.CryptoValue{},
|
||||
"sender-number",
|
||||
},
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SMSConfigs{
|
||||
SearchResponse: SearchResponse{
|
||||
Count: 1,
|
||||
},
|
||||
Configs: []*SMSConfig{
|
||||
{
|
||||
ID: "sms-id",
|
||||
AggregateID: "agg-id",
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
State: domain.SMSConfigStateInactive,
|
||||
Sequence: 20211109,
|
||||
TwilioConfig: &Twilio{
|
||||
SID: "sid",
|
||||
Token: &crypto.CryptoValue{},
|
||||
SenderNumber: "sender-number",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSMSConfigsQuery multiple result",
|
||||
prepare: prepareSMSConfigsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
expectedSMSConfigsQuery,
|
||||
smsConfigsCols,
|
||||
[][]driver.Value{
|
||||
{
|
||||
"sms-id",
|
||||
"agg-id",
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
domain.SMSConfigStateInactive,
|
||||
uint64(20211109),
|
||||
// twilio config
|
||||
"sms-id",
|
||||
"sid",
|
||||
&crypto.CryptoValue{},
|
||||
"sender-number",
|
||||
},
|
||||
{
|
||||
"sms-id2",
|
||||
"agg-id",
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
domain.SMSConfigStateInactive,
|
||||
uint64(20211109),
|
||||
// twilio config
|
||||
"sms-id2",
|
||||
"sid2",
|
||||
&crypto.CryptoValue{},
|
||||
"sender-number2",
|
||||
},
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SMSConfigs{
|
||||
SearchResponse: SearchResponse{
|
||||
Count: 2,
|
||||
},
|
||||
Configs: []*SMSConfig{
|
||||
{
|
||||
ID: "sms-id",
|
||||
AggregateID: "agg-id",
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
State: domain.SMSConfigStateInactive,
|
||||
Sequence: 20211109,
|
||||
TwilioConfig: &Twilio{
|
||||
SID: "sid",
|
||||
Token: &crypto.CryptoValue{},
|
||||
SenderNumber: "sender-number",
|
||||
},
|
||||
},
|
||||
{
|
||||
ID: "sms-id2",
|
||||
AggregateID: "agg-id",
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
State: domain.SMSConfigStateInactive,
|
||||
Sequence: 20211109,
|
||||
TwilioConfig: &Twilio{
|
||||
SID: "sid2",
|
||||
Token: &crypto.CryptoValue{},
|
||||
SenderNumber: "sender-number2",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSMSConfigsQuery sql err",
|
||||
prepare: prepareSMSConfigsQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
expectedSMSConfigsQuery,
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errors.Is(err, sql.ErrConnDone) {
|
||||
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func Test_SMSConfigPrepare(t *testing.T) {
|
||||
type want struct {
|
||||
sqlExpectations sqlExpectation
|
||||
err checkErr
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
prepare interface{}
|
||||
want want
|
||||
object interface{}
|
||||
}{
|
||||
{
|
||||
name: "prepareSMSConfigQuery no result",
|
||||
prepare: prepareSMSConfigQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueries(
|
||||
expectedSMSConfigQuery,
|
||||
nil,
|
||||
nil,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errs.IsNotFound(err) {
|
||||
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: (*SMSConfig)(nil),
|
||||
},
|
||||
{
|
||||
name: "prepareSMSConfigQuery found",
|
||||
prepare: prepareSMSConfigQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQuery(
|
||||
expectedSMSConfigQuery,
|
||||
smsConfigCols,
|
||||
[]driver.Value{
|
||||
"sms-id",
|
||||
"agg-id",
|
||||
testNow,
|
||||
testNow,
|
||||
"ro",
|
||||
domain.SMSConfigStateInactive,
|
||||
uint64(20211109),
|
||||
// twilio config
|
||||
"sms-id",
|
||||
"sid",
|
||||
&crypto.CryptoValue{},
|
||||
"sender-number",
|
||||
},
|
||||
),
|
||||
},
|
||||
object: &SMSConfig{
|
||||
ID: "sms-id",
|
||||
AggregateID: "agg-id",
|
||||
CreationDate: testNow,
|
||||
ChangeDate: testNow,
|
||||
ResourceOwner: "ro",
|
||||
State: domain.SMSConfigStateInactive,
|
||||
Sequence: 20211109,
|
||||
TwilioConfig: &Twilio{
|
||||
SID: "sid",
|
||||
SenderNumber: "sender-number",
|
||||
Token: &crypto.CryptoValue{},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "prepareSMSConfigQuery sql err",
|
||||
prepare: prepareSMSConfigQuery,
|
||||
want: want{
|
||||
sqlExpectations: mockQueryErr(
|
||||
expectedSMSConfigQuery,
|
||||
sql.ErrConnDone,
|
||||
),
|
||||
err: func(err error) (error, bool) {
|
||||
if !errors.Is(err, sql.ErrConnDone) {
|
||||
return fmt.Errorf("err should be sql.ErrConnDone got: %w", err), false
|
||||
}
|
||||
return nil, true
|
||||
},
|
||||
},
|
||||
object: nil,
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
assertPrepare(t, tt.prepare, tt.object, tt.want.sqlExpectations, tt.want.err)
|
||||
})
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user