1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-17 15:40:59 -05:00

Revert filescoped (#2227)

* Revert "Add git blame entry (#2226)"

This reverts commit 239286737d.

* Revert "Turn on file scoped namespaces (#2225)"

This reverts commit 34fb4cca2a.
This commit is contained in:
Justin Baur
2022-08-29 15:53:48 -04:00
committed by GitHub
parent 239286737d
commit bae03feffe
1208 changed files with 74317 additions and 73126 deletions

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class AddedCreditViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public decimal Amount { get; set; }
public class AddedCreditViewModel : BaseMailModel
{
public decimal Amount { get; set; }
}
}

View File

@ -1,7 +1,8 @@
namespace Bit.Core.Models.Mail;
public class AdminResetPasswordViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string UserName { get; set; }
public string OrgName { get; set; }
public class AdminResetPasswordViewModel : BaseMailModel
{
public string UserName { get; set; }
public string OrgName { get; set; }
}
}

View File

@ -1,26 +1,27 @@
namespace Bit.Core.Models.Mail;
public class BaseMailModel
namespace Bit.Core.Models.Mail
{
public string SiteName { get; set; }
public string WebVaultUrl { get; set; }
public string WebVaultUrlHostname
public class BaseMailModel
{
get
public string SiteName { get; set; }
public string WebVaultUrl { get; set; }
public string WebVaultUrlHostname
{
if (Uri.TryCreate(WebVaultUrl, UriKind.Absolute, out Uri uri))
get
{
return uri.Host;
}
if (Uri.TryCreate(WebVaultUrl, UriKind.Absolute, out Uri uri))
{
return uri.Host;
}
return WebVaultUrl;
return WebVaultUrl;
}
}
}
public string CurrentYear
{
get
public string CurrentYear
{
return DateTime.UtcNow.Year.ToString();
get
{
return DateTime.UtcNow.Year.ToString();
}
}
}
}

View File

@ -1,7 +1,8 @@
namespace Bit.Core.Models.Mail;
public class ChangeEmailExistsViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string FromEmail { get; set; }
public string ToEmail { get; set; }
public class ChangeEmailExistsViewModel : BaseMailModel
{
public string FromEmail { get; set; }
public string ToEmail { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class EmailTokenViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Token { get; set; }
public class EmailTokenViewModel : BaseMailModel
{
public string Token { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessAcceptedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string GranteeEmail { get; set; }
public class EmergencyAccessAcceptedViewModel : BaseMailModel
{
public string GranteeEmail { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessApprovedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Name { get; set; }
public class EmergencyAccessApprovedViewModel : BaseMailModel
{
public string Name { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessConfirmedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Name { get; set; }
public class EmergencyAccessConfirmedViewModel : BaseMailModel
{
public string Name { get; set; }
}
}

View File

@ -1,10 +1,11 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessInvitedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Name { get; set; }
public string Id { get; set; }
public string Email { get; set; }
public string Token { get; set; }
public string Url => $"{WebVaultUrl}/accept-emergency?id={Id}&name={Name}&email={Email}&token={Token}";
public class EmergencyAccessInvitedViewModel : BaseMailModel
{
public string Name { get; set; }
public string Id { get; set; }
public string Email { get; set; }
public string Token { get; set; }
public string Url => $"{WebVaultUrl}/accept-emergency?id={Id}&name={Name}&email={Email}&token={Token}";
}
}

View File

@ -1,7 +1,8 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessRecoveryTimedOutViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Name { get; set; }
public string Action { get; set; }
public class EmergencyAccessRecoveryTimedOutViewModel : BaseMailModel
{
public string Name { get; set; }
public string Action { get; set; }
}
}

View File

@ -1,8 +1,9 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessRecoveryViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Name { get; set; }
public string Action { get; set; }
public int DaysLeft { get; set; }
public class EmergencyAccessRecoveryViewModel : BaseMailModel
{
public string Name { get; set; }
public string Action { get; set; }
public int DaysLeft { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class EmergencyAccessRejectedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Name { get; set; }
public class EmergencyAccessRejectedViewModel : BaseMailModel
{
public string Name { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class FailedAuthAttemptsModel : NewDeviceLoggedInModel
namespace Bit.Core.Models.Mail
{
public string AffectedEmail { get; set; }
public class FailedAuthAttemptsModel : NewDeviceLoggedInModel
{
public string AffectedEmail { get; set; }
}
}

View File

@ -1,16 +1,17 @@
namespace Bit.Core.Models.Mail.FamiliesForEnterprise;
public class FamiliesForEnterpriseOfferViewModel : BaseMailModel
namespace Bit.Core.Models.Mail.FamiliesForEnterprise
{
public string SponsorOrgName { get; set; }
public string SponsoredEmail { get; set; }
public string SponsorshipToken { get; set; }
public bool ExistingAccount { get; set; }
public string Url => string.Concat(
WebVaultUrl,
"/accept-families-for-enterprise",
$"?token={SponsorshipToken}",
$"&email={SponsoredEmail}",
ExistingAccount ? "" : "&register=true"
);
public class FamiliesForEnterpriseOfferViewModel : BaseMailModel
{
public string SponsorOrgName { get; set; }
public string SponsoredEmail { get; set; }
public string SponsorshipToken { get; set; }
public bool ExistingAccount { get; set; }
public string Url => string.Concat(
WebVaultUrl,
"/accept-families-for-enterprise",
$"?token={SponsorshipToken}",
$"&email={SponsoredEmail}",
ExistingAccount ? "" : "&register=true"
);
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail.FamiliesForEnterprise;
public class FamiliesForEnterpriseSponsorshipRevertingViewModel : BaseMailModel
namespace Bit.Core.Models.Mail.FamiliesForEnterprise
{
public DateTime ExpirationDate { get; set; }
public class FamiliesForEnterpriseSponsorshipRevertingViewModel : BaseMailModel
{
public DateTime ExpirationDate { get; set; }
}
}

View File

@ -1,11 +1,12 @@
namespace Bit.Core.Models.Mail;
public interface IMailQueueMessage
namespace Bit.Core.Models.Mail
{
string Subject { get; set; }
IEnumerable<string> ToEmails { get; set; }
IEnumerable<string> BccEmails { get; set; }
string Category { get; set; }
string TemplateName { get; set; }
object Model { get; set; }
public interface IMailQueueMessage
{
string Subject { get; set; }
IEnumerable<string> ToEmails { get; set; }
IEnumerable<string> BccEmails { get; set; }
string Category { get; set; }
string TemplateName { get; set; }
object Model { get; set; }
}
}

View File

@ -1,9 +1,10 @@
namespace Bit.Core.Models.Mail;
public class InvoiceUpcomingViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public decimal AmountDue { get; set; }
public DateTime DueDate { get; set; }
public List<string> Items { get; set; }
public bool MentionInvoices { get; set; }
public class InvoiceUpcomingViewModel : BaseMailModel
{
public decimal AmountDue { get; set; }
public DateTime DueDate { get; set; }
public List<string> Items { get; set; }
public bool MentionInvoices { get; set; }
}
}

View File

@ -1,7 +1,8 @@
namespace Bit.Core.Models.Mail;
public class LicenseExpiredViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string OrganizationName { get; set; }
public bool IsOrganization => !string.IsNullOrWhiteSpace(OrganizationName);
public class LicenseExpiredViewModel : BaseMailModel
{
public string OrganizationName { get; set; }
public bool IsOrganization => !string.IsNullOrWhiteSpace(OrganizationName);
}
}

View File

@ -1,12 +1,13 @@
namespace Bit.Core.Models.Mail;
public class MailMessage
namespace Bit.Core.Models.Mail
{
public string Subject { get; set; }
public IEnumerable<string> ToEmails { get; set; }
public IEnumerable<string> BccEmails { get; set; }
public string HtmlContent { get; set; }
public string TextContent { get; set; }
public string Category { get; set; }
public IDictionary<string, object> MetaData { get; set; }
public class MailMessage
{
public string Subject { get; set; }
public IEnumerable<string> ToEmails { get; set; }
public IEnumerable<string> BccEmails { get; set; }
public string HtmlContent { get; set; }
public string TextContent { get; set; }
public string Category { get; set; }
public IDictionary<string, object> MetaData { get; set; }
}
}

View File

@ -1,28 +1,29 @@
using System.Text.Json.Serialization;
using Bit.Core.Utilities;
namespace Bit.Core.Models.Mail;
public class MailQueueMessage : IMailQueueMessage
namespace Bit.Core.Models.Mail
{
public string Subject { get; set; }
public IEnumerable<string> ToEmails { get; set; }
public IEnumerable<string> BccEmails { get; set; }
public string Category { get; set; }
public string TemplateName { get; set; }
[JsonConverter(typeof(HandlebarsObjectJsonConverter))]
public object Model { get; set; }
public MailQueueMessage() { }
public MailQueueMessage(MailMessage message, string templateName, object model)
public class MailQueueMessage : IMailQueueMessage
{
Subject = message.Subject;
ToEmails = message.ToEmails;
BccEmails = message.BccEmails;
Category = string.IsNullOrEmpty(message.Category) ? templateName : message.Category;
TemplateName = templateName;
Model = model;
public string Subject { get; set; }
public IEnumerable<string> ToEmails { get; set; }
public IEnumerable<string> BccEmails { get; set; }
public string Category { get; set; }
public string TemplateName { get; set; }
[JsonConverter(typeof(HandlebarsObjectJsonConverter))]
public object Model { get; set; }
public MailQueueMessage() { }
public MailQueueMessage(MailMessage message, string templateName, object model)
{
Subject = message.Subject;
ToEmails = message.ToEmails;
BccEmails = message.BccEmails;
Category = string.IsNullOrEmpty(message.Category) ? templateName : message.Category;
TemplateName = templateName;
Model = model;
}
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class MasterPasswordHintViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Hint { get; set; }
public class MasterPasswordHintViewModel : BaseMailModel
{
public string Hint { get; set; }
}
}

View File

@ -1,10 +1,11 @@
namespace Bit.Core.Models.Mail;
public class NewDeviceLoggedInModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string TheDate { get; set; }
public string TheTime { get; set; }
public string TimeZone { get; set; }
public string IpAddress { get; set; }
public string DeviceType { get; set; }
public class NewDeviceLoggedInModel : BaseMailModel
{
public string TheDate { get; set; }
public string TheTime { get; set; }
public string TimeZone { get; set; }
public string IpAddress { get; set; }
public string DeviceType { get; set; }
}
}

View File

@ -1,8 +1,9 @@
namespace Bit.Core.Models.Mail;
public class OrganizationSeatsAutoscaledViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public Guid OrganizationId { get; set; }
public int InitialSeatCount { get; set; }
public int CurrentSeatCount { get; set; }
public class OrganizationSeatsAutoscaledViewModel : BaseMailModel
{
public Guid OrganizationId { get; set; }
public int InitialSeatCount { get; set; }
public int CurrentSeatCount { get; set; }
}
}

View File

@ -1,7 +1,8 @@
namespace Bit.Core.Models.Mail;
public class OrganizationSeatsMaxReachedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public Guid OrganizationId { get; set; }
public int MaxSeatCount { get; set; }
public class OrganizationSeatsMaxReachedViewModel : BaseMailModel
{
public Guid OrganizationId { get; set; }
public int MaxSeatCount { get; set; }
}
}

View File

@ -1,8 +1,9 @@
namespace Bit.Core.Models.Mail;
public class OrganizationUserAcceptedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public Guid OrganizationId { get; set; }
public string OrganizationName { get; set; }
public string UserIdentifier { get; set; }
public class OrganizationUserAcceptedViewModel : BaseMailModel
{
public Guid OrganizationId { get; set; }
public string OrganizationName { get; set; }
public string UserIdentifier { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class OrganizationUserConfirmedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string OrganizationName { get; set; }
public class OrganizationUserConfirmedViewModel : BaseMailModel
{
public string OrganizationName { get; set; }
}
}

View File

@ -1,20 +1,21 @@
namespace Bit.Core.Models.Mail;
public class OrganizationUserInvitedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string OrganizationName { get; set; }
public string OrganizationId { get; set; }
public string OrganizationUserId { get; set; }
public string Email { get; set; }
public string OrganizationNameUrlEncoded { get; set; }
public string Token { get; set; }
public string ExpirationDate { get; set; }
public string Url => string.Format("{0}/accept-organization?organizationId={1}&" +
"organizationUserId={2}&email={3}&organizationName={4}&token={5}",
WebVaultUrl,
OrganizationId,
OrganizationUserId,
Email,
OrganizationNameUrlEncoded,
Token);
public class OrganizationUserInvitedViewModel : BaseMailModel
{
public string OrganizationName { get; set; }
public string OrganizationId { get; set; }
public string OrganizationUserId { get; set; }
public string Email { get; set; }
public string OrganizationNameUrlEncoded { get; set; }
public string Token { get; set; }
public string ExpirationDate { get; set; }
public string Url => string.Format("{0}/accept-organization?organizationId={1}&" +
"organizationUserId={2}&email={3}&organizationName={4}&token={5}",
WebVaultUrl,
OrganizationId,
OrganizationUserId,
Email,
OrganizationNameUrlEncoded,
Token);
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class OrganizationUserRemovedForPolicySingleOrgViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string OrganizationName { get; set; }
public class OrganizationUserRemovedForPolicySingleOrgViewModel : BaseMailModel
{
public string OrganizationName { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class OrganizationUserRemovedForPolicyTwoStepViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string OrganizationName { get; set; }
public class OrganizationUserRemovedForPolicyTwoStepViewModel : BaseMailModel
{
public string OrganizationName { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class PasswordlessSignInModel
namespace Bit.Core.Models.Mail
{
public string Url { get; set; }
public class PasswordlessSignInModel
{
public string Url { get; set; }
}
}

View File

@ -1,7 +1,8 @@
namespace Bit.Core.Models.Mail;
public class PaymentFailedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public decimal Amount { get; set; }
public bool MentionInvoices { get; set; }
public class PaymentFailedViewModel : BaseMailModel
{
public decimal Amount { get; set; }
public bool MentionInvoices { get; set; }
}
}

View File

@ -1,13 +1,14 @@
namespace Bit.Core.Models.Mail.Provider;
public class ProviderSetupInviteViewModel : BaseMailModel
namespace Bit.Core.Models.Mail.Provider
{
public string ProviderId { get; set; }
public string Email { get; set; }
public string Token { get; set; }
public string Url => string.Format("{0}/providers/setup-provider?providerId={1}&email={2}&token={3}",
WebVaultUrl,
ProviderId,
Email,
Token);
public class ProviderSetupInviteViewModel : BaseMailModel
{
public string ProviderId { get; set; }
public string Email { get; set; }
public string Token { get; set; }
public string Url => string.Format("{0}/providers/setup-provider?providerId={1}&email={2}&token={3}",
WebVaultUrl,
ProviderId,
Email,
Token);
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail.Provider;
public class ProviderUserConfirmedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail.Provider
{
public string ProviderName { get; set; }
public class ProviderUserConfirmedViewModel : BaseMailModel
{
public string ProviderName { get; set; }
}
}

View File

@ -1,19 +1,20 @@
namespace Bit.Core.Models.Mail.Provider;
public class ProviderUserInvitedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail.Provider
{
public string ProviderName { get; set; }
public string ProviderId { get; set; }
public string ProviderUserId { get; set; }
public string Email { get; set; }
public string ProviderNameUrlEncoded { get; set; }
public string Token { get; set; }
public string Url => string.Format("{0}/providers/accept-provider?providerId={1}&" +
"providerUserId={2}&email={3}&providerName={4}&token={5}",
WebVaultUrl,
ProviderId,
ProviderUserId,
Email,
ProviderNameUrlEncoded,
Token);
public class ProviderUserInvitedViewModel : BaseMailModel
{
public string ProviderName { get; set; }
public string ProviderId { get; set; }
public string ProviderUserId { get; set; }
public string Email { get; set; }
public string ProviderNameUrlEncoded { get; set; }
public string Token { get; set; }
public string Url => string.Format("{0}/providers/accept-provider?providerId={1}&" +
"providerUserId={2}&email={3}&providerName={4}&token={5}",
WebVaultUrl,
ProviderId,
ProviderUserId,
Email,
ProviderNameUrlEncoded,
Token);
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail.Provider;
public class ProviderUserRemovedViewModel : BaseMailModel
namespace Bit.Core.Models.Mail.Provider
{
public string ProviderName { get; set; }
public class ProviderUserRemovedViewModel : BaseMailModel
{
public string ProviderName { get; set; }
}
}

View File

@ -1,9 +1,10 @@
namespace Bit.Core.Models.Mail;
public class RecoverTwoFactorModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string TheDate { get; set; }
public string TheTime { get; set; }
public string TimeZone { get; set; }
public string IpAddress { get; set; }
public class RecoverTwoFactorModel : BaseMailModel
{
public string TheDate { get; set; }
public string TheTime { get; set; }
public string TimeZone { get; set; }
public string IpAddress { get; set; }
}
}

View File

@ -1,6 +1,7 @@
namespace Bit.Core.Models.Mail;
public class UpdateTempPasswordViewModel
namespace Bit.Core.Models.Mail
{
public string UserName { get; set; }
public class UpdateTempPasswordViewModel
{
public string UserName { get; set; }
}
}

View File

@ -1,15 +1,16 @@
namespace Bit.Core.Models.Mail;
public class VerifyDeleteModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Url => string.Format("{0}/verify-recover-delete?userId={1}&token={2}&email={3}",
WebVaultUrl,
UserId,
Token,
EmailEncoded);
public class VerifyDeleteModel : BaseMailModel
{
public string Url => string.Format("{0}/verify-recover-delete?userId={1}&token={2}&email={3}",
WebVaultUrl,
UserId,
Token,
EmailEncoded);
public Guid UserId { get; set; }
public string Email { get; set; }
public string EmailEncoded { get; set; }
public string Token { get; set; }
public Guid UserId { get; set; }
public string Email { get; set; }
public string EmailEncoded { get; set; }
public string Token { get; set; }
}
}

View File

@ -1,12 +1,13 @@
namespace Bit.Core.Models.Mail;
public class VerifyEmailModel : BaseMailModel
namespace Bit.Core.Models.Mail
{
public string Url => string.Format("{0}/verify-email?userId={1}&token={2}",
WebVaultUrl,
UserId,
Token);
public class VerifyEmailModel : BaseMailModel
{
public string Url => string.Format("{0}/verify-email?userId={1}&token={2}",
WebVaultUrl,
UserId,
Token);
public Guid UserId { get; set; }
public string Token { get; set; }
public Guid UserId { get; set; }
public string Token { get; set; }
}
}