From b1d1607f5029c87fc7ac9ca2ea3130e2f255337e Mon Sep 17 00:00:00 2001 From: Matt Gibson Date: Mon, 21 Jun 2021 19:27:11 -0400 Subject: [PATCH] Redefine cipher "share" to "move to organization" (#1401) Do not imply users can share with organizations. Organizations share with users. Users share _using_ organizations --- src/Api/Controllers/CiphersController.cs | 4 ++-- src/Core/MailTemplates/Handlebars/Welcome.html.hbs | 2 +- src/Core/MailTemplates/Handlebars/Welcome.text.hbs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Api/Controllers/CiphersController.cs b/src/Api/Controllers/CiphersController.cs index 7f2eb7f2b5..327c9d307d 100644 --- a/src/Api/Controllers/CiphersController.cs +++ b/src/Api/Controllers/CiphersController.cs @@ -175,7 +175,7 @@ namespace Bit.Api.Controllers (Guid?)null : new Guid(model.OrganizationId); if (cipher.OrganizationId != modelOrgId) { - throw new BadRequestException("Organization mismatch. Re-sync if you recently shared this item, " + + throw new BadRequestException("Organization mismatch. Re-sync if you recently moved this item, " + "then try again."); } @@ -528,7 +528,7 @@ namespace Bit.Api.Controllers { if (!ciphersDict.ContainsKey(cipher.Id.Value)) { - throw new BadRequestException("Trying to share ciphers that you do not own."); + throw new BadRequestException("Trying to move ciphers that you do not own."); } shareCiphers.Add((cipher.ToCipher(ciphersDict[cipher.Id.Value]), cipher.LastKnownRevisionDate)); diff --git a/src/Core/MailTemplates/Handlebars/Welcome.html.hbs b/src/Core/MailTemplates/Handlebars/Welcome.html.hbs index 8a12992d82..ce2863ba3f 100644 --- a/src/Core/MailTemplates/Handlebars/Welcome.html.hbs +++ b/src/Core/MailTemplates/Handlebars/Welcome.html.hbs @@ -35,7 +35,7 @@
- Securely Share with Bitwarden Organizations + Securely Share using Bitwarden Organizations diff --git a/src/Core/MailTemplates/Handlebars/Welcome.text.hbs b/src/Core/MailTemplates/Handlebars/Welcome.text.hbs index 59dde954a4..bbc5e1b7ef 100644 --- a/src/Core/MailTemplates/Handlebars/Welcome.text.hbs +++ b/src/Core/MailTemplates/Handlebars/Welcome.text.hbs @@ -16,7 +16,7 @@ Download Options http://www.bitwarden.com/download -Securely Share with Bitwarden Organizations +Securely Share using Bitwarden Organizations ============ Bitwarden makes it easy to securely share passwords for teams and enterprises through Organizations. Join an Organization if invited, or launch a new one anytime from the Web Vault ({{WebVaultUrl}}/?utm_source=welcome_email&utm_medium=email) with the + New Organization button. @@ -36,4 +36,4 @@ Check out our Help (http://www.bitwarden.com/help) site for documentation, join Stay safe and secure, The Bitwarden Team -{{/FullTextLayout}} \ No newline at end of file +{{/FullTextLayout}}