Generate presigned URL for email assets at render time

Signed-off-by: Émile Ré <emile@getprobo.com>

pkg/probo/document_service.go

@@ -543,9 +543,10 @@ func (s *DocumentService) SendSigningNotifications(
 					return fmt.Errorf("cannot create signing request token: %w", err)
 				}
 
-				emailPresenter := emails.NewPresenter(s.svc.baseURL, s.svc.emailStaticAssetURLs, people.FullName)
+				emailPresenter := emails.NewPresenter(s.svc.fileManager, s.svc.bucket, s.svc.baseURL, people.FullName)
 
 				subject, textBody, htmlBody, err := emailPresenter.RenderDocumentSigning(
+					ctx,
 					"/documents/signing-requests",
 					token,
 					organization.Name,
@@ -1823,9 +1824,10 @@ func (s *DocumentService) SendExportEmail(
 				return fmt.Errorf("cannot generate download URL: %w", err)
 			}
 
-			emailPresenter := emails.NewPresenter(s.svc.baseURL, s.svc.emailStaticAssetURLs, recipientName)
+			emailPresenter := emails.NewPresenter(s.svc.fileManager, s.svc.bucket, s.svc.baseURL, recipientName)
 
 			subject, textBody, htmlBody, err := emailPresenter.RenderDocumentExport(
+				ctx,
 				downloadURL,
 			)
 			if err != nil {

pkg/probo/framework_service.go

@@ -800,9 +800,10 @@ func (s FrameworkService) SendExportEmail(
 				return fmt.Errorf("cannot generate download URL: %w", err)
 			}
 
-			emailPresenter := emails.NewPresenter(s.svc.baseURL, s.svc.emailStaticAssetURLs, recipientName)
+			emailPresenter := emails.NewPresenter(s.svc.fileManager, s.svc.bucket, s.svc.baseURL, recipientName)
 
 			subject, textBody, htmlBody, err := emailPresenter.RenderFrameworkExport(
+				ctx,
 				downloadURL,
 			)
 			if err != nil {

pkg/probo/service.go

@@ -23,7 +23,6 @@ import (
 	"go.gearno.de/kit/log"
 	"go.gearno.de/kit/pg"
 	"go.gearno.de/x/ref"
-	"go.probo.inc/probo/packages/emails"
 	"go.probo.inc/probo/pkg/agents"
 	"go.probo.inc/probo/pkg/certmanager"
 	"go.probo.inc/probo/pkg/coredata"
@@ -50,19 +49,18 @@ type ExportService interface {
 
 type (
 	Service struct {
-		pg                   *pg.Client
-		s3                   *s3.Client
-		bucket               string
-		encryptionKey        cipher.EncryptionKey
-		baseURL              string
-		tokenSecret          string
-		agentConfig          agents.Config
-		html2pdfConverter    *html2pdf.Converter
-		acmeService          *certmanager.ACMEService
-		fileManager          *filemanager.Service
-		logger               *log.Logger
-		slack                *slack.Service
-		emailStaticAssetURLs emails.StaticAssetURLs
+		pg                *pg.Client
+		s3                *s3.Client
+		bucket            string
+		encryptionKey     cipher.EncryptionKey
+		baseURL           string
+		tokenSecret       string
+		agentConfig       agents.Config
+		html2pdfConverter *html2pdf.Converter
+		acmeService       *certmanager.ACMEService
+		fileManager       *filemanager.Service
+		logger            *log.Logger
+		slack             *slack.Service
 	}
 
 	TenantService struct {
@@ -75,7 +73,6 @@ type (
 		tokenSecret                       string
 		agent                             *agents.Agent
 		fileManager                       *filemanager.Service
-		emailStaticAssetURLs              emails.StaticAssetURLs
 		Frameworks                        *FrameworkService
 		Measures                          *MeasureService
 		Tasks                             *TaskService
@@ -131,7 +128,6 @@ func NewService(
 	logger *log.Logger,
 	slackService *slack.Service,
 	iamService *iam.Service,
-	emailStaticAssetURLs emails.StaticAssetURLs,
 ) (*Service, error) {
 	if bucket == "" {
 		return nil, fmt.Errorf("bucket is required")
@@ -140,19 +136,18 @@ func NewService(
 	iamService.Authorizer.RegisterPolicySet(ProboPolicySet())
 
 	svc := &Service{
-		pg:                   pgClient,
-		s3:                   s3Client,
-		bucket:               bucket,
-		encryptionKey:        encryptionKey,
-		baseURL:              baseURL,
-		tokenSecret:          tokenSecret,
-		agentConfig:          agentConfig,
-		html2pdfConverter:    html2pdfConverter,
-		acmeService:          acmeService,
-		fileManager:          fileManagerService,
-		logger:               logger,
-		slack:                slackService,
-		emailStaticAssetURLs: emailStaticAssetURLs,
+		pg:                pgClient,
+		s3:                s3Client,
+		bucket:            bucket,
+		encryptionKey:     encryptionKey,
+		baseURL:           baseURL,
+		tokenSecret:       tokenSecret,
+		agentConfig:       agentConfig,
+		html2pdfConverter: html2pdfConverter,
+		acmeService:       acmeService,
+		fileManager:       fileManagerService,
+		logger:            logger,
+		slack:             slackService,
 	}
 
 	return svc, nil
@@ -160,16 +155,15 @@ func NewService(
 
 func (s *Service) WithTenant(tenantID gid.TenantID) *TenantService {
 	tenantService := &TenantService{
-		pg:                   s.pg,
-		s3:                   s.s3,
-		bucket:               s.bucket,
-		encryptionKey:        s.encryptionKey,
-		baseURL:              s.baseURL,
-		scope:                coredata.NewScope(tenantID),
-		tokenSecret:          s.tokenSecret,
-		agent:                agents.NewAgent(nil, s.agentConfig),
-		fileManager:          s.fileManager,
-		emailStaticAssetURLs: s.emailStaticAssetURLs,
+		pg:            s.pg,
+		s3:            s.s3,
+		bucket:        s.bucket,
+		encryptionKey: s.encryptionKey,
+		baseURL:       s.baseURL,
+		scope:         coredata.NewScope(tenantID),
+		tokenSecret:   s.tokenSecret,
+		agent:         agents.NewAgent(nil, s.agentConfig),
+		fileManager:   s.fileManager,
 	}
 
 	tenantService.Frameworks = &FrameworkService{

pkg/probo/trust_center_access_service.go

@@ -417,9 +417,9 @@ func (s TrustCenterAccessService) sendAccessEmail(ctx context.Context, tx pg.Con
 		return fmt.Errorf("cannot get compliance page email presenter config: %w", err)
 	}
 
-	emailPresenter := emails.NewPresenterFromConfig(emailPresenterCfg, access.Name)
+	emailPresenter := emails.NewPresenterFromConfig(s.svc.fileManager, emailPresenterCfg, access.Name)
 
-	subject, textBody, htmlBody, err := emailPresenter.RenderTrustCenterAccess(organization.Name)
+	subject, textBody, htmlBody, err := emailPresenter.RenderTrustCenterAccess(ctx, organization.Name)
 	if err != nil {
 		return fmt.Errorf("cannot render trust center access email: %w", err)
 	}

pkg/probo/trust_center_service.go

@@ -609,7 +609,7 @@ func (s *TrustCenterService) EmailPresenterConfig(ctx context.Context, complianc
 		organization      = &coredata.Organization{}
 		customDomain      *coredata.CustomDomain
 		logoFile          = &coredata.File{}
-		emailPresenterCfg = emails.DefaultPresenterConfig(s.svc.baseURL, s.svc.emailStaticAssetURLs)
+		emailPresenterCfg = emails.DefaultPresenterConfig(s.svc.bucket, s.svc.baseURL)
 	)
 
 	scope := coredata.NewScopeFromObjectID(compliancePageID)
@@ -669,13 +669,13 @@ func (s *TrustCenterService) EmailPresenterConfig(ctx context.Context, complianc
 			return emailPresenterCfg, nil
 		}
 
-		presignedURL, err := s.svc.fileManager.GenerateFileUrl(ctx, logoFile, 7*24*time.Hour)
-		if err != nil {
-			return emailPresenterCfg, fmt.Errorf("cannot generate file URL: %w", err)
+		emailPresenterCfg.SenderCompanyLogo = emails.Asset{
+			Name:       logoFile.FileName,
+			ObjectKey:  logoFile.FileKey,
+			BucketName: logoFile.BucketName,
+			MimeType:   logoFile.MimeType,
 		}
 
-		emailPresenterCfg.SenderCompanyLogoURL = presignedURL
-
 		emailPresenterCfg.SenderCompanyName = organization.Name
 
 		if organization.WebsiteURL != nil {