Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Code Issues Projects Releases Wiki Activity

[EC-7] Org Admin Vault Refresh Server V1 (#2372)

Browse Source 
* [EC-19] Move SSO Identifier to Org SSO endpoint (#2184)

* [EC-19] Move SSO identifier to Org SSO config endpoint

* [EC-19] Add Jira tech debt issue reference

* [EC-542] Update email communications (#2348)

(cherry picked from commit 7469432c77)

Co-authored-by: Jacob Fink <jfink@bitwarden.com>
Co-authored-by: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
This commit is contained in:
Shane Melton 2022-11-02 09:57:33 -07:00 committed by GitHub
parent e277b9e84e
commit 88bccf0d04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 77 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controllers/OrganizationsController.cs
View File

@ -706,8 +706,10 @@ public class OrganizationsController : Controller
var ssoConfig = await _ssoConfigRepository.GetByOrganizationIdAsync(id);
ssoConfig = ssoConfig == null ? model.ToSsoConfig(id) : model.ToSsoConfig(ssoConfig);
organization.Identifier = model.Identifier;
await _ssoConfigService.SaveAsync(ssoConfig, organization);
await _organizationService.UpdateAsync(organization);
return new OrganizationSsoResponseModel(organization, _globalSettings, ssoConfig);
}

2
src/Api/Models/Request/Organizations/OrganizationSsoRequestModel.cs
View File

@ -16,6 +16,8 @@ public class OrganizationSsoRequestModel
{
[Required]
public bool Enabled { get; set; }
[StringLength(50)]
public string Identifier { get; set; }
[Required]
public SsoConfigurationDataRequest Data { get; set; }

1
src/Api/Models/Request/Organizations/OrganizationUpdateRequestModel.cs
View File

@ -12,6 +12,7 @@ public class OrganizationUpdateRequestModel
public string Name { get; set; }
[StringLength(50)]
public string BusinessName { get; set; }
[Obsolete("2022-08-03 Moved to Org SSO request model, left for backwards compatability. Remove with EC-489.")]
[StringLength(50)]
public string Identifier { get; set; }
[EmailAddress]

2
src/Api/Models/Response/Organizations/OrganizationSsoResponseModel.cs
View File

@ -16,10 +16,12 @@ public class OrganizationSsoResponseModel : ResponseModel
Data = config.GetData();
}
Identifier = organization.Identifier;
Urls = new SsoUrls(organization.Id.ToString(), globalSettings);
}
public bool Enabled { get; set; }
public string Identifier { get; set; }
public SsoConfigurationData Data { get; set; }
public SsoUrls Urls { get; set; }
}

18
src/Core/MailTemplates/Handlebars/Layouts/Full.html.hbs
View File

@ -99,6 +99,24 @@
width: 600px !important;
}
}
/* Component styling - these are explicitly applied via classes so that they can be
gradually introduced as we update templates.*/
a.inline-link {
font-weight: bold;
color: #175DDC;
text-decoration: none;
}
br.line-break {
margin: 0;
box-sizing: border-box;
color: #333;
line-height: 25px;
-webkit-font-smoothing: antialiased;
-webkit-text-size-adjust: none;
}
</style>
{{! Yahoo center fix }}
<table width="100%" cellpadding="0" cellspacing="0" bgcolor="#f6f6f6"><tr><td class="container" width="100%" align="center">

39
src/Core/MailTemplates/Handlebars/OrganizationSeatsAutoscaled.html.hbs
View File

@ -6,39 +6,30 @@
<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;"
valign="top">
To accommodate new user invitations, your seat count has increased from {{InitialSeatCount}} to {{CurrentSeatCount}}. A
prorated charge has been immediately applied to your subscription for the new users. This notification will only be sent
To accommodate new member invitations, your seat count has increased from {{InitialSeatCount}} to {{CurrentSeatCount}}. A
prorated charge has been immediately applied to your subscription for the new members. This notification will only be sent
once.
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box;">
<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;"
valign="top">
To manage your subscription:
<ol>
<li>Log in to your
<a href="https://vault.bitwarden.com/#/organizations/{{{OrganizationId}}}/settings/subscription">
Web Vault
</a>
and open your Organization.
</li>
<li>Open the <b>Settings</b> tab and select <b>Subscription</b> from the left-hand menu.</li>
<li>Update your subscription.</li>
<li>Click <b>Save</b>.</li>
</ol>
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box;">
<td class="content-block last"
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; -webkit-text-size-adjust: none;"
valign="top">
For more information, please refer to
<a href="https://bitwarden.com/help/article/managing-users/#subscription">
our help article.
For more information, please refer to the following help article:
<a href="https://bitwarden.com/help/managing-users" class="inline-link">
Member management
</a>
<br class="line-break" />
<br class="line-break" />
</td>
</tr>
<tr style="margin: 0; box-sizing: border-box; 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="https://vault.bitwarden.com/#/organizations/{{{OrganizationId}}}/billing/subscription" clicktracking=off target="_blank" style="color: #ffffff; text-decoration: none; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; background-color: #175DDC; border-color: #175DDC; 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;">
Manage subscription
</a>
<br class="line-break" />
</td>
</tr>
</table>

14
src/Core/MailTemplates/Handlebars/OrganizationSeatsAutoscaled.text.hbs
View File

@ -1,13 +1,7 @@
{{#>BasicTextLayout}}
To accommodate new user invitations, your seat count has increased from {{InitialSeatCount}} to {{CurrentSeatCount}}. A
prorated charge has been immediately applied to your subscription for the new users. This notification will only be sent
once.
To accommodate new member invitations, your seat count has increased from {{InitialSeatCount}} to {{CurrentSeatCount}}. A
prorated charge has been immediately applied to your subscription for the new members.
This notification will only be sent once.
To manage your subscription:
1. Log in to your Web Vault and open your Organization.
2. Open the Settings tab and select Subscription from the left-hand menu.
4. Update your subscription.
5. Click Save.
For more information, please refer to the following help article: https://bitwarden.com/help/article/managing-user/#subscription
For more information, please refer to the following help article: https://bitwarden.com/help/managing-users
{{/BasicTextLayout}}

34
src/Core/MailTemplates/Handlebars/OrganizationSeatsMaxReached.html.hbs
View File

@ -6,23 +6,7 @@
<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;"
valign="top">
Your organization has reached the seat limit of {{MaxSeatCount}} and new users cannot be invited.
</td>
</tr>
<tr
style="margin: 0; box-sizing: border-box; ">
<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;"
valign="top">
To increase your subscription:
<ol>
<li>Log in to your <a
href="https://vault.bitwarden.com/#/organizations/{{{OrganizationId}}}/settings/subscription">Web
Vault</a> and open your Organization.</li>
<li>Open the <b>Settings</b> tab and select <b>Subscription</b> from the left-hand menu.</li>
<li>Update your subscription.</li>
<li>Click <b>Save</b>.</li>
</ol>
Your organization has reached the seat limit of {{MaxSeatCount}} and new members cannot be invited.
</td>
</tr>
<tr
@ -30,8 +14,20 @@
<td class="content-block last"
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; -webkit-text-size-adjust: none;"
valign="top">
For more information, please refer to the following help article: <a
href="https://bitwarden.com/help/article/managing-users/#subscription">https://bitwarden.com/help/article/managing-users/#subscription</a>
For more information, please refer to the following help article:
<a href="https://bitwarden.com/help/managing-users" class="inline-link">
Member management
</a>
<br class="line-break" />
<br class="line-break" />
</td>
</tr>
<tr style="margin: 0; box-sizing: border-box; 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="https://vault.bitwarden.com/#/organizations/{{{OrganizationId}}}/billing/subscription" clicktracking=off target="_blank" style="color: #ffffff; text-decoration: none; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; background-color: #175DDC; border-color: #175DDC; 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;">
Manage subscription
</a>
<br class="line-break" />
</td>
</tr>
</table>

10
src/Core/MailTemplates/Handlebars/OrganizationSeatsMaxReached.text.hbs
View File

@ -1,11 +1,5 @@
{{#>BasicTextLayout}}
Your organization has reached the seat limit of {{MaxSeatCount}} and new users cannot be invited.
Your organization has reached the seat limit of {{MaxSeatCount}} and new members cannot be invited.
To increase your subscription:
1. Log in to your Web Vault and open your Organization.
2. Open the Settings tab and select Subscription from the left-hand menu.
4. Update your subscription.
5. Click Save.
For more information, please refer to the following help article: https://bitwarden.com/help/article/managing-user/#subscription
For more information, please refer to the following help article: https://bitwarden.com/help/managing-users
{{/BasicTextLayout}}

24
src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.html.hbs
View File

@ -6,19 +6,21 @@
</td>
</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;" valign="top">
To confirm users into your organization:
<ol>
<li>Log in to your <a href="{{{WebVaultUrl}}}/organizations/{{{OrganizationId}}}/manage/people">Web Vault</a> and open your Organization.</li>
<li>Open the <b>Manage</b> tab and select <b>People</b> from the left-hand menu.</li>
<li>Hover over the <b>Accepted</b> user and select the gear dropdown.</li>
<li>Select <b>Confirm</b>.</li>
</ol>
<td class="content-block last" 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; -webkit-text-size-adjust: none;" valign="top">
For more information, please refer to the following help article:
<a href="https://bitwarden.com/help/managing-users/#onboard-users" class="inline-link">
Member management
</a>
<br class="line-break" />
<br class="line-break" />
</td>
</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 last" 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; -webkit-text-size-adjust: none;" valign="top">
For more information, please refer to the following help article: <a href="https://bitwarden.com/help/article/managing-users/#confirm">https://bitwarden.com/help/article/managing-users/#confirm</a>
<tr style="margin: 0; box-sizing: border-box; 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="{{{ConfirmUrl}}}" clicktracking=off target="_blank" style="color: #ffffff; text-decoration: none; text-align: center; cursor: pointer; display: inline-block; border-radius: 5px; background-color: #175DDC; border-color: #175DDC; 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;">
Confirm member
</a>
<br class="line-break" />
</td>
</tr>
</table>

8
src/Core/MailTemplates/Handlebars/OrganizationUserAccepted.text.hbs
View File

@ -1,11 +1,5 @@
{{#>BasicTextLayout}}
{{UserIdentifier}} needs to be confirmed to {{OrganizationName}} before they can access the organization vault.
To confirm users into your organization:
1. Log in to your Web Vault and open your Organization.
2. Open the Manage tab and select People from the left-hand menu.
3. Hover over the Accepted user and select the grear dropdown.
4. Select Confirm.
For more information, please refer to the following help article: https://bitwarden.com/help/article/managing-user/#confirm
For more information, please refer to the following help article: https://bitwarden.com/help/managing-users/#onboard-users
{{/BasicTextLayout}}

1
src/Core/Models/Mail/OrganizationUserAcceptedViewModel.cs
View File

@ -5,4 +5,5 @@ public class OrganizationUserAcceptedViewModel : BaseMailModel
public Guid OrganizationId { get; set; }
public string OrganizationName { get; set; }
public string UserIdentifier { get; set; }
public string ConfirmUrl => $"{WebVaultUrl}/organizations/{OrganizationId}/members";
}