diff options
| author | Daniel García <[email protected]> | 2023-01-09 18:25:41 +0100 |
|---|---|---|
| committer | Daniel García <[email protected]> | 2023-01-09 18:25:41 +0100 |
| commit | 988d24927ea3b586331e02e33fa8648eb9d8fc8f (patch) | |
| tree | db0f94df0fb31ee70e88aa922390aeddba331644 | |
| parent | 5063661028053422c0eab365d88d2309b245cfb2 (diff) | |
| parent | e945d16fcfab6d2ba0e6db710d26b6de98443f0d (diff) | |
| download | vaultwarden-988d24927ea3b586331e02e33fa8648eb9d8fc8f.tar.gz vaultwarden-988d24927ea3b586331e02e33fa8648eb9d8fc8f.zip | |
Merge branch 'am97-main'
| -rw-r--r-- | src/mail.rs | 1 | ||||
| -rw-r--r-- | src/static/templates/email/send_org_invite.hbs | 2 | ||||
| -rw-r--r-- | src/static/templates/email/send_org_invite.html.hbs | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/mail.rs b/src/mail.rs index af0f8c7c..c77f406e 100644 --- a/src/mail.rs +++ b/src/mail.rs @@ -245,6 +245,7 @@ pub async fn send_invite( "org_id": org_id.as_deref().unwrap_or("_"), "org_user_id": org_user_id.as_deref().unwrap_or("_"), "email": percent_encode(address.as_bytes(), NON_ALPHANUMERIC).to_string(), + "org_name_encoded": percent_encode(org_name.as_bytes(), NON_ALPHANUMERIC).to_string(), "org_name": org_name, "token": invite_token, }), diff --git a/src/static/templates/email/send_org_invite.hbs b/src/static/templates/email/send_org_invite.hbs index b35314fc..be94d0e5 100644 --- a/src/static/templates/email/send_org_invite.hbs +++ b/src/static/templates/email/send_org_invite.hbs @@ -3,7 +3,7 @@ Join {{{org_name}}} You have been invited to join the *{{org_name}}* organization. -Click here to join: {{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name}}&token={{token}} +Click here to join: {{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name_encoded}}&token={{token}} If you do not wish to join this organization, you can safely ignore this email. diff --git a/src/static/templates/email/send_org_invite.html.hbs b/src/static/templates/email/send_org_invite.html.hbs index 003eb504..55b98145 100644 --- a/src/static/templates/email/send_org_invite.html.hbs +++ b/src/static/templates/email/send_org_invite.html.hbs @@ -9,7 +9,7 @@ Join {{{org_name}}} </tr> <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none; text-align: center;" valign="top" align="center"> - <a href="{{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name}}&token={{token}}" + <a href="{{url}}/#/accept-organization/?organizationId={{org_id}}&organizationUserId={{org_user_id}}&email={{email}}&organizationName={{org_name_encoded}}&token={{token}}" clicktracking=off target="_blank" style="color: #ffffff; text-decoration: none; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; background-color: #3c8dbc; border-color: #3c8dbc; border-style: solid; border-width: 10px 20px; margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;"> Join Organization Now </a> |