bitwarden/server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2026-02-04 02:05:30 -06:00
Code Issues Packages Projects Releases 211 Wiki Activity

Refactor OrganizationInviteBaseView and SendOrganizationInvitesCommand to remove unnecessary properties, streamlining the organization invite email structure and focusing on essential information for user invitations.

Browse Source
This commit is contained in:
Rui Tome 2026-02-03 16:53:56 +00:00
parent 2fd1e46e94
commit a8af2d25f2
No known key found for this signature in database
GPG Key ID: 526239D96A8EC066
2 changed files with 5 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Core/AdminConsole/Models/Mail/Mailer/OrganizationInvite/OrganizationInviteBaseView.cs
View File

@ -5,17 +5,9 @@ namespace Bit.Core.AdminConsole.Models.Mail.Mailer.OrganizationInvite;
public abstract class OrganizationInviteBaseView : BaseMailView public abstract class OrganizationInviteBaseView : BaseMailView
{ {
public required string OrganizationName { get; set; } public required string OrganizationName { get; set; }
public required string OrganizationId { get; set; }
public required string OrganizationUserId { get; set; }
public required string Email { get; set; } public required string Email { get; set; }
public required string Token { get; set; }
public required string ExpirationDate { get; set; } public required string ExpirationDate { get; set; }
public required string Url { get; set; } public required string Url { get; set; }
public required string ButtonText { get; set; } public required string ButtonText { get; set; }
public required bool InitOrganization { get; set; }
public string? InviterEmail { get; set; } public string? InviterEmail { get; set; }
public required string WebVaultUrl { get; set; }
public required string TitleFirst { get; set; }
public required string TitleSecondBold { get; set; }
public required string TitleThird { get; set; }
} }

50
src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/SendOrganizationInvitesCommand.cs
View File

@ -232,19 +232,11 @@ public class SendOrganizationInvitesCommand(
return new OrganizationInviteEnterpriseTeamsNewUserView return new OrganizationInviteEnterpriseTeamsNewUserView
{ {
OrganizationName = organizationName, OrganizationName = organizationName,
OrganizationId = orgUser.OrganizationId.ToString(),
OrganizationUserId = orgUser.Id.ToString(),
Email = orgUser.Email, Email = orgUser.Email,
Token = token.Token,
ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC",
Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token),
ButtonText = _newUserButton, ButtonText = _newUserButton,
InitOrganization = orgInvitesInfo.InitOrganization, InviterEmail = inviterEmail
InviterEmail = inviterEmail,
WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash,
TitleFirst = $"{organizationName} ",
TitleSecondBold = _newUserTitle,
TitleThird = string.Empty
}; };
} }
@ -255,19 +247,11 @@ public class SendOrganizationInvitesCommand(
return new OrganizationInviteEnterpriseTeamsExistingUserView return new OrganizationInviteEnterpriseTeamsExistingUserView
{ {
OrganizationName = organizationName, OrganizationName = organizationName,
OrganizationId = orgUser.OrganizationId.ToString(),
OrganizationUserId = orgUser.Id.ToString(),
Email = orgUser.Email, Email = orgUser.Email,
Token = token.Token,
ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC",
Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token),
ButtonText = _existingUserButton, ButtonText = _existingUserButton,
InitOrganization = orgInvitesInfo.InitOrganization, InviterEmail = inviterEmail
InviterEmail = inviterEmail,
WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash,
TitleFirst = $"{organizationName} ",
TitleSecondBold = _existingUserTitle,
TitleThird = string.Empty
}; };
} }
@ -278,19 +262,11 @@ public class SendOrganizationInvitesCommand(
return new OrganizationInviteFamiliesNewUserView return new OrganizationInviteFamiliesNewUserView
{ {
OrganizationName = organizationName, OrganizationName = organizationName,
OrganizationId = orgUser.OrganizationId.ToString(),
OrganizationUserId = orgUser.Id.ToString(),
Email = orgUser.Email, Email = orgUser.Email,
Token = token.Token,
ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC",
Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token),
ButtonText = _newUserButton, ButtonText = _newUserButton,
InitOrganization = orgInvitesInfo.InitOrganization, InviterEmail = inviterEmail
InviterEmail = inviterEmail,
WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash,
TitleFirst = $"{organizationName} ",
TitleSecondBold = _newUserTitle,
TitleThird = string.Empty
}; };
} }
@ -301,19 +277,11 @@ public class SendOrganizationInvitesCommand(
return new OrganizationInviteFamiliesExistingUserView return new OrganizationInviteFamiliesExistingUserView
{ {
OrganizationName = organizationName, OrganizationName = organizationName,
OrganizationId = orgUser.OrganizationId.ToString(),
OrganizationUserId = orgUser.Id.ToString(),
Email = orgUser.Email, Email = orgUser.Email,
Token = token.Token,
ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC",
Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token),
ButtonText = _existingUserButton, ButtonText = _existingUserButton,
InitOrganization = orgInvitesInfo.InitOrganization, InviterEmail = inviterEmail
InviterEmail = inviterEmail,
WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash,
TitleFirst = $"{organizationName} ",
TitleSecondBold = _existingUserTitle,
TitleThird = string.Empty
}; };
} }
@ -324,19 +292,11 @@ public class SendOrganizationInvitesCommand(
return new OrganizationInviteFreeView return new OrganizationInviteFreeView
{ {
OrganizationName = organizationName, OrganizationName = organizationName,
OrganizationId = orgUser.OrganizationId.ToString(),
OrganizationUserId = orgUser.Id.ToString(),
Email = orgUser.Email, Email = orgUser.Email,
Token = token.Token,
ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC",
Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token),
ButtonText = _existingUserButton, ButtonText = _existingUserButton,
InitOrganization = orgInvitesInfo.InitOrganization, InviterEmail = inviterEmail
InviterEmail = inviterEmail,
WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash,
TitleFirst = _freeOrgTitle,
TitleSecondBold = string.Empty,
TitleThird = string.Empty
}; };
} }