From 1a0f8df1c1d75da1455a768baae20e4bee685bcf Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Tue, 21 Jul 2020 16:20:01 -0400 Subject: [PATCH] update email/sms messages related to downloading restore keys --- .../email/approval/password/network/message.hbs | 2 +- .../email/approval/password/network/subject.hbs | 2 +- .../confirmation/password/network/message.hbs | 4 ++-- .../confirmation/password/network/subject.hbs | 2 +- .../email/request/password/network/message.hbs | 17 ++--------------- .../email/request/password/network/subject.hbs | 2 +- .../sms/approval/password/network/message.hbs | 2 +- .../confirmation/password/network/message.hbs | 2 +- .../sms/request/password/network/message.hbs | 2 +- bubble-web | 2 +- 10 files changed, 12 insertions(+), 25 deletions(-) diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs index 6b06681f..35ad874a 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/message.hbs @@ -1,6 +1,6 @@ Hello {{account.name}}, -The "View Network Keys" request for {{network.nickname}} has been approved. +The Bubble Restore Key request for {{network.nickname}} has been approved. The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}. diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs index ba98a04c..1ffd8c49 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/email/approval/password/network/subject.hbs @@ -1 +1 @@ -View Network Keys: request approved on {{network.nickname}} \ No newline at end of file +Bubble Restore Key request approved on {{network.nickname}} \ No newline at end of file diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs index 5cfe5605..4940209d 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/message.hbs @@ -1,12 +1,12 @@ Hello {{account.name}}, -The "View Network Keys" request {{network.nickname}} has been confirmed. +The Bubble Network Key request {{network.nickname}} has been approved. The request was made on {{format_epoch message.request.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.request.ctime 'hh:mm a, ZZZ' network.timezone}}. An approval was received via {{contact.type}} from {{contact.info}} {{#if contact.nick}}({{contact.nick}}){{/if}} on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}}. -Follow the link below to view your network keys ( code: {{message.requestId}} ): +Follow the link below to view your Bubble Restore Key ( code: {{message.requestId}} ): {{publicUri}}/bubble/{{network.name}}?keys_code={{message.requestId}} diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs index e1f5023e..81bd776a 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/email/confirmation/password/network/subject.hbs @@ -1 +1 @@ -View Your Network Keys for {{network.nickname}} \ No newline at end of file +Download Bubble Restore Key for {{network.nickname}} \ No newline at end of file diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs index b2ff251f..70c571f5 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/message.hbs @@ -1,24 +1,11 @@ Hello {{account.name}}, -Someone has requested the network keys for {{network.nickname}} +Someone has requested the Bubble Restore Key for {{network.nickname}} The request was made on {{format_epoch message.ctime 'MMM dd, YYYY' network.timezone}} at {{format_epoch message.ctime 'hh:mm a, ZZZ' network.timezone}} from IP address {{message.remoteHost}}. ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- - -If you did not make this request or would like to cancel this request, please click this link: - - {{publicUri}}/action?deny={{confirmationToken}} - ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- - -If you DID make this request and would like to view keys for your network, click the link below. +To approve this request to download keys for your network, click the link below. {{publicUri}}/action?approve={{confirmationToken}} ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- - Thank you for using Bubble! diff --git a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs index fa8ca5d6..dd423b2e 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/email/request/password/network/subject.hbs @@ -1 +1 @@ -View Network Keys requested on {{network.nickname}} \ No newline at end of file +Bubble Restore Key requested for {{network.nickname}} \ No newline at end of file diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs index 8897531d..4e05a9a7 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/sms/approval/password/network/message.hbs @@ -1 +1 @@ -Viewing network keys: approved on {{network.nickname}} \ No newline at end of file +Bubble Restore Key request: approved on {{network.nickname}} \ No newline at end of file diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/password/network/message.hbs index a0132ab6..1c7a3cb0 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/password/network/message.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/sms/confirmation/password/network/message.hbs @@ -1 +1 @@ -View your network keys (expires in 15min): {{publicUri}}/me/networks/{{network.name}}/actions/keys/{{message.requestId}} \ No newline at end of file +Download your Bubble Restore KEy (expires in 15min): {{publicUri}}/me/networks/{{network.name}}/actions/keys/{{message.requestId}} \ No newline at end of file diff --git a/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs b/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs index 7852e3f5..4c77aa79 100644 --- a/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs +++ b/bubble-server/src/main/resources/message_templates/en_US/sms/request/password/network/message.hbs @@ -1 +1 @@ -Approve viewing network keys on {{network.nickname}}: {{publicUri}}/action?approve={{confirmationToken}} \ No newline at end of file +Approve Bubble Restore Key request for {{network.nickname}}: {{publicUri}}/action?approve={{confirmationToken}} \ No newline at end of file diff --git a/bubble-web b/bubble-web index 924a5277..6c5c3f03 160000 --- a/bubble-web +++ b/bubble-web @@ -1 +1 @@ -Subproject commit 924a527785a7e4e88683edeaf0b31b0e8723538e +Subproject commit 6c5c3f03f325972a0c6ea7c6f6d3a479f2140a99