Improve encrypt & send flow

server/form.go

@@ -23,13 +23,19 @@ func (h *Handler) RenderForm(ctx echo.Context) error {
 	}
 
 	if formData.Message.IsValid {
-		formData.EncryptAndSend(
+		errCh := formData.EncryptAndSend(
 			h.Mailer,
 			h.WebhookHandler,
 			h.EncryptionProvider,
 			h.Config.Inbox.Path,
 		)
 
+		go func() {
+			if err := <-errCh; err != nil {
+				log.Err(err).Msg("message delivery failed")
+			}
+		}()
+
 		formData.Note = "Wonderful! Your message is scheduled for delivery."
 		formData.NoteKind = form.SuccessNote
 	}

server/form/form.go

@@ -64,24 +64,34 @@ func (f *FormData) EncryptAndSend(
 	webhookHandler mailer.Mailer,
 	encryptionProvider enc.KeyLike,
 	inboxPath string,
-) {
-	// FIXME: find a better way to do this
+) <-chan error {
 	subject := f.Message.Subject
 	content := f.Message.Content
 	hash := f.Message.Hash()
 
-	go (func() {
+	done := make(chan error, 1)
+
+	go func(subject, content, hash string) {
 		encrypted, err := encryptionProvider.Encrypt(content)
 		if err != nil {
-			log.Err(err).Msg("Encryption failed")
+			log.Err(err).Msg("encryption failed")
+			done <- fmt.Errorf("encrypt message: %w", err)
+			return
+		}
+
+		msg := mailer.NewMessage(subject, encrypted, hash)
+		if err := mailer.SendMessage(msg, sender, webhookHandler, inboxPath); err != nil {
+			log.Err(err).Msg("send message failed")
+			done <- err
+			return
 		}
 
-		message := mailer.NewMessage(subject, encrypted, hash)
-		mailer.SendMessage(message, sender, webhookHandler, inboxPath)
-	})()
+		done <- nil
+	}(subject, content, hash)
 
 	// when done reset the form
 	f.Message = MessageForm{}
+	return done
 }
 
 func GetFormData(csrfToken string, config *config.Config) *FormData {

server/form/form_test.go

@@ -0,0 +1,62 @@
+package form
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/sultaniman/kpow/server/enc"
+	"github.com/sultaniman/kpow/server/mailer"
+	"go.uber.org/mock/gomock"
+)
+
+func TestEncryptAndSend_EncryptionError(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	key := enc.NewMockKeyLike(ctrl)
+	key.EXPECT().Encrypt("body").Return("", errors.New("boom"))
+
+	fd := &FormData{Message: MessageForm{Subject: "sub", Content: "body"}}
+
+	errCh := fd.EncryptAndSend(nil, nil, key, t.TempDir())
+	err := <-errCh
+	assert.Error(t, err)
+	assert.Equal(t, MessageForm{}, fd.Message)
+}
+
+func TestEncryptAndSend_SendError(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	key := enc.NewMockKeyLike(ctrl)
+	key.EXPECT().Encrypt("body").Return("cipher", nil)
+
+	mail := mailer.NewMockMailer(ctrl)
+	mail.EXPECT().Send(gomock.Any()).Return(errors.New("boom"))
+
+	fd := &FormData{Message: MessageForm{Subject: "sub", Content: "body"}}
+
+	errCh := fd.EncryptAndSend(mail, nil, key, t.TempDir())
+	err := <-errCh
+	assert.Error(t, err)
+	assert.Equal(t, MessageForm{}, fd.Message)
+}
+
+func TestEncryptAndSend_Success(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	key := enc.NewMockKeyLike(ctrl)
+	key.EXPECT().Encrypt("body").Return("cipher", nil)
+
+	mail := mailer.NewMockMailer(ctrl)
+	mail.EXPECT().Send(gomock.Any()).Return(nil)
+
+	fd := &FormData{Message: MessageForm{Subject: "sub", Content: "body"}}
+
+	errCh := fd.EncryptAndSend(mail, nil, key, t.TempDir())
+	err := <-errCh
+	assert.NoError(t, err)
+	assert.Equal(t, MessageForm{}, fd.Message)
+}