fix: use triggering origin for notification links (#6628)

* take baseurl if saved on event * refactor: make es mocks reusable * Revert "refactor: make es mocks reusable" This reverts commit 434ce12a6a. * make messages testable * test asset url * fmt * fmt * simplify notification.Start * test url combinations * support init code added * support password changed * support reset pw * support user domain claimed * support add pwless login * support verify phone * Revert "support verify phone" This reverts commit e40503303e. * save trigger origin from ctx * add ready for review check * camel * test email otp * fix variable naming * fix DefaultOTPEmailURLV2 * Revert "fix DefaultOTPEmailURLV2" This reverts commit fa34d4d2a8. * fix email otp challenged test * fix email otp challenged test * pass origin in login and gateway requests * take origin from header * take x-forwarded if present * Update internal/notification/handlers/queries.go Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> * Update internal/notification/handlers/commands.go Co-authored-by: Tim Möhlmann <tim+github@zitadel.com> * move origin header to ctx if available * generate * cleanup * use forwarded header * support X-Forwarded-* headers * standardize context handling * fix linting --------- Co-authored-by: Tim Möhlmann <tim+github@zitadel.com>
2025-08-11 19:07:30 +00:00 · 2023-10-10 15:20:53 +02:00
parent 0180779d6d
commit 8f6cb47567
47 changed files with 2405 additions and 508 deletions
--- a/internal/notification/channels.go
+++ b/internal/notification/channels.go
@@ -0,0 +1,106 @@
+package notification
+
+import (
+	"context"
+
+	"github.com/zitadel/logging"
+
+	"github.com/zitadel/zitadel/internal/notification/channels/smtp"
+	"github.com/zitadel/zitadel/internal/notification/channels/twilio"
+	"github.com/zitadel/zitadel/internal/notification/channels/webhook"
+	"github.com/zitadel/zitadel/internal/notification/handlers"
+	"github.com/zitadel/zitadel/internal/notification/senders"
+	"github.com/zitadel/zitadel/internal/notification/types"
+	"github.com/zitadel/zitadel/internal/telemetry/metrics"
+)
+
+var _ types.ChannelChains = (*channels)(nil)
+
+type counters struct {
+	success deliveryMetrics
+	failed  deliveryMetrics
+}
+
+type deliveryMetrics struct {
+	email string
+	sms   string
+	json  string
+}
+
+type channels struct {
+	q        *handlers.NotificationQueries
+	counters counters
+}
+
+func newChannels(q *handlers.NotificationQueries) *channels {
+	c := &channels{
+		q: q,
+		counters: counters{
+			success: deliveryMetrics{
+				email: "successful_deliveries_email",
+				sms:   "successful_deliveries_sms",
+				json:  "successful_deliveries_json",
+			},
+			failed: deliveryMetrics{
+				email: "failed_deliveries_email",
+				sms:   "failed_deliveries_sms",
+				json:  "failed_deliveries_json",
+			},
+		},
+	}
+	registerCounter(c.counters.success.email, "Successfully delivered emails")
+	registerCounter(c.counters.failed.email, "Failed email deliveries")
+	registerCounter(c.counters.success.sms, "Successfully delivered SMS")
+	registerCounter(c.counters.failed.sms, "Failed SMS deliveries")
+	registerCounter(c.counters.success.json, "Successfully delivered JSON messages")
+	registerCounter(c.counters.failed.json, "Failed JSON message deliveries")
+	return c
+}
+
+func registerCounter(counter, desc string) {
+	err := metrics.RegisterCounter(counter, desc)
+	logging.WithFields("metric", counter).OnError(err).Panic("unable to register counter")
+}
+
+func (c *channels) Email(ctx context.Context) (*senders.Chain, *smtp.Config, error) {
+	smtpCfg, err := c.q.GetSMTPConfig(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+	chain, err := senders.EmailChannels(
+		ctx,
+		smtpCfg,
+		c.q.GetFileSystemProvider,
+		c.q.GetLogProvider,
+		c.counters.success.email,
+		c.counters.failed.email,
+	)
+	return chain, smtpCfg, err
+}
+
+func (c *channels) SMS(ctx context.Context) (*senders.Chain, *twilio.Config, error) {
+	twilioCfg, err := c.q.GetTwilioConfig(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+	chain, err := senders.SMSChannels(
+		ctx,
+		twilioCfg,
+		c.q.GetFileSystemProvider,
+		c.q.GetLogProvider,
+		c.counters.success.sms,
+		c.counters.failed.sms,
+	)
+	return chain, twilioCfg, err
+}
+
+func (c *channels) Webhook(ctx context.Context, cfg webhook.Config) (*senders.Chain, error) {
+	return senders.WebhookChannels(
+		ctx,
+		cfg,
+		c.q.GetFileSystemProvider,
+		c.q.GetLogProvider,
+		c.counters.success.json,
+		c.counters.failed.json,
+	)
+}