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

take baseurl if saved on event

Browse Source
This commit is contained in:
Elio Bischof
2023-09-19 11:02:59 +02:00
parent 4bebcd6c0f
commit c4197fef87
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
internal/notification/handlers/origin.go
View File

@@ -2,27 +2,44 @@ package handlers
import ( import (
"context" "context"
"fmt"
"github.com/zitadel/zitadel/internal/api/authz" "github.com/zitadel/zitadel/internal/api/authz"
"github.com/zitadel/zitadel/internal/eventstore"
http_utils "github.com/zitadel/zitadel/internal/api/http" http_utils "github.com/zitadel/zitadel/internal/api/http"
"github.com/zitadel/zitadel/internal/errors" "github.com/zitadel/zitadel/internal/errors"
"github.com/zitadel/zitadel/internal/query" "github.com/zitadel/zitadel/internal/query"
) )
func (n *NotificationQueries) Origin(ctx context.Context) (context.Context, string, error) { type BaseURLEvent interface {
eventstore.Event
GetBaseURL() string
}
func (n *NotificationQueries) Origin(ctx context.Context, e eventstore.Event) (string, error) {
baseURLEvent, ok := e.(BaseURLEvent)
if !ok {
return "", errors.ThrowInternal(fmt.Errorf("event of type %T doesn't implement BaseURLEvent", e), "NOTIF-3m9fs", "Errors.Internal")
}
baseURL := baseURLEvent.GetBaseURL()
if baseURL != "" {
return baseURL, nil
}
primary, err := query.NewInstanceDomainPrimarySearchQuery(true) primary, err := query.NewInstanceDomainPrimarySearchQuery(true)
if err != nil { if err != nil {
return ctx, "", err return "", err
} }
domains, err := n.SearchInstanceDomains(ctx, &query.InstanceDomainSearchQueries{ domains, err := n.SearchInstanceDomains(ctx, &query.InstanceDomainSearchQueries{
Queries: []query.SearchQuery{primary}, Queries: []query.SearchQuery{primary},
}) })
if err != nil { if err != nil {
return ctx, "", err return "", err
} }
if len(domains.Domains) < 1 { if len(domains.Domains) < 1 {
return ctx, "", errors.ThrowInternal(nil, "NOTIF-Ef3r1", "Errors.Notification.NoDomain") return "", errors.ThrowInternal(nil, "NOTIF-Ef3r1", "Errors.Notification.NoDomain")
} }
ctx = authz.WithRequestedDomain(ctx, domains.Domains[0].Domain) ctx = authz.WithRequestedDomain(ctx, domains.Domains[0].Domain)
return ctx, http_utils.BuildHTTP(domains.Domains[0].Domain, n.externalPort, n.externalSecure), nil return http_utils.BuildHTTP(domains.Domains[0].Domain, n.externalPort, n.externalSecure), nil
} }

27
internal/notification/handlers/user_notifier.go
View File

@@ -177,8 +177,7 @@ func (u *userNotifier) reduceInitCodeAdded(event eventstore.Event) (*handler.Sta
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -247,8 +246,7 @@ func (u *userNotifier) reduceEmailCodeAdded(event eventstore.Event) (*handler.St
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -316,8 +314,7 @@ func (u *userNotifier) reducePasswordCodeAdded(event eventstore.Event) (*handler
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -437,8 +434,7 @@ func (u *userNotifier) reduceOTPSMS(
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, event)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -568,8 +564,7 @@ func (u *userNotifier) reduceOTPEmail(
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, event)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -634,8 +629,7 @@ func (u *userNotifier) reduceDomainClaimed(event eventstore.Event) (*handler.Sta
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -701,8 +695,7 @@ func (u *userNotifier) reducePasswordlessCodeRequested(event eventstore.Event) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -771,8 +764,7 @@ func (u *userNotifier) reducePasswordChanged(event eventstore.Event) (*handler.S
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -836,8 +828,7 @@ func (u *userNotifier) reducePhoneCodeAdded(event eventstore.Event) (*handler.St
if err != nil { if err != nil {
return nil, err return nil, err
} }
origin, err := u.queries.Origin(ctx, e)
ctx, origin, err := u.queries.Origin(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }