Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/email delivery #1575

Merged
merged 2 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 26 additions & 2 deletions backend/flow_api/flow/credential_usage/action_resend_passcode.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@ package credential_usage
import (
"errors"
"fmt"
"github.com/teamhanko/hanko/backend/dto/webhook"
"github.com/teamhanko/hanko/backend/flow_api/flow/shared"
"github.com/teamhanko/hanko/backend/flow_api/services"
"github.com/teamhanko/hanko/backend/flowpilot"
"github.com/teamhanko/hanko/backend/rate_limiter"
"github.com/teamhanko/hanko/backend/webhooks/events"
"github.com/teamhanko/hanko/backend/webhooks/utils"
"time"
)

type ReSendPasscode struct {
Expand Down Expand Up @@ -55,12 +59,32 @@ func (a ReSendPasscode) Execute(c flowpilot.ExecutionContext) error {
EmailAddress: c.Stash().Get(shared.StashPathEmail).String(),
Language: deps.HttpContext.Request().Header.Get("Accept-Language"),
}
passcodeID, err := deps.PasscodeService.SendPasscode(sendParams)
passcodeResult, err := deps.PasscodeService.SendPasscode(sendParams)
if err != nil {
return fmt.Errorf("passcode service failed: %w", err)
}

err = c.Stash().Set(shared.StashPathPasscodeID, passcodeID)
webhookData := webhook.EmailSend{
Subject: passcodeResult.Subject,
BodyPlain: passcodeResult.Body,
ToEmailAddress: sendParams.EmailAddress,
DeliveredByHanko: deps.Cfg.EmailDelivery.Enabled,
AcceptLanguage: sendParams.Language,
Type: webhook.EmailTypePasscode,
Data: webhook.PasscodeData{
ServiceName: deps.Cfg.Service.Name,
OtpCode: passcodeResult.Code,
TTL: deps.Cfg.Email.PasscodeTtl,
ValidUntil: passcodeResult.PasscodeModel.CreatedAt.Add(time.Duration(deps.Cfg.Email.PasscodeTtl) * time.Second).UTC().Unix(),
},
}

err = utils.TriggerWebhooks(deps.HttpContext, events.EmailSend, webhookData)
if err != nil {
return fmt.Errorf("failed to trigger webhook: %w", err)
}

err = c.Stash().Set(shared.StashPathPasscodeID, passcodeResult.PasscodeModel.ID)
if err != nil {
return fmt.Errorf("failed to set passcode_id to stash: %w", err)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ func (h SendPasscode) Execute(c flowpilot.HookExecutionContext) error {
Subject: passcodeResult.Subject,
BodyPlain: passcodeResult.Body,
ToEmailAddress: sendParams.EmailAddress,
DeliveredByHanko: true,
DeliveredByHanko: deps.Cfg.EmailDelivery.Enabled,
AcceptLanguage: sendParams.Language,
Type: webhook.EmailTypePasscode,
Data: webhook.PasscodeData{
Expand Down
8 changes: 5 additions & 3 deletions backend/flow_api/services/passcode.go
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,11 @@ func (s *passcode) SendPasscode(p SendPasscodeParams) (*SendPasscodeResult, erro
return nil, err
}

err = s.emailService.SendEmail(p.EmailAddress, subject, body)
if err != nil {
return nil, err
if s.cfg.EmailDelivery.Enabled {
err = s.emailService.SendEmail(p.EmailAddress, subject, body)
if err != nil {
return nil, err
}
}

return &SendPasscodeResult{
Expand Down
Loading