mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-12 11:04:25 +00:00
d229da6af7
* feat: smtp templates poc * feat: add isActive & ProviderType to SMTP backend * feat: change providertype to uint32 and fix tests * feat: minimal smtp provider component * feat: woking on diiferent providers * feat: keep working on providers * feat: initial stepper for new provider * fix: settings list and working on stepper * feat: step 1 and 2 form inputs * feat: starter for smtp test step * fix: misspelled SMPT * fix: remove tests for now * feat: add tls toggle remove old google provider * feat: working on add smtp and table * fix: duplicated identifiers * fix: settings list * fix: add missing smtp config properties * fix: add configID to smtp config table * fix: working on listproviders * feat: working in listSMTPConfigs * fix: add count to listsmtpconfigs * fix: getting empty results from listSMTPConfigs * feat: table now shows real data * fix: remaining styles for smtp-table * fix: remove old notification-smtp-provider-component * feat: delete smtp configuration * feat: deactivate smtp config * feat: replace isActive with state for smtp config * feat: activate smtp config * fix: remaining errors after main merge * fix: list smtp providers panic and material mdc * feat: refactor to only one provider component * feat: current provider details view * fix: refactor AddSMTPConfig and ChangeSMTPConfig * fix: smtp config reduce issue * fix: recover domain in NewIAMSMTPConfigWriteModel * fix: add code needed by SetUpInstance * fix: go tests and warn about passing context to InstanceAggregateFromWriteModel * fix: i18n and add missing trans for fr, it, zh * fix: add e2e tests * docs: add smtp templates * fix: remove provider_type, add description * fix: remaining error from merge main * fix: add @stebenz change for primary key * fix: inactive placed after removed to prevent deleted configs to show as inactive * fix: smtp provider id can be empty (migrated) * feat: add mailchimp transactional template * feat: add Brevo (Sendinblue) template * feat: change brevo logo, add color to tls icon * fix: queries use resourceowner, id must not be empty * fix: deal with old smtp settings and tests * fix: resourceOwner is the instanceID * fix: remove aggregate_id, rename SMTPConfigByAggregateID with SMTPConfigActive * fix: add tests for multiple configs with different IDs * fix: conflict * fix: remove notification-smtp-provider * fix: add @peintnermax suggestions, rename module and fix e2e tests * fix: remove material legacy modules * fix: remove ctx as parameter for InstanceAggregateFromWriteModel * fix: add Id to SMTPConfigToPb * fix: change InstanceAggregateFromWriteModel to avoid linter errors * fix import * rm unused package-lock * update yarn lock --------- Co-authored-by: Elio Bischof <elio@zitadel.com> Co-authored-by: Max Peintner <max@caos.ch> Co-authored-by: Stefan Benz <46600784+stebenz@users.noreply.github.com>
230 lines
5.4 KiB
Go
230 lines
5.4 KiB
Go
package query
|
|
|
|
import (
|
|
"database/sql"
|
|
"database/sql/driver"
|
|
"errors"
|
|
"fmt"
|
|
"regexp"
|
|
"testing"
|
|
|
|
"github.com/zitadel/zitadel/internal/crypto"
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
"github.com/zitadel/zitadel/internal/zerrors"
|
|
)
|
|
|
|
var (
|
|
prepareSMTPConfigStmt = `SELECT projections.smtp_configs2.creation_date,` +
|
|
` projections.smtp_configs2.change_date,` +
|
|
` projections.smtp_configs2.resource_owner,` +
|
|
` projections.smtp_configs2.sequence,` +
|
|
` projections.smtp_configs2.tls,` +
|
|
` projections.smtp_configs2.sender_address,` +
|
|
` projections.smtp_configs2.sender_name,` +
|
|
` projections.smtp_configs2.reply_to_address,` +
|
|
` projections.smtp_configs2.host,` +
|
|
` projections.smtp_configs2.username,` +
|
|
` projections.smtp_configs2.password,` +
|
|
` projections.smtp_configs2.id,` +
|
|
` projections.smtp_configs2.state,` +
|
|
` projections.smtp_configs2.description` +
|
|
` FROM projections.smtp_configs2` +
|
|
` AS OF SYSTEM TIME '-1 ms'`
|
|
prepareSMTPConfigCols = []string{
|
|
"creation_date",
|
|
"change_date",
|
|
"resource_owner",
|
|
"sequence",
|
|
"tls",
|
|
"sender_address",
|
|
"sender_name",
|
|
"reply_to_address",
|
|
"smtp_host",
|
|
"smtp_user",
|
|
"smtp_password",
|
|
"id",
|
|
"state",
|
|
"description",
|
|
}
|
|
)
|
|
|
|
func Test_SMTPConfigsPrepares(t *testing.T) {
|
|
type want struct {
|
|
sqlExpectations sqlExpectation
|
|
err checkErr
|
|
}
|
|
tests := []struct {
|
|
name string
|
|
prepare interface{}
|
|
want want
|
|
object interface{}
|
|
}{
|
|
{
|
|
name: "prepareSMTPConfigQuery no result",
|
|
prepare: prepareSMTPConfigQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueriesScanErr(
|
|
prepareSMTPConfigStmt,
|
|
nil,
|
|
nil,
|
|
),
|
|
err: func(err error) (error, bool) {
|
|
if !zerrors.IsNotFound(err) {
|
|
return fmt.Errorf("err should be zitadel.NotFoundError got: %w", err), false
|
|
}
|
|
return nil, true
|
|
},
|
|
},
|
|
object: (*SMTPConfig)(nil),
|
|
},
|
|
{
|
|
name: "prepareSMTPConfigQuery found",
|
|
prepare: prepareSMTPConfigQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
regexp.QuoteMeta(prepareSMTPConfigStmt),
|
|
prepareSMTPConfigCols,
|
|
[]driver.Value{
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211108),
|
|
true,
|
|
"sender",
|
|
"name",
|
|
"reply-to",
|
|
"host",
|
|
"user",
|
|
&crypto.CryptoValue{},
|
|
"2232323",
|
|
domain.SMTPConfigStateActive,
|
|
"test",
|
|
},
|
|
),
|
|
},
|
|
object: &SMTPConfig{
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211108,
|
|
TLS: true,
|
|
SenderAddress: "sender",
|
|
SenderName: "name",
|
|
ReplyToAddress: "reply-to",
|
|
Host: "host",
|
|
User: "user",
|
|
Password: &crypto.CryptoValue{},
|
|
ID: "2232323",
|
|
State: domain.SMTPConfigStateActive,
|
|
Description: "test",
|
|
},
|
|
},
|
|
{
|
|
name: "prepareSMTPConfigQuery another config found",
|
|
prepare: prepareSMTPConfigQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
regexp.QuoteMeta(prepareSMTPConfigStmt),
|
|
prepareSMTPConfigCols,
|
|
[]driver.Value{
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
true,
|
|
"sender2",
|
|
"name2",
|
|
"reply-to2",
|
|
"host2",
|
|
"user2",
|
|
&crypto.CryptoValue{},
|
|
"44442323",
|
|
domain.SMTPConfigStateInactive,
|
|
"test2",
|
|
},
|
|
),
|
|
},
|
|
object: &SMTPConfig{
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
TLS: true,
|
|
SenderAddress: "sender2",
|
|
SenderName: "name2",
|
|
ReplyToAddress: "reply-to2",
|
|
Host: "host2",
|
|
User: "user2",
|
|
Password: &crypto.CryptoValue{},
|
|
ID: "44442323",
|
|
State: domain.SMTPConfigStateInactive,
|
|
Description: "test2",
|
|
},
|
|
},
|
|
{
|
|
name: "prepareSMTPConfigQuery yet another config found",
|
|
prepare: prepareSMTPConfigQuery,
|
|
want: want{
|
|
sqlExpectations: mockQuery(
|
|
regexp.QuoteMeta(prepareSMTPConfigStmt),
|
|
prepareSMTPConfigCols,
|
|
[]driver.Value{
|
|
testNow,
|
|
testNow,
|
|
"ro",
|
|
uint64(20211109),
|
|
true,
|
|
"sender3",
|
|
"name3",
|
|
"reply-to3",
|
|
"host3",
|
|
"user3",
|
|
&crypto.CryptoValue{},
|
|
"23234444",
|
|
domain.SMTPConfigStateInactive,
|
|
"test3",
|
|
},
|
|
),
|
|
},
|
|
object: &SMTPConfig{
|
|
CreationDate: testNow,
|
|
ChangeDate: testNow,
|
|
ResourceOwner: "ro",
|
|
Sequence: 20211109,
|
|
TLS: true,
|
|
SenderAddress: "sender3",
|
|
SenderName: "name3",
|
|
ReplyToAddress: "reply-to3",
|
|
Host: "host3",
|
|
User: "user3",
|
|
Password: &crypto.CryptoValue{},
|
|
ID: "23234444",
|
|
State: domain.SMTPConfigStateInactive,
|
|
Description: "test3",
|
|
},
|
|
},
|
|
{
|
|
name: "prepareSMTPConfigQuery sql err",
|
|
prepare: prepareSMTPConfigQuery,
|
|
want: want{
|
|
sqlExpectations: mockQueryErr(
|
|
regexp.QuoteMeta(prepareSMTPConfigStmt),
|
|
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: (*SMTPConfig)(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, defaultPrepareArgs...)
|
|
})
|
|
}
|
|
}
|