Merge pull request #46 from DarkRockMountain/fix/microsoft365-attachm…

…ent-encoding fix(microsoft365): correct attachment encoding to use raw content
darkrockmountain · Jul 4, 2024 · 2f19ba7 · 2f19ba7
2 parents 25ac46a + 87ccbb6
commit 2f19ba7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/providers/microsoft365/microsoft365_email_sender.go b/providers/microsoft365/microsoft365_email_sender.go
@@ -139,7 +139,7 @@ func composeMsMessage(message *gomail.EmailMessage) *models.Message {
 		for i, attachment := range attachments {
 			fileAttachment := models.NewFileAttachment()
 			fileAttachment.SetName(common.StrPtr(attachment.GetFilename()))
-			fileAttachment.SetContentBytes([]byte(attachment.GetBase64StringContent()))
+			fileAttachment.SetContentBytes(attachment.GetRawContent())
 			msAttachments[i] = fileAttachment
 		}
 		msMessage.SetAttachments(msAttachments)

diff --git a/providers/microsoft365/microsoft365_email_sender_test.go b/providers/microsoft365/microsoft365_email_sender_test.go
@@ -3,7 +3,6 @@ package microsoft365
 import (
 	"bytes"
 	"context"
-	"encoding/base64"
 	"fmt"
 	"net/http"
 	"testing"
@@ -185,7 +184,7 @@ func TestComposeMessage_WithAttachments(t *testing.T) {
 
 	msMessage := composeMsMessage(message)
 
-	attachmentBase64 := []byte(base64.StdEncoding.EncodeToString([]byte("test_attachment_content")))
+	attachmentBase64 := []byte("test_attachment_content")
 
 	assert.NotNil(t, msMessage)
 	assert.Equal(t, "test.txt", *msMessage.GetAttachments()[0].(*models.FileAttachment).GetName())
@@ -286,7 +285,7 @@ func TestComposeMessage_LargeAttachment(t *testing.T) {
 
 	assert.NotNil(t, msMessage)
 	assert.Equal(t, "large.txt", *msMessage.GetAttachments()[0].(*models.FileAttachment).GetName())
-	assert.True(t, bytes.Equal(attachment.GetBase64Content(), msMessage.GetAttachments()[0].(*models.FileAttachment).GetContentBytes()), "Attachment do not match")
+	assert.True(t, bytes.Equal(attachment.GetRawContent(), msMessage.GetAttachments()[0].(*models.FileAttachment).GetContentBytes()), "Attachment do not match")
 }
 
 func TestComposeMessage_MultipleAttachments(t *testing.T) {
@@ -304,9 +303,9 @@ func TestComposeMessage_MultipleAttachments(t *testing.T) {
 
 	assert.NotNil(t, msMessage)
 	assert.Equal(t, "test1.txt", *msMessage.GetAttachments()[0].(*models.FileAttachment).GetName())
-	assert.Equal(t, attachment1.GetBase64Content(), msMessage.GetAttachments()[0].(*models.FileAttachment).GetContentBytes())
+	assert.Equal(t, attachment1.GetRawContent(), msMessage.GetAttachments()[0].(*models.FileAttachment).GetContentBytes())
 	assert.Equal(t, "test2.txt", *msMessage.GetAttachments()[1].(*models.FileAttachment).GetName())
-	assert.Equal(t, attachment2.GetBase64Content(), msMessage.GetAttachments()[1].(*models.FileAttachment).GetContentBytes())
+	assert.Equal(t, attachment2.GetRawContent(), msMessage.GetAttachments()[1].(*models.FileAttachment).GetContentBytes())
 }
 
 func TestComposeMessage_MissingFields(t *testing.T) {