From d9ce042dfff97ed76654d42e0c806b5264a3b5fa Mon Sep 17 00:00:00 2001
From: Ankur Singh <hello@anks.in>
Date: Mon, 31 Jul 2023 08:18:29 +0200
Subject: [PATCH] handle email invitation urls in outlook clients properly
 (#1671)

Co-authored-by: Ankur Singh <ankur.singh@epfl.ch>
---
 apiserver/templates/emails/auth/magic_signin.html      | 10 +++++-----
 .../emails/invitations/project_invitation.html         | 10 +++++-----
 .../emails/invitations/workspace_invitation.html       | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apiserver/templates/emails/auth/magic_signin.html b/apiserver/templates/emails/auth/magic_signin.html
index bc7ed12aa..63fbe5e32 100644
--- a/apiserver/templates/emails/auth/magic_signin.html
+++ b/apiserver/templates/emails/auth/magic_signin.html
@@ -89,8 +89,8 @@
                                                                         </tr>
                                                                         <tr>
                                                                            <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5;">
-                                                                              <!--[if mso]> 
-                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://app.plane.so/" style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
+                                                                              <!--[if mso]>
+                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href={{magic_url}} style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
                                                                                  <w:anchorlock/>
                                                                                  <div style="display:none;">
                                                                                     <center class="default-button">
@@ -98,11 +98,11 @@
                                                                                     </center>
                                                                                  </div>
                                                                               </v:roundrect>
-                                                                              <![endif]-->  <!--[if !mso]><!-- --> 
+                                                                              <![endif]-->  <!--[if !mso]><!-- -->
                                                                               <a href={{magic_url}} class="r16-r default-button" target="_blank" data-btn="1" style="font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; border-style: solid; word-wrap: break-word; display: inline-block; -webkit-text-size-adjust: none; mso-hide: all; background-color: #ffffff; border-color: #3f76ff; border-radius: 4px; border-width: 1px; color: #ffffff; font-family: arial,helvetica,sans-serif; font-size: 16px; height: 18px; padding-bottom: 7px; padding-left: 20px; padding-right: 20px; padding-top: 7px; width: 258px;">
                                                                                  <p style="margin: 0;"><span style="color: #3F76FF; font-size: 14px;">Open Plane</span></p>
                                                                               </a>
-                                                                              <!--<![endif]--> 
+                                                                              <!--<![endif]-->
                                                                            </td>
                                                                         </tr>
                                                                         <tr class="nl2go-responsive-hide">
@@ -364,4 +364,4 @@
          </tr>
       </table>
    </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/apiserver/templates/emails/invitations/project_invitation.html b/apiserver/templates/emails/invitations/project_invitation.html
index beca6a735..ea2f1cdcf 100644
--- a/apiserver/templates/emails/invitations/project_invitation.html
+++ b/apiserver/templates/emails/invitations/project_invitation.html
@@ -90,8 +90,8 @@
                                                                         </tr>
                                                                         <tr>
                                                                            <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5;">
-                                                                              <!--[if mso]> 
-                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://app.plane.so/" style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
+                                                                              <!--[if mso]>
+                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href={{invitation_url}} style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
                                                                                  <w:anchorlock/>
                                                                                  <div style="display:none;">
                                                                                     <center class="default-button">
@@ -99,11 +99,11 @@
                                                                                     </center>
                                                                                  </div>
                                                                               </v:roundrect>
-                                                                              <![endif]-->  <!--[if !mso]><!-- --> 
+                                                                              <![endif]-->  <!--[if !mso]><!-- -->
                                                                               <a href={{invitation_url}} class="r16-r default-button" target="_blank" data-btn="1" style="font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; border-style: solid; word-wrap: break-word; display: inline-block; -webkit-text-size-adjust: none; mso-hide: all; background-color: #ffffff; border-color: #3f76ff; border-radius: 4px; border-width: 1px; color: #ffffff; font-family: arial,helvetica,sans-serif; font-size: 16px; height: 18px; padding-bottom: 7px; padding-left: 20px; padding-right: 20px; padding-top: 7px; width: 258px;">
                                                                                  <p style="margin: 0;"><span style="color: #3F76FF;">Accept the invite</span></p>
                                                                               </a>
-                                                                              <!--<![endif]--> 
+                                                                              <!--<![endif]-->
                                                                            </td>
                                                                         </tr>
                                                                         <tr class="nl2go-responsive-hide">
@@ -346,4 +346,4 @@
          </tr>
       </table>
    </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/apiserver/templates/emails/invitations/workspace_invitation.html b/apiserver/templates/emails/invitations/workspace_invitation.html
index 4d7f90a16..2384aa18d 100644
--- a/apiserver/templates/emails/invitations/workspace_invitation.html
+++ b/apiserver/templates/emails/invitations/workspace_invitation.html
@@ -90,8 +90,8 @@
                                                                         </tr>
                                                                         <tr>
                                                                            <td height="18" align="center" valign="top" class="r15-i nl2go-default-textstyle" style="color: #3b3f44; font-family: arial,helvetica,sans-serif; font-size: 16px; line-height: 1.5;">
-                                                                              <!--[if mso]> 
-                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href="https://app.plane.so/" style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
+                                                                              <!--[if mso]>
+                                                                              <v:roundrect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href={{invitation_url}} style="v-text-anchor:middle; height: 33px; width: 301px;" arcsize="12%" fillcolor="#ffffff" strokecolor="#3f76ff" strokeweight="1px" data-btn="1">
                                                                                  <w:anchorlock/>
                                                                                  <div style="display:none;">
                                                                                     <center class="default-button">
@@ -99,11 +99,11 @@
                                                                                     </center>
                                                                                  </div>
                                                                               </v:roundrect>
-                                                                              <![endif]-->  <!--[if !mso]><!-- --> 
+                                                                              <![endif]-->  <!--[if !mso]><!-- -->
                                                                               <a href={{invitation_url}} class="r16-r default-button" target="_blank" data-btn="1" style="font-style: normal; font-weight: bold; line-height: 1.15; text-decoration: none; border-style: solid; word-wrap: break-word; display: inline-block; -webkit-text-size-adjust: none; mso-hide: all; background-color: #ffffff; border-color: #3f76ff; border-radius: 4px; border-width: 1px; color: #ffffff; font-family: arial,helvetica,sans-serif; font-size: 16px; height: 18px; padding-bottom: 7px; padding-left: 20px; padding-right: 20px; padding-top: 7px; width: 258px;">
                                                                                  <p style="margin: 0;"><span style="color: #3F76FF;">Accept the invite</span></p>
                                                                               </a>
-                                                                              <!--<![endif]--> 
+                                                                              <!--<![endif]-->
                                                                            </td>
                                                                         </tr>
                                                                         <tr class="nl2go-responsive-hide">
@@ -346,4 +346,4 @@
          </tr>
       </table>
    </body>
-</html>
\ No newline at end of file
+</html>