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

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

View File

@@ -2,9 +2,10 @@ package handlers
import (
"context"
"fmt"
"net/url"
"github.com/zitadel/logging"
"github.com/zitadel/zitadel/internal/api/authz"
http_utils "github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/errors"
@@ -18,11 +19,13 @@ type OriginEvent interface {
}
func (n *NotificationQueries) Origin(ctx context.Context, e eventstore.Event) (context.Context, error) {
var origin string
originEvent, ok := e.(OriginEvent)
if !ok {
return ctx, errors.ThrowInternal(fmt.Errorf("event of type %T doesn't implement OriginEvent", e), "NOTIF-3m9fs", "Errors.Internal")
logging.Errorf("event of type %T doesn't implement OriginEvent", e)
} else {
origin = originEvent.TriggerOrigin()
}
origin := originEvent.TriggerOrigin()
if origin != "" {
originURL, err := url.Parse(origin)
if err != nil {