diff --git a/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationInvite/OrganizationInviteBaseView.cs b/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationInvite/OrganizationInviteBaseView.cs index ade5703382..0fd14233e1 100644 --- a/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationInvite/OrganizationInviteBaseView.cs +++ b/src/Core/AdminConsole/Models/Mail/Mailer/OrganizationInvite/OrganizationInviteBaseView.cs @@ -5,17 +5,9 @@ namespace Bit.Core.AdminConsole.Models.Mail.Mailer.OrganizationInvite; public abstract class OrganizationInviteBaseView : BaseMailView { 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 Token { get; set; } public required string ExpirationDate { get; set; } public required string Url { get; set; } public required string ButtonText { get; set; } - public required bool InitOrganization { 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; } } diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/SendOrganizationInvitesCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/SendOrganizationInvitesCommand.cs index 89c5a0aae4..d9db009226 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/SendOrganizationInvitesCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/SendOrganizationInvitesCommand.cs @@ -232,19 +232,11 @@ public class SendOrganizationInvitesCommand( return new OrganizationInviteEnterpriseTeamsNewUserView { OrganizationName = organizationName, - OrganizationId = orgUser.OrganizationId.ToString(), - OrganizationUserId = orgUser.Id.ToString(), Email = orgUser.Email, - Token = token.Token, ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), ButtonText = _newUserButton, - InitOrganization = orgInvitesInfo.InitOrganization, - InviterEmail = inviterEmail, - WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash, - TitleFirst = $"{organizationName} ", - TitleSecondBold = _newUserTitle, - TitleThird = string.Empty + InviterEmail = inviterEmail }; } @@ -255,19 +247,11 @@ public class SendOrganizationInvitesCommand( return new OrganizationInviteEnterpriseTeamsExistingUserView { OrganizationName = organizationName, - OrganizationId = orgUser.OrganizationId.ToString(), - OrganizationUserId = orgUser.Id.ToString(), Email = orgUser.Email, - Token = token.Token, ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), ButtonText = _existingUserButton, - InitOrganization = orgInvitesInfo.InitOrganization, - InviterEmail = inviterEmail, - WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash, - TitleFirst = $"{organizationName} ", - TitleSecondBold = _existingUserTitle, - TitleThird = string.Empty + InviterEmail = inviterEmail }; } @@ -278,19 +262,11 @@ public class SendOrganizationInvitesCommand( return new OrganizationInviteFamiliesNewUserView { OrganizationName = organizationName, - OrganizationId = orgUser.OrganizationId.ToString(), - OrganizationUserId = orgUser.Id.ToString(), Email = orgUser.Email, - Token = token.Token, ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), ButtonText = _newUserButton, - InitOrganization = orgInvitesInfo.InitOrganization, - InviterEmail = inviterEmail, - WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash, - TitleFirst = $"{organizationName} ", - TitleSecondBold = _newUserTitle, - TitleThird = string.Empty + InviterEmail = inviterEmail }; } @@ -301,19 +277,11 @@ public class SendOrganizationInvitesCommand( return new OrganizationInviteFamiliesExistingUserView { OrganizationName = organizationName, - OrganizationId = orgUser.OrganizationId.ToString(), - OrganizationUserId = orgUser.Id.ToString(), Email = orgUser.Email, - Token = token.Token, ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), ButtonText = _existingUserButton, - InitOrganization = orgInvitesInfo.InitOrganization, - InviterEmail = inviterEmail, - WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash, - TitleFirst = $"{organizationName} ", - TitleSecondBold = _existingUserTitle, - TitleThird = string.Empty + InviterEmail = inviterEmail }; } @@ -324,19 +292,11 @@ public class SendOrganizationInvitesCommand( return new OrganizationInviteFreeView { OrganizationName = organizationName, - OrganizationId = orgUser.OrganizationId.ToString(), - OrganizationUserId = orgUser.Id.ToString(), Email = orgUser.Email, - Token = token.Token, ExpirationDate = $"{token.ExpirationDate.ToLongDateString()} {token.ExpirationDate.ToShortTimeString()} UTC", Url = BuildInvitationUrl(orgInvitesInfo, orgUser, token), ButtonText = _existingUserButton, - InitOrganization = orgInvitesInfo.InitOrganization, - InviterEmail = inviterEmail, - WebVaultUrl = globalSettings.BaseServiceUri.VaultWithHash, - TitleFirst = _freeOrgTitle, - TitleSecondBold = string.Empty, - TitleThird = string.Empty + InviterEmail = inviterEmail }; }