nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-07-11 21:03:47 -05:00
Code Activity

Add Expiration Date To Organization Invite Emails (#1466)

Browse Source 
* Added an expiration date to the organization user invite email

* Added a period

* moved property assignment around

* fixed date offset
This commit is contained in:
Addison Beck
2021-07-16 14:17:24 -04:00
committed by GitHub
parent 5ec37b96b4
commit 745068686b
9 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Core/Services/Implementations/OrganizationService.cs
View File

@ -1289,15 +1289,16 @@ namespace Bit.Core.Services
string MakeToken(OrganizationUser orgUser) =>
_dataProtector.Protect($"OrganizationUserInvite {orgUser.Id} {orgUser.Email} {CoreHelpers.ToEpocMilliseconds(DateTime.UtcNow)}");
await _mailService.BulkSendOrganizationInviteEmailAsync(organization.Name,
orgUsers.Select(o => (o, MakeToken(o))));
orgUsers.Select(o => (o, new ExpiringToken(MakeToken(o), DateTime.UtcNow.AddDays(5)))));
}
private async Task SendInviteAsync(OrganizationUser orgUser, Organization organization)
{
var nowMillis = CoreHelpers.ToEpocMilliseconds(DateTime.UtcNow);
var now = DateTime.UtcNow;
var nowMillis = CoreHelpers.ToEpocMilliseconds(now);
var token = _dataProtector.Protect(
$"OrganizationUserInvite {orgUser.Id} {orgUser.Email} {nowMillis}");
await _mailService.SendOrganizationInviteEmailAsync(organization.Name, orgUser, token);
await _mailService.SendOrganizationInviteEmailAsync(organization.Name, orgUser, new ExpiringToken(token, now.AddDays(5)));
}
public async Task<OrganizationUser> AcceptUserAsync(Guid organizationUserId, User user, string token,