nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 21:48:12 -05:00
Code

Redefine cipher "share" to "move to organization" (#1401)

Browse Source 
Do not imply users can share with organizations. Organizations share
with users. Users share _using_ organizations
This commit is contained in:
Matt Gibson 2021-06-21 19:27:11 -04:00 committed by GitHub
parent 59268790c9
commit b1d1607f50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Api/Controllers/CiphersController.cs
View File

@ -175,7 +175,7 @@ namespace Bit.Api.Controllers
(Guid?)null : new Guid(model.OrganizationId); (Guid?)null : new Guid(model.OrganizationId);
if (cipher.OrganizationId != modelOrgId) 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."); "then try again.");
} }
@ -528,7 +528,7 @@ namespace Bit.Api.Controllers
{ {
if (!ciphersDict.ContainsKey(cipher.Id.Value)) 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)); shareCiphers.Add((cipher.ToCipher(ciphersDict[cipher.Id.Value]), cipher.LastKnownRevisionDate));

2
src/Core/MailTemplates/Handlebars/Welcome.html.hbs
View File

@ -35,7 +35,7 @@
<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;"> <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="h3" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 18px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-weight: bold; padding: 0 0 5px;" valign="top"> <td class="h3" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 18px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; font-weight: bold; padding: 0 0 5px;" valign="top">
<br 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;" /> <br 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;" />
Securely Share with Bitwarden Organizations Securely Share using Bitwarden Organizations
</td> </td>
</tr> </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;"> <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;">

4
src/Core/MailTemplates/Handlebars/Welcome.text.hbs
View File

@ -16,7 +16,7 @@ Download Options
http://www.bitwarden.com/download 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. 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, Stay safe and secure,
The Bitwarden Team The Bitwarden Team
{{/FullTextLayout}} {{/FullTextLayout}}