From 46419d479a54ae0851b05d50bc981a991dce7464 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Sat, 29 Jul 2017 13:32:56 -0400
Subject: [PATCH] no click tracking on certain links

---
 .../MailTemplates/OrganizationUserAccepted.text.cshtml     | 2 +-
 src/Core/MailTemplates/OrganizationUserInvited.cshtml      | 2 +-
 src/Core/MailTemplates/VerifyEmail.cshtml                  | 2 +-
 .../Implementations/SendGridMailDeliveryService.cs         | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml b/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml
index 0d645fc09b..0e8772f31f 100644
--- a/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml
+++ b/src/Core/MailTemplates/OrganizationUserAccepted.text.cshtml
@@ -1,4 +1,4 @@
-@model Bit.Core.Models.Mail.OrganizationUserConfirmedViewModel
+@model Bit.Core.Models.Mail.OrganizationUserAcceptedViewModel
 @{
     Layout = "_BasicMailLayout.text";
 }
diff --git a/src/Core/MailTemplates/OrganizationUserInvited.cshtml b/src/Core/MailTemplates/OrganizationUserInvited.cshtml
index 61001f94e4..41121cd8c3 100644
--- a/src/Core/MailTemplates/OrganizationUserInvited.cshtml
+++ b/src/Core/MailTemplates/OrganizationUserInvited.cshtml
@@ -6,7 +6,7 @@
     You have been invited to join the @Model.OrganizationName organization.
     To accept this invite, click the following link:
 </p>
-<p><a href="@Model.Url" target="_blank">@Model.Url</a></p>
+<p><a href="@Model.Url" target="_blank" clicktracking=off>@Model.Url</a></p>
 <p>
     If you do not wish to join this organization, you can safely ignore
     this email.
diff --git a/src/Core/MailTemplates/VerifyEmail.cshtml b/src/Core/MailTemplates/VerifyEmail.cshtml
index 9dcc5847a4..f742eafef0 100644
--- a/src/Core/MailTemplates/VerifyEmail.cshtml
+++ b/src/Core/MailTemplates/VerifyEmail.cshtml
@@ -5,4 +5,4 @@
 <p>
     Verify this email address for your bitwarden account by clicking the following link:
 </p>
-<p><a href="@Model.Url" target="_blank">@Model.Url</a></p>
+<p><a href="@Model.Url" target="_blank" clicktracking=off>@Model.Url</a></p>
diff --git a/src/Core/Services/Implementations/SendGridMailDeliveryService.cs b/src/Core/Services/Implementations/SendGridMailDeliveryService.cs
index 95c75d73ee..96d4814042 100644
--- a/src/Core/Services/Implementations/SendGridMailDeliveryService.cs
+++ b/src/Core/Services/Implementations/SendGridMailDeliveryService.cs
@@ -34,6 +34,13 @@ namespace Bit.Core.Services
                 From = new EmailAddress(_globalSettings.Mail.ReplyToEmail, _globalSettings.SiteName),
                 HtmlContent = message.HtmlContent,
                 PlainTextContent = message.TextContent,
+                TrackingSettings = new TrackingSettings
+                {
+                    ClickTracking = new ClickTracking
+                    {
+                        EnableText = false
+                    }
+                }
             };
 
             sendGridMessage.AddTos(message.ToEmails.Select(e => new EmailAddress(e)).ToList());