TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-12 01:37:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(notification): get origin from all relevant events and fix nil pointer (#6726)

Browse Source
This commit is contained in:
Livio Spring
2023-10-13 17:45:38 +03:00
committed by GitHub
parent 0af1c65c4c
commit ce719a3fa4
6 changed files with 57 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/notification/types/user_email.go
View File

@@ -33,7 +33,7 @@ func generateEmail(
if err != nil {
return err
}
if emailChannels.Len() == 0 {
if emailChannels == nil || emailChannels.Len() == 0 {
return errors.ThrowPreconditionFailed(nil, "MAIL-83nof", "Errors.Notification.Channels.NotPresent")
}
return emailChannels.HandleMessage(message)

3
internal/notification/types/user_phone.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"github.com/zitadel/logging"
"github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/eventstore"
"github.com/zitadel/zitadel/internal/notification/messages"
@@ -21,7 +22,7 @@ func generateSms(
number := ""
smsChannels, twilioConfig, err := channels.SMS(ctx)
logging.OnError(err).Error("could not create sms channel")
if smsChannels.Len() == 0 {
if smsChannels == nil || smsChannels.Len() == 0 {
return errors.ThrowPreconditionFailed(nil, "PHONE-w8nfow", "Errors.Notification.Channels.NotPresent")
}
if err == nil {