π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[server] Send email after every Legacy kit creation (#13925)
Aman Raj112665028d0a
diff --git a/server/mail-templates/legacy/kit_created.html b/server/mail-templates/legacy/kit_created.htmlnew file mode 100644index 0000000000..e9e5c369f4--- /dev/null+++ b/server/mail-templates/legacy/kit_created.html@@ -0,0 +1,43 @@+{{define "legacy_styles"}}{{template "legacy_kit_styles" .}}{{end}}+{{define "legacy_card"}}{{template "legacy_kit_card" .}}{{end}}++{{define "content"}}+<div+ aria-hidden="true"+ style="display: none; max-height: 0; overflow: hidden; mso-hide: all"+>+ Keep your three recovery sheets separate.+</div>+<h1+ style="+ margin: 24px 0;+ font-size: 30px;+ font-weight: 700;+ line-height: 1.2;+ letter-spacing: -1px;+ text-align: center;+ "+>+ Your Legacy kit<br />was created+</h1>+<p style="margin: 0 0 18px; color: #555555; font-size: 17px; line-height: 1.55">+ Each kit has three recovery sheets. Any two can recover your Ente account.+</p>+<p style="margin: 0 0 18px; color: #555555; font-size: 17px; line-height: 1.55">+ Keep each sheet in a different safe place or with a different person you+ trust.+</p>+<p+ style="+ margin: 22px 0 0;+ padding-top: 8px;+ color: #555555;+ font-size: 14px;+ line-height: 1.55;+ text-align: center;+ "+>+ Need help? Contact+ <a href="mailto:[email protected]" style="color: #087d2c">[email protected]</a>.+</p>+{{end}}diff --git a/server/mail-templates/legacy/kit_recovery_completed.html b/server/mail-templates/legacy/kit_recovery_completed.htmlindex ccb32076f2..043a024c1d 100644--- a/server/mail-templates/legacy/kit_recovery_completed.html+++ b/server/mail-templates/legacy/kit_recovery_completed.html@@ -1,3 +1,6 @@+{{define "legacy_styles"}}{{template "legacy_kit_styles" .}}{{end}}+{{define "legacy_card"}}{{template "legacy_kit_card" .}}{{end}}+{{define "content"}}<p>Hello,</p>diff --git a/server/mail-templates/legacy/kit_recovery_started.html b/server/mail-templates/legacy/kit_recovery_started.htmlindex 35d6b637c2..2f04d1db61 100644--- a/server/mail-templates/legacy/kit_recovery_started.html+++ b/server/mail-templates/legacy/kit_recovery_started.html@@ -1,3 +1,6 @@+{{define "legacy_styles"}}{{template "legacy_kit_styles" .}}{{end}}+{{define "legacy_card"}}{{template "legacy_kit_card" .}}{{end}}+{{define "content"}}<p>Hello,</p>diff --git a/server/mail-templates/legacy/legacy_base.html b/server/mail-templates/legacy/legacy_base.htmlindex 3be84677df..1bb069f563 100644--- a/server/mail-templates/legacy/legacy_base.html+++ b/server/mail-templates/legacy/legacy_base.html@@ -94,9 +94,11 @@width: 24px !important;}</style>+{{block "legacy_styles" .}}{{end}}<body><div class="gutter" style="padding: 4px"> </div>+{{block "legacy_card" .}}<div class="wrap" style=" background-color: rgb(255, 255, 255); padding: 2px30px 30px 30px; max-width: 525px; margin: 0 auto; border-radius: 5px;font-size: 16px; " >@@ -104,6 +106,7 @@{{block "content" .}} Default Content {{end}}</main></div>+{{end}}<br /><div class="footer" style="text-align: center; font-size: 12px; color:rgb(136, 136, 136)" >@@ -141,3 +144,32 @@</html>{{end}}+{{define "legacy_kit_styles"}}+<style>+ body {+ background-color: #ffffff;+ color: #161616;+ }++ a {+ color: #087d2c;+ }+</style>+{{end}}++{{define "legacy_kit_card"}}+<div+ class="wrap"+ style="+ background-color: #fcfcfc;+ border: 1px solid #f0f0f0;+ padding: 2px 30px 30px;+ max-width: 525px;+ margin: 0 auto;+ border-radius: 36px;+ font-size: 16px;+ "+>+ <main>{{template "content" .}}</main>+</div>+{{end}}diff --git a/server/pkg/controller/legacy_kit/controller.go b/server/pkg/controller/legacy_kit/controller.goindex 7e30b81892..92765a4d86 100644--- a/server/pkg/controller/legacy_kit/controller.go+++ b/server/pkg/controller/legacy_kit/controller.go@@ -57,6 +57,7 @@ func (c *Controller) CreateKit(ctx *gin.Context, userID int64, req ente.CreateLeif err := c.Repo.CreateKitWithLimit(ctx, userID, req, maxActiveLegacyKits); err != nil {return nil, err}+ go c.sendKitCreatedNotification(userID)row, err := c.Repo.GetKitForOwner(ctx, userID, req.ID)if err != nil {return nil, errdiff --git a/server/pkg/controller/legacy_kit/email.go b/server/pkg/controller/legacy_kit/email.goindex 4f796000fa..0b58821bd9 100644--- a/server/pkg/controller/legacy_kit/email.go+++ b/server/pkg/controller/legacy_kit/email.go@@ -12,10 +12,32 @@ import (const (legacyKitBaseTemplate = "legacy/legacy_base.html"+ legacyKitCreatedTemplate = "legacy/kit_created.html"legacyKitRecoveryStartedTemplate = "legacy/kit_recovery_started.html"legacyKitRecoveryCompletedTemplate = "legacy/kit_recovery_completed.html")+func (c *Controller) sendKitCreatedNotification(userID int64) {+ logger := log.WithField("user_id", userID)+ user, err := c.UserRepo.Get(userID)+ if err != nil {+ logger.WithError(err).Error("failed to load legacy kit owner for creation email")+ return+ }+ if err := email.SendTemplatedEmailV2(+ []string{user.Email},+ "Ente",+ "[email protected]",+ "Your Legacy kit was created",+ legacyKitBaseTemplate,+ legacyKitCreatedTemplate,+ nil,+ nil,+ ); err != nil {+ logger.WithError(err).Error("failed to send legacy kit creation email")+ }+}+func (c *Controller) sendRecoveryStartedNotification(ctx context.Context, userID int64, session *legacykitrepo.RecoverySessionRow, beneficiaryEmail *string) error {user, err := c.UserRepo.Get(userID)if err != nil {