Revert filescoped (#2227)

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

This reverts commit 239286737d.

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

This reverts commit 34fb4cca2a.

src/Core/Entities/Cipher.cs

@@ -2,107 +2,108 @@
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Cipher : ITableObject<Guid>, ICloneable
+namespace Bit.Core.Entities
 {
-    private Dictionary<string, CipherAttachment.MetaData> _attachmentData;
-
-    public Guid Id { get; set; }
-    public Guid? UserId { get; set; }
-    public Guid? OrganizationId { get; set; }
-    public Enums.CipherType Type { get; set; }
-    public string Data { get; set; }
-    public string Favorites { get; set; }
-    public string Folders { get; set; }
-    public string Attachments { get; set; }
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
-    public DateTime? DeletedDate { get; set; }
-    public Enums.CipherRepromptType? Reprompt { get; set; }
-
-    public void SetNewId()
+    public class Cipher : ITableObject<Guid>, ICloneable
     {
-        Id = CoreHelpers.GenerateComb();
-    }
+        private Dictionary<string, CipherAttachment.MetaData> _attachmentData;
 
-    public Dictionary<string, CipherAttachment.MetaData> GetAttachments()
-    {
-        if (string.IsNullOrWhiteSpace(Attachments))
+        public Guid Id { get; set; }
+        public Guid? UserId { get; set; }
+        public Guid? OrganizationId { get; set; }
+        public Enums.CipherType Type { get; set; }
+        public string Data { get; set; }
+        public string Favorites { get; set; }
+        public string Folders { get; set; }
+        public string Attachments { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+        public DateTime? DeletedDate { get; set; }
+        public Enums.CipherRepromptType? Reprompt { get; set; }
+
+        public void SetNewId()
         {
-            return null;
+            Id = CoreHelpers.GenerateComb();
         }
 
-        if (_attachmentData != null)
+        public Dictionary<string, CipherAttachment.MetaData> GetAttachments()
         {
-            return _attachmentData;
-        }
-
-        try
-        {
-            _attachmentData = JsonSerializer.Deserialize<Dictionary<string, CipherAttachment.MetaData>>(Attachments);
-            foreach (var kvp in _attachmentData)
+            if (string.IsNullOrWhiteSpace(Attachments))
             {
-                kvp.Value.AttachmentId = kvp.Key;
+                return null;
+            }
+
+            if (_attachmentData != null)
+            {
+                return _attachmentData;
+            }
+
+            try
+            {
+                _attachmentData = JsonSerializer.Deserialize<Dictionary<string, CipherAttachment.MetaData>>(Attachments);
+                foreach (var kvp in _attachmentData)
+                {
+                    kvp.Value.AttachmentId = kvp.Key;
+                }
+                return _attachmentData;
+            }
+            catch
+            {
+                return null;
             }
-            return _attachmentData;
         }
-        catch
+
+        public void SetAttachments(Dictionary<string, CipherAttachment.MetaData> data)
         {
-            return null;
-        }
-    }
+            if (data == null || data.Count == 0)
+            {
+                _attachmentData = null;
+                Attachments = null;
+                return;
+            }
 
-    public void SetAttachments(Dictionary<string, CipherAttachment.MetaData> data)
-    {
-        if (data == null || data.Count == 0)
+            _attachmentData = data;
+            Attachments = JsonSerializer.Serialize(_attachmentData);
+        }
+
+        public void AddAttachment(string id, CipherAttachment.MetaData data)
         {
-            _attachmentData = null;
-            Attachments = null;
-            return;
+            var attachments = GetAttachments();
+            if (attachments == null)
+            {
+                attachments = new Dictionary<string, CipherAttachment.MetaData>();
+            }
+
+            attachments.Add(id, data);
+            SetAttachments(attachments);
         }
 
-        _attachmentData = data;
-        Attachments = JsonSerializer.Serialize(_attachmentData);
-    }
-
-    public void AddAttachment(string id, CipherAttachment.MetaData data)
-    {
-        var attachments = GetAttachments();
-        if (attachments == null)
+        public void DeleteAttachment(string id)
         {
-            attachments = new Dictionary<string, CipherAttachment.MetaData>();
+            var attachments = GetAttachments();
+            if (!attachments?.ContainsKey(id) ?? true)
+            {
+                return;
+            }
+
+            attachments.Remove(id);
+            SetAttachments(attachments);
         }
 
-        attachments.Add(id, data);
-        SetAttachments(attachments);
-    }
-
-    public void DeleteAttachment(string id)
-    {
-        var attachments = GetAttachments();
-        if (!attachments?.ContainsKey(id) ?? true)
+        public bool ContainsAttachment(string id)
         {
-            return;
+            var attachments = GetAttachments();
+            return attachments?.ContainsKey(id) ?? false;
         }
 
-        attachments.Remove(id);
-        SetAttachments(attachments);
-    }
+        object ICloneable.Clone() => Clone();
+        public Cipher Clone()
+        {
+            var clone = CoreHelpers.CloneObject(this);
+            clone.CreationDate = CreationDate;
+            clone.RevisionDate = RevisionDate;
 
-    public bool ContainsAttachment(string id)
-    {
-        var attachments = GetAttachments();
-        return attachments?.ContainsKey(id) ?? false;
-    }
-
-    object ICloneable.Clone() => Clone();
-    public Cipher Clone()
-    {
-        var clone = CoreHelpers.CloneObject(this);
-        clone.CreationDate = CreationDate;
-        clone.RevisionDate = RevisionDate;
-
-        return clone;
+            return clone;
+        }
     }
 }

src/Core/Entities/Collection.cs

@@ -1,20 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Collection : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid OrganizationId { get; set; }
-    public string Name { get; set; }
-    [MaxLength(300)]
-    public string ExternalId { get; set; }
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Collection : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
+        public string Name { get; set; }
+        [MaxLength(300)]
+        public string ExternalId { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/CollectionCipher.cs

@@ -1,7 +1,8 @@
-namespace Bit.Core.Entities;
-
-public class CollectionCipher
+namespace Bit.Core.Entities
 {
-    public Guid CollectionId { get; set; }
-    public Guid CipherId { get; set; }
+    public class CollectionCipher
+    {
+        public Guid CollectionId { get; set; }
+        public Guid CipherId { get; set; }
+    }
 }

src/Core/Entities/CollectionGroup.cs

@@ -1,9 +1,10 @@
-namespace Bit.Core.Entities;
-
-public class CollectionGroup
+namespace Bit.Core.Entities
 {
-    public Guid CollectionId { get; set; }
-    public Guid GroupId { get; set; }
-    public bool ReadOnly { get; set; }
-    public bool HidePasswords { get; set; }
+    public class CollectionGroup
+    {
+        public Guid CollectionId { get; set; }
+        public Guid GroupId { get; set; }
+        public bool ReadOnly { get; set; }
+        public bool HidePasswords { get; set; }
+    }
 }

src/Core/Entities/CollectionUser.cs

@@ -1,9 +1,10 @@
-namespace Bit.Core.Entities;
-
-public class CollectionUser
+namespace Bit.Core.Entities
 {
-    public Guid CollectionId { get; set; }
-    public Guid OrganizationUserId { get; set; }
-    public bool ReadOnly { get; set; }
-    public bool HidePasswords { get; set; }
+    public class CollectionUser
+    {
+        public Guid CollectionId { get; set; }
+        public Guid OrganizationUserId { get; set; }
+        public bool ReadOnly { get; set; }
+        public bool HidePasswords { get; set; }
+    }
 }

src/Core/Entities/Device.cs

@@ -1,24 +1,25 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Device : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid UserId { get; set; }
-    [MaxLength(50)]
-    public string Name { get; set; }
-    public Enums.DeviceType Type { get; set; }
-    [MaxLength(50)]
-    public string Identifier { get; set; }
-    [MaxLength(255)]
-    public string PushToken { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Device : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid UserId { get; set; }
+        [MaxLength(50)]
+        public string Name { get; set; }
+        public Enums.DeviceType Type { get; set; }
+        [MaxLength(50)]
+        public string Identifier { get; set; }
+        [MaxLength(255)]
+        public string PushToken { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/EmergencyAccess.cs

@@ -2,45 +2,46 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class EmergencyAccess : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid GrantorId { get; set; }
-    public Guid? GranteeId { get; set; }
-    [MaxLength(256)]
-    public string Email { get; set; }
-    public string KeyEncrypted { get; set; }
-    public EmergencyAccessType Type { get; set; }
-    public EmergencyAccessStatusType Status { get; set; }
-    public int WaitTimeDays { get; set; }
-    public DateTime? RecoveryInitiatedDate { get; set; }
-    public DateTime? LastNotificationDate { get; set; }
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class EmergencyAccess : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
-    }
+        public Guid Id { get; set; }
+        public Guid GrantorId { get; set; }
+        public Guid? GranteeId { get; set; }
+        [MaxLength(256)]
+        public string Email { get; set; }
+        public string KeyEncrypted { get; set; }
+        public EmergencyAccessType Type { get; set; }
+        public EmergencyAccessStatusType Status { get; set; }
+        public int WaitTimeDays { get; set; }
+        public DateTime? RecoveryInitiatedDate { get; set; }
+        public DateTime? LastNotificationDate { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
 
-    public EmergencyAccess ToEmergencyAccess()
-    {
-        return new EmergencyAccess
+        public void SetNewId()
         {
-            Id = Id,
-            GrantorId = GrantorId,
-            GranteeId = GranteeId,
-            Email = Email,
-            KeyEncrypted = KeyEncrypted,
-            Type = Type,
-            Status = Status,
-            WaitTimeDays = WaitTimeDays,
-            RecoveryInitiatedDate = RecoveryInitiatedDate,
-            LastNotificationDate = LastNotificationDate,
-            CreationDate = CreationDate,
-            RevisionDate = RevisionDate,
-        };
+            Id = CoreHelpers.GenerateComb();
+        }
+
+        public EmergencyAccess ToEmergencyAccess()
+        {
+            return new EmergencyAccess
+            {
+                Id = Id,
+                GrantorId = GrantorId,
+                GranteeId = GranteeId,
+                Email = Email,
+                KeyEncrypted = KeyEncrypted,
+                Type = Type,
+                Status = Status,
+                WaitTimeDays = WaitTimeDays,
+                RecoveryInitiatedDate = RecoveryInitiatedDate,
+                LastNotificationDate = LastNotificationDate,
+                CreationDate = CreationDate,
+                RevisionDate = RevisionDate,
+            };
+        }
     }
 }

src/Core/Entities/Event.cs

@@ -3,53 +3,54 @@ using Bit.Core.Enums;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Event : ITableObject<Guid>, IEvent
+namespace Bit.Core.Entities
 {
-    public Event() { }
-
-    public Event(IEvent e)
+    public class Event : ITableObject<Guid>, IEvent
     {
-        Date = e.Date;
-        Type = e.Type;
-        UserId = e.UserId;
-        OrganizationId = e.OrganizationId;
-        ProviderId = e.ProviderId;
-        CipherId = e.CipherId;
-        CollectionId = e.CollectionId;
-        PolicyId = e.PolicyId;
-        GroupId = e.GroupId;
-        OrganizationUserId = e.OrganizationUserId;
-        InstallationId = e.InstallationId;
-        ProviderUserId = e.ProviderUserId;
-        ProviderOrganizationId = e.ProviderOrganizationId;
-        DeviceType = e.DeviceType;
-        IpAddress = e.IpAddress;
-        ActingUserId = e.ActingUserId;
-    }
+        public Event() { }
 
-    public Guid Id { get; set; }
-    public DateTime Date { get; set; }
-    public EventType Type { get; set; }
-    public Guid? UserId { get; set; }
-    public Guid? OrganizationId { get; set; }
-    public Guid? InstallationId { get; set; }
-    public Guid? ProviderId { get; set; }
-    public Guid? CipherId { get; set; }
-    public Guid? CollectionId { get; set; }
-    public Guid? PolicyId { get; set; }
-    public Guid? GroupId { get; set; }
-    public Guid? OrganizationUserId { get; set; }
-    public Guid? ProviderUserId { get; set; }
-    public Guid? ProviderOrganizationId { get; set; }
-    public DeviceType? DeviceType { get; set; }
-    [MaxLength(50)]
-    public string IpAddress { get; set; }
-    public Guid? ActingUserId { get; set; }
+        public Event(IEvent e)
+        {
+            Date = e.Date;
+            Type = e.Type;
+            UserId = e.UserId;
+            OrganizationId = e.OrganizationId;
+            ProviderId = e.ProviderId;
+            CipherId = e.CipherId;
+            CollectionId = e.CollectionId;
+            PolicyId = e.PolicyId;
+            GroupId = e.GroupId;
+            OrganizationUserId = e.OrganizationUserId;
+            InstallationId = e.InstallationId;
+            ProviderUserId = e.ProviderUserId;
+            ProviderOrganizationId = e.ProviderOrganizationId;
+            DeviceType = e.DeviceType;
+            IpAddress = e.IpAddress;
+            ActingUserId = e.ActingUserId;
+        }
 
-    public void SetNewId()
-    {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public DateTime Date { get; set; }
+        public EventType Type { get; set; }
+        public Guid? UserId { get; set; }
+        public Guid? OrganizationId { get; set; }
+        public Guid? InstallationId { get; set; }
+        public Guid? ProviderId { get; set; }
+        public Guid? CipherId { get; set; }
+        public Guid? CollectionId { get; set; }
+        public Guid? PolicyId { get; set; }
+        public Guid? GroupId { get; set; }
+        public Guid? OrganizationUserId { get; set; }
+        public Guid? ProviderUserId { get; set; }
+        public Guid? ProviderOrganizationId { get; set; }
+        public DeviceType? DeviceType { get; set; }
+        [MaxLength(50)]
+        public string IpAddress { get; set; }
+        public Guid? ActingUserId { get; set; }
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/Folder.cs

@@ -1,17 +1,18 @@
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Folder : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid UserId { get; set; }
-    public string Name { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Folder : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid UserId { get; set; }
+        public string Name { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/Grant.cs

@@ -1,23 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Entities;
-
-public class Grant
+namespace Bit.Core.Entities
 {
-    [MaxLength(200)]
-    public string Key { get; set; }
-    [MaxLength(50)]
-    public string Type { get; set; }
-    [MaxLength(200)]
-    public string SubjectId { get; set; }
-    [MaxLength(100)]
-    public string SessionId { get; set; }
-    [MaxLength(200)]
-    public string ClientId { get; set; }
-    [MaxLength(200)]
-    public string Description { get; set; }
-    public DateTime CreationDate { get; set; }
-    public DateTime? ExpirationDate { get; set; }
-    public DateTime? ConsumedDate { get; set; }
-    public string Data { get; set; }
+    public class Grant
+    {
+        [MaxLength(200)]
+        public string Key { get; set; }
+        [MaxLength(50)]
+        public string Type { get; set; }
+        [MaxLength(200)]
+        public string SubjectId { get; set; }
+        [MaxLength(100)]
+        public string SessionId { get; set; }
+        [MaxLength(200)]
+        public string ClientId { get; set; }
+        [MaxLength(200)]
+        public string Description { get; set; }
+        public DateTime CreationDate { get; set; }
+        public DateTime? ExpirationDate { get; set; }
+        public DateTime? ConsumedDate { get; set; }
+        public string Data { get; set; }
+    }
 }

src/Core/Entities/Group.cs

@@ -2,22 +2,23 @@
 using Bit.Core.Models;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Group : ITableObject<Guid>, IExternal
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid OrganizationId { get; set; }
-    [MaxLength(100)]
-    public string Name { get; set; }
-    public bool AccessAll { get; set; }
-    [MaxLength(300)]
-    public string ExternalId { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Group : ITableObject<Guid>, IExternal
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
+        [MaxLength(100)]
+        public string Name { get; set; }
+        public bool AccessAll { get; set; }
+        [MaxLength(300)]
+        public string ExternalId { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/GroupUser.cs

@@ -1,7 +1,8 @@
-namespace Bit.Core.Entities;
-
-public class GroupUser
+namespace Bit.Core.Entities
 {
-    public Guid GroupId { get; set; }
-    public Guid OrganizationUserId { get; set; }
+    public class GroupUser
+    {
+        public Guid GroupId { get; set; }
+        public Guid OrganizationUserId { get; set; }
+    }
 }

src/Core/Entities/IReferenceable.cs

@@ -1,8 +1,9 @@
-namespace Bit.Core.Entities;
-
-public interface IReferenceable
+namespace Bit.Core.Entities
 {
-    Guid Id { get; set; }
-    string ReferenceData { get; set; }
-    bool IsUser();
+    public interface IReferenceable
+    {
+        Guid Id { get; set; }
+        string ReferenceData { get; set; }
+        bool IsUser();
+    }
 }

src/Core/Entities/IRevisable.cs

@@ -1,7 +1,8 @@
-namespace Bit.Core.Entities;
-
-public interface IRevisable
+namespace Bit.Core.Entities
 {
-    DateTime CreationDate { get; }
-    DateTime RevisionDate { get; }
+    public interface IRevisable
+    {
+        DateTime CreationDate { get; }
+        DateTime RevisionDate { get; }
+    }
 }

src/Core/Entities/IStorable.cs

@@ -1,9 +1,10 @@
-namespace Bit.Core.Entities;
-
-public interface IStorable
+namespace Bit.Core.Entities
 {
-    long? Storage { get; set; }
-    short? MaxStorageGb { get; set; }
-    long StorageBytesRemaining();
-    long StorageBytesRemaining(short maxStorageGb);
+    public interface IStorable
+    {
+        long? Storage { get; set; }
+        short? MaxStorageGb { get; set; }
+        long StorageBytesRemaining();
+        long StorageBytesRemaining(short maxStorageGb);
+    }
 }

src/Core/Entities/IStorableSubscriber.cs

@@ -1,4 +1,5 @@
-namespace Bit.Core.Entities;
-
-public interface IStorableSubscriber : IStorable, ISubscriber
-{ }
+namespace Bit.Core.Entities
+{
+    public interface IStorableSubscriber : IStorable, ISubscriber
+    { }
+}

src/Core/Entities/ISubscriber.cs

@@ -1,17 +1,18 @@
 using Bit.Core.Enums;
 
-namespace Bit.Core.Entities;
-
-public interface ISubscriber
+namespace Bit.Core.Entities
 {
-    Guid Id { get; }
-    GatewayType? Gateway { get; set; }
-    string GatewayCustomerId { get; set; }
-    string GatewaySubscriptionId { get; set; }
-    string BillingEmailAddress();
-    string BillingName();
-    string BraintreeCustomerIdPrefix();
-    string BraintreeIdField();
-    string GatewayIdField();
-    bool IsUser();
+    public interface ISubscriber
+    {
+        Guid Id { get; }
+        GatewayType? Gateway { get; set; }
+        string GatewayCustomerId { get; set; }
+        string GatewaySubscriptionId { get; set; }
+        string BillingEmailAddress();
+        string BillingName();
+        string BraintreeCustomerIdPrefix();
+        string BraintreeIdField();
+        string GatewayIdField();
+        bool IsUser();
+    }
 }

src/Core/Entities/ITableObject.cs

@@ -1,7 +1,8 @@
-namespace Bit.Core.Entities;
-
-public interface ITableObject<T> where T : IEquatable<T>
+namespace Bit.Core.Entities
 {
-    T Id { get; set; }
-    void SetNewId();
+    public interface ITableObject<T> where T : IEquatable<T>
+    {
+        T Id { get; set; }
+        void SetNewId();
+    }
 }

src/Core/Entities/Installation.cs

@@ -1,20 +1,21 @@
 using System.ComponentModel.DataAnnotations;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Installation : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    [MaxLength(256)]
-    public string Email { get; set; }
-    [MaxLength(150)]
-    public string Key { get; set; }
-    public bool Enabled { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Installation : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        [MaxLength(256)]
+        public string Email { get; set; }
+        [MaxLength(150)]
+        public string Key { get; set; }
+        public bool Enabled { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/Organization.cs

@@ -4,195 +4,196 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Organization : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable, IReferenceable
+namespace Bit.Core.Entities
 {
-    private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
-
-    public Guid Id { get; set; }
-    [MaxLength(50)]
-    public string Identifier { get; set; }
-    [MaxLength(50)]
-    public string Name { get; set; }
-    [MaxLength(50)]
-    public string BusinessName { get; set; }
-    [MaxLength(50)]
-    public string BusinessAddress1 { get; set; }
-    [MaxLength(50)]
-    public string BusinessAddress2 { get; set; }
-    [MaxLength(50)]
-    public string BusinessAddress3 { get; set; }
-    [MaxLength(2)]
-    public string BusinessCountry { get; set; }
-    [MaxLength(30)]
-    public string BusinessTaxNumber { get; set; }
-    [MaxLength(256)]
-    public string BillingEmail { get; set; }
-    [MaxLength(50)]
-    public string Plan { get; set; }
-    public PlanType PlanType { get; set; }
-    public int? Seats { get; set; }
-    public short? MaxCollections { get; set; }
-    public bool UsePolicies { get; set; }
-    public bool UseSso { get; set; }
-    public bool UseKeyConnector { get; set; }
-    public bool UseScim { get; set; }
-    public bool UseGroups { get; set; }
-    public bool UseDirectory { get; set; }
-    public bool UseEvents { get; set; }
-    public bool UseTotp { get; set; }
-    public bool Use2fa { get; set; }
-    public bool UseApi { get; set; }
-    public bool UseResetPassword { get; set; }
-    public bool SelfHost { get; set; }
-    public bool UsersGetPremium { get; set; }
-    public long? Storage { get; set; }
-    public short? MaxStorageGb { get; set; }
-    public GatewayType? Gateway { get; set; }
-    [MaxLength(50)]
-    public string GatewayCustomerId { get; set; }
-    [MaxLength(50)]
-    public string GatewaySubscriptionId { get; set; }
-    public string ReferenceData { get; set; }
-    public bool Enabled { get; set; } = true;
-    [MaxLength(100)]
-    public string LicenseKey { get; set; }
-    public string PublicKey { get; set; }
-    public string PrivateKey { get; set; }
-    public string TwoFactorProviders { get; set; }
-    public DateTime? ExpirationDate { get; set; }
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
-    public int? MaxAutoscaleSeats { get; set; } = null;
-    public DateTime? OwnersNotifiedOfAutoscaling { get; set; } = null;
-
-    public void SetNewId()
+    public class Organization : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable, IReferenceable
     {
-        if (Id == default(Guid))
+        private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
+
+        public Guid Id { get; set; }
+        [MaxLength(50)]
+        public string Identifier { get; set; }
+        [MaxLength(50)]
+        public string Name { get; set; }
+        [MaxLength(50)]
+        public string BusinessName { get; set; }
+        [MaxLength(50)]
+        public string BusinessAddress1 { get; set; }
+        [MaxLength(50)]
+        public string BusinessAddress2 { get; set; }
+        [MaxLength(50)]
+        public string BusinessAddress3 { get; set; }
+        [MaxLength(2)]
+        public string BusinessCountry { get; set; }
+        [MaxLength(30)]
+        public string BusinessTaxNumber { get; set; }
+        [MaxLength(256)]
+        public string BillingEmail { get; set; }
+        [MaxLength(50)]
+        public string Plan { get; set; }
+        public PlanType PlanType { get; set; }
+        public int? Seats { get; set; }
+        public short? MaxCollections { get; set; }
+        public bool UsePolicies { get; set; }
+        public bool UseSso { get; set; }
+        public bool UseKeyConnector { get; set; }
+        public bool UseScim { get; set; }
+        public bool UseGroups { get; set; }
+        public bool UseDirectory { get; set; }
+        public bool UseEvents { get; set; }
+        public bool UseTotp { get; set; }
+        public bool Use2fa { get; set; }
+        public bool UseApi { get; set; }
+        public bool UseResetPassword { get; set; }
+        public bool SelfHost { get; set; }
+        public bool UsersGetPremium { get; set; }
+        public long? Storage { get; set; }
+        public short? MaxStorageGb { get; set; }
+        public GatewayType? Gateway { get; set; }
+        [MaxLength(50)]
+        public string GatewayCustomerId { get; set; }
+        [MaxLength(50)]
+        public string GatewaySubscriptionId { get; set; }
+        public string ReferenceData { get; set; }
+        public bool Enabled { get; set; } = true;
+        [MaxLength(100)]
+        public string LicenseKey { get; set; }
+        public string PublicKey { get; set; }
+        public string PrivateKey { get; set; }
+        public string TwoFactorProviders { get; set; }
+        public DateTime? ExpirationDate { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+        public int? MaxAutoscaleSeats { get; set; } = null;
+        public DateTime? OwnersNotifiedOfAutoscaling { get; set; } = null;
+
+        public void SetNewId()
         {
-            Id = CoreHelpers.GenerateComb();
-        }
-    }
-
-    public string BillingEmailAddress()
-    {
-        return BillingEmail?.ToLowerInvariant()?.Trim();
-    }
-
-    public string BillingName()
-    {
-        return BusinessName;
-    }
-
-    public string BraintreeCustomerIdPrefix()
-    {
-        return "o";
-    }
-
-    public string BraintreeIdField()
-    {
-        return "organization_id";
-    }
-
-    public string GatewayIdField()
-    {
-        return "organizationId";
-    }
-
-    public bool IsUser()
-    {
-        return false;
-    }
-
-    public long StorageBytesRemaining()
-    {
-        if (!MaxStorageGb.HasValue)
-        {
-            return 0;
-        }
-
-        return StorageBytesRemaining(MaxStorageGb.Value);
-    }
-
-    public long StorageBytesRemaining(short maxStorageGb)
-    {
-        var maxStorageBytes = maxStorageGb * 1073741824L;
-        if (!Storage.HasValue)
-        {
-            return maxStorageBytes;
-        }
-
-        return maxStorageBytes - Storage.Value;
-    }
-
-    public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
-    {
-        if (string.IsNullOrWhiteSpace(TwoFactorProviders))
-        {
-            return null;
-        }
-
-        try
-        {
-            if (_twoFactorProviders == null)
+            if (Id == default(Guid))
             {
-                _twoFactorProviders =
-                    JsonHelpers.LegacyDeserialize<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
-                        TwoFactorProviders);
+                Id = CoreHelpers.GenerateComb();
+            }
+        }
+
+        public string BillingEmailAddress()
+        {
+            return BillingEmail?.ToLowerInvariant()?.Trim();
+        }
+
+        public string BillingName()
+        {
+            return BusinessName;
+        }
+
+        public string BraintreeCustomerIdPrefix()
+        {
+            return "o";
+        }
+
+        public string BraintreeIdField()
+        {
+            return "organization_id";
+        }
+
+        public string GatewayIdField()
+        {
+            return "organizationId";
+        }
+
+        public bool IsUser()
+        {
+            return false;
+        }
+
+        public long StorageBytesRemaining()
+        {
+            if (!MaxStorageGb.HasValue)
+            {
+                return 0;
             }
 
-            return _twoFactorProviders;
+            return StorageBytesRemaining(MaxStorageGb.Value);
         }
-        catch (JsonException)
+
+        public long StorageBytesRemaining(short maxStorageGb)
         {
-            return null;
-        }
-    }
+            var maxStorageBytes = maxStorageGb * 1073741824L;
+            if (!Storage.HasValue)
+            {
+                return maxStorageBytes;
+            }
 
-    public void SetTwoFactorProviders(Dictionary<TwoFactorProviderType, TwoFactorProvider> providers)
-    {
-        if (!providers.Any())
+            return maxStorageBytes - Storage.Value;
+        }
+
+        public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
         {
-            TwoFactorProviders = null;
-            _twoFactorProviders = null;
-            return;
+            if (string.IsNullOrWhiteSpace(TwoFactorProviders))
+            {
+                return null;
+            }
+
+            try
+            {
+                if (_twoFactorProviders == null)
+                {
+                    _twoFactorProviders =
+                        JsonHelpers.LegacyDeserialize<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
+                            TwoFactorProviders);
+                }
+
+                return _twoFactorProviders;
+            }
+            catch (JsonException)
+            {
+                return null;
+            }
         }
 
-        TwoFactorProviders = JsonHelpers.LegacySerialize(providers, JsonHelpers.LegacyEnumKeyResolver);
-        _twoFactorProviders = providers;
-    }
-
-    public bool TwoFactorProviderIsEnabled(TwoFactorProviderType provider)
-    {
-        var providers = GetTwoFactorProviders();
-        if (providers == null || !providers.ContainsKey(provider))
+        public void SetTwoFactorProviders(Dictionary<TwoFactorProviderType, TwoFactorProvider> providers)
         {
-            return false;
+            if (!providers.Any())
+            {
+                TwoFactorProviders = null;
+                _twoFactorProviders = null;
+                return;
+            }
+
+            TwoFactorProviders = JsonHelpers.LegacySerialize(providers, JsonHelpers.LegacyEnumKeyResolver);
+            _twoFactorProviders = providers;
         }
 
-        return providers[provider].Enabled && Use2fa;
-    }
-
-    public bool TwoFactorIsEnabled()
-    {
-        var providers = GetTwoFactorProviders();
-        if (providers == null)
+        public bool TwoFactorProviderIsEnabled(TwoFactorProviderType provider)
         {
-            return false;
+            var providers = GetTwoFactorProviders();
+            if (providers == null || !providers.ContainsKey(provider))
+            {
+                return false;
+            }
+
+            return providers[provider].Enabled && Use2fa;
         }
 
-        return providers.Any(p => (p.Value?.Enabled ?? false) && Use2fa);
-    }
-
-    public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)
-    {
-        var providers = GetTwoFactorProviders();
-        if (providers == null || !providers.ContainsKey(provider))
+        public bool TwoFactorIsEnabled()
         {
-            return null;
+            var providers = GetTwoFactorProviders();
+            if (providers == null)
+            {
+                return false;
+            }
+
+            return providers.Any(p => (p.Value?.Enabled ?? false) && Use2fa);
         }
 
-        return providers[provider];
+        public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)
+        {
+            var providers = GetTwoFactorProviders();
+            if (providers == null || !providers.ContainsKey(provider))
+            {
+                return null;
+            }
+
+            return providers[provider];
+        }
     }
 }

src/Core/Entities/OrganizationApiKey.cs

@@ -2,19 +2,20 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class OrganizationApiKey : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid OrganizationId { get; set; }
-    public OrganizationApiKeyType Type { get; set; }
-    [MaxLength(30)]
-    public string ApiKey { get; set; }
-    public DateTime RevisionDate { get; set; }
-
-    public void SetNewId()
+    public class OrganizationApiKey : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
+        public OrganizationApiKeyType Type { get; set; }
+        [MaxLength(30)]
+        public string ApiKey { get; set; }
+        public DateTime RevisionDate { get; set; }
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/OrganizationConnection.cs

@@ -2,44 +2,45 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class OrganizationConnection<T> : OrganizationConnection where T : new()
+namespace Bit.Core.Entities
 {
-    public new T Config
+    public class OrganizationConnection<T> : OrganizationConnection where T : new()
     {
-        get => base.GetConfig<T>();
-        set => base.SetConfig<T>(value);
-    }
-}
-
-public class OrganizationConnection : ITableObject<Guid>
-{
-    public Guid Id { get; set; }
-    public OrganizationConnectionType Type { get; set; }
-    public Guid OrganizationId { get; set; }
-    public bool Enabled { get; set; }
-    public string Config { get; set; }
-
-    public void SetNewId()
-    {
-        Id = CoreHelpers.GenerateComb();
-    }
-
-    public T GetConfig<T>() where T : new()
-    {
-        try
+        public new T Config
         {
-            return JsonSerializer.Deserialize<T>(Config);
-        }
-        catch (JsonException)
-        {
-            return default;
+            get => base.GetConfig<T>();
+            set => base.SetConfig<T>(value);
         }
     }
 
-    public void SetConfig<T>(T config) where T : new()
+    public class OrganizationConnection : ITableObject<Guid>
     {
-        Config = JsonSerializer.Serialize(config);
+        public Guid Id { get; set; }
+        public OrganizationConnectionType Type { get; set; }
+        public Guid OrganizationId { get; set; }
+        public bool Enabled { get; set; }
+        public string Config { get; set; }
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
+
+        public T GetConfig<T>() where T : new()
+        {
+            try
+            {
+                return JsonSerializer.Deserialize<T>(Config);
+            }
+            catch (JsonException)
+            {
+                return default;
+            }
+        }
+
+        public void SetConfig<T>(T config) where T : new()
+        {
+            Config = JsonSerializer.Serialize(config);
+        }
     }
 }

src/Core/Entities/OrganizationSponsorship.cs

@@ -2,25 +2,26 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class OrganizationSponsorship : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid? SponsoringOrganizationId { get; set; }
-    public Guid SponsoringOrganizationUserId { get; set; }
-    public Guid? SponsoredOrganizationId { get; set; }
-    [MaxLength(256)]
-    public string FriendlyName { get; set; }
-    [MaxLength(256)]
-    public string OfferedToEmail { get; set; }
-    public PlanSponsorshipType? PlanSponsorshipType { get; set; }
-    public DateTime? LastSyncDate { get; set; }
-    public DateTime? ValidUntil { get; set; }
-    public bool ToDelete { get; set; }
-
-    public void SetNewId()
+    public class OrganizationSponsorship : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid? SponsoringOrganizationId { get; set; }
+        public Guid SponsoringOrganizationUserId { get; set; }
+        public Guid? SponsoredOrganizationId { get; set; }
+        [MaxLength(256)]
+        public string FriendlyName { get; set; }
+        [MaxLength(256)]
+        public string OfferedToEmail { get; set; }
+        public PlanSponsorshipType? PlanSponsorshipType { get; set; }
+        public DateTime? LastSyncDate { get; set; }
+        public DateTime? ValidUntil { get; set; }
+        public bool ToDelete { get; set; }
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/OrganizationUser.cs

@@ -3,28 +3,29 @@ using Bit.Core.Enums;
 using Bit.Core.Models;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class OrganizationUser : ITableObject<Guid>, IExternal
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid OrganizationId { get; set; }
-    public Guid? UserId { get; set; }
-    [MaxLength(256)]
-    public string Email { get; set; }
-    public string Key { get; set; }
-    public string ResetPasswordKey { get; set; }
-    public OrganizationUserStatusType Status { get; set; }
-    public OrganizationUserType Type { get; set; }
-    public bool AccessAll { get; set; }
-    [MaxLength(300)]
-    public string ExternalId { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-    public string Permissions { get; set; }
-
-    public void SetNewId()
+    public class OrganizationUser : ITableObject<Guid>, IExternal
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
+        public Guid? UserId { get; set; }
+        [MaxLength(256)]
+        public string Email { get; set; }
+        public string Key { get; set; }
+        public string ResetPasswordKey { get; set; }
+        public OrganizationUserStatusType Status { get; set; }
+        public OrganizationUserType Type { get; set; }
+        public bool AccessAll { get; set; }
+        [MaxLength(300)]
+        public string ExternalId { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public string Permissions { get; set; }
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/Policy.cs

@@ -2,30 +2,31 @@
 using Bit.Core.Models.Data.Organizations.Policies;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Policy : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid OrganizationId { get; set; }
-    public PolicyType Type { get; set; }
-    public string Data { get; set; }
-    public bool Enabled { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Policy : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
-    }
+        public Guid Id { get; set; }
+        public Guid OrganizationId { get; set; }
+        public PolicyType Type { get; set; }
+        public string Data { get; set; }
+        public bool Enabled { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
 
-    public T GetDataModel<T>() where T : IPolicyDataModel, new()
-    {
-        return CoreHelpers.LoadClassFromJsonData<T>(Data);
-    }
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
 
-    public void SetDataModel<T>(T dataModel) where T : IPolicyDataModel, new()
-    {
-        Data = CoreHelpers.ClassToJsonData(dataModel);
+        public T GetDataModel<T>() where T : IPolicyDataModel, new()
+        {
+            return CoreHelpers.LoadClassFromJsonData<T>(Data);
+        }
+
+        public void SetDataModel<T>(T dataModel) where T : IPolicyDataModel, new()
+        {
+            Data = CoreHelpers.ClassToJsonData(dataModel);
+        }
     }
 }

src/Core/Entities/Provider/Provider.cs

@@ -1,30 +1,31 @@
 using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities.Provider;
-
-public class Provider : ITableObject<Guid>
+namespace Bit.Core.Entities.Provider
 {
-    public Guid Id { get; set; }
-    public string Name { get; set; }
-    public string BusinessName { get; set; }
-    public string BusinessAddress1 { get; set; }
-    public string BusinessAddress2 { get; set; }
-    public string BusinessAddress3 { get; set; }
-    public string BusinessCountry { get; set; }
-    public string BusinessTaxNumber { get; set; }
-    public string BillingEmail { get; set; }
-    public ProviderStatusType Status { get; set; }
-    public bool UseEvents { get; set; }
-    public bool Enabled { get; set; } = true;
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Provider : ITableObject<Guid>
     {
-        if (Id == default)
+        public Guid Id { get; set; }
+        public string Name { get; set; }
+        public string BusinessName { get; set; }
+        public string BusinessAddress1 { get; set; }
+        public string BusinessAddress2 { get; set; }
+        public string BusinessAddress3 { get; set; }
+        public string BusinessCountry { get; set; }
+        public string BusinessTaxNumber { get; set; }
+        public string BillingEmail { get; set; }
+        public ProviderStatusType Status { get; set; }
+        public bool UseEvents { get; set; }
+        public bool Enabled { get; set; } = true;
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
         {
-            Id = CoreHelpers.GenerateComb();
+            if (Id == default)
+            {
+                Id = CoreHelpers.GenerateComb();
+            }
         }
     }
 }

src/Core/Entities/Provider/ProviderOrganization.cs

@@ -1,22 +1,23 @@
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities.Provider;
-
-public class ProviderOrganization : ITableObject<Guid>
+namespace Bit.Core.Entities.Provider
 {
-    public Guid Id { get; set; }
-    public Guid ProviderId { get; set; }
-    public Guid OrganizationId { get; set; }
-    public string Key { get; set; }
-    public string Settings { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class ProviderOrganization : ITableObject<Guid>
     {
-        if (Id == default)
+        public Guid Id { get; set; }
+        public Guid ProviderId { get; set; }
+        public Guid OrganizationId { get; set; }
+        public string Key { get; set; }
+        public string Settings { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
         {
-            Id = CoreHelpers.GenerateComb();
+            if (Id == default)
+            {
+                Id = CoreHelpers.GenerateComb();
+            }
         }
     }
 }

src/Core/Entities/Provider/ProviderUser.cs

@@ -1,26 +1,27 @@
 using Bit.Core.Enums.Provider;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities.Provider;
-
-public class ProviderUser : ITableObject<Guid>
+namespace Bit.Core.Entities.Provider
 {
-    public Guid Id { get; set; }
-    public Guid ProviderId { get; set; }
-    public Guid? UserId { get; set; }
-    public string Email { get; set; }
-    public string Key { get; set; }
-    public ProviderUserStatusType Status { get; set; }
-    public ProviderUserType Type { get; set; }
-    public string Permissions { get; set; }
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class ProviderUser : ITableObject<Guid>
     {
-        if (Id == default)
+        public Guid Id { get; set; }
+        public Guid ProviderId { get; set; }
+        public Guid? UserId { get; set; }
+        public string Email { get; set; }
+        public string Key { get; set; }
+        public ProviderUserStatusType Status { get; set; }
+        public ProviderUserType Type { get; set; }
+        public string Permissions { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+
+        public void SetNewId()
         {
-            Id = CoreHelpers.GenerateComb();
+            if (Id == default)
+            {
+                Id = CoreHelpers.GenerateComb();
+            }
         }
     }
 }

src/Core/Entities/Role.cs

@@ -1,9 +1,10 @@
-namespace Bit.Core.Entities;
-
-/// <summary>
-/// This class is not used. It is implemented to make the Identity provider happy.
-/// </summary>
-public class Role
+namespace Bit.Core.Entities
 {
-    public string Name { get; set; }
+    /// <summary>
+    /// This class is not used. It is implemented to make the Identity provider happy.
+    /// </summary>
+    public class Role
+    {
+        public string Name { get; set; }
+    }
 }

src/Core/Entities/Send.cs

@@ -2,29 +2,30 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Send : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid? UserId { get; set; }
-    public Guid? OrganizationId { get; set; }
-    public SendType Type { get; set; }
-    public string Data { get; set; }
-    public string Key { get; set; }
-    [MaxLength(300)]
-    public string Password { get; set; }
-    public int? MaxAccessCount { get; set; }
-    public int AccessCount { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime? ExpirationDate { get; set; }
-    public DateTime DeletionDate { get; set; }
-    public bool Disabled { get; set; }
-    public bool? HideEmail { get; set; }
-
-    public void SetNewId()
+    public class Send : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid? UserId { get; set; }
+        public Guid? OrganizationId { get; set; }
+        public SendType Type { get; set; }
+        public string Data { get; set; }
+        public string Key { get; set; }
+        [MaxLength(300)]
+        public string Password { get; set; }
+        public int? MaxAccessCount { get; set; }
+        public int AccessCount { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime? ExpirationDate { get; set; }
+        public DateTime DeletionDate { get; set; }
+        public bool Disabled { get; set; }
+        public bool? HideEmail { get; set; }
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/SsoConfig.cs

@@ -1,29 +1,30 @@
 using Bit.Core.Models.Data;
 
-namespace Bit.Core.Entities;
-
-public class SsoConfig : ITableObject<long>
+namespace Bit.Core.Entities
 {
-    public long Id { get; set; }
-    public bool Enabled { get; set; } = true;
-    public Guid OrganizationId { get; set; }
-    public string Data { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class SsoConfig : ITableObject<long>
     {
-        // int will be auto-populated
-        Id = 0;
-    }
+        public long Id { get; set; }
+        public bool Enabled { get; set; } = true;
+        public Guid OrganizationId { get; set; }
+        public string Data { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; internal set; } = DateTime.UtcNow;
 
-    public SsoConfigurationData GetData()
-    {
-        return SsoConfigurationData.Deserialize(Data);
-    }
+        public void SetNewId()
+        {
+            // int will be auto-populated
+            Id = 0;
+        }
 
-    public void SetData(SsoConfigurationData data)
-    {
-        Data = data.Serialize();
+        public SsoConfigurationData GetData()
+        {
+            return SsoConfigurationData.Deserialize(Data);
+        }
+
+        public void SetData(SsoConfigurationData data)
+        {
+            Data = data.Serialize();
+        }
     }
 }

src/Core/Entities/SsoUser.cs

@@ -1,19 +1,20 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Entities;
-
-public class SsoUser : ITableObject<long>
+namespace Bit.Core.Entities
 {
-    public long Id { get; set; }
-    public Guid UserId { get; set; }
-    public Guid? OrganizationId { get; set; }
-    [MaxLength(50)]
-    public string ExternalId { get; set; }
-    public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class SsoUser : ITableObject<long>
     {
-        // int will be auto-populated
-        Id = 0;
+        public long Id { get; set; }
+        public Guid UserId { get; set; }
+        public Guid? OrganizationId { get; set; }
+        [MaxLength(50)]
+        public string ExternalId { get; set; }
+        public DateTime CreationDate { get; internal set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            // int will be auto-populated
+            Id = 0;
+        }
     }
 }

src/Core/Entities/TaxRate.cs

@@ -1,23 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 
-namespace Bit.Core.Entities;
-
-public class TaxRate : ITableObject<string>
+namespace Bit.Core.Entities
 {
-    [MaxLength(40)]
-    public string Id { get; set; }
-    [MaxLength(50)]
-    public string Country { get; set; }
-    [MaxLength(2)]
-    public string State { get; set; }
-    [MaxLength(10)]
-    public string PostalCode { get; set; }
-    public decimal Rate { get; set; }
-    public bool Active { get; set; }
-
-    public void SetNewId()
+    public class TaxRate : ITableObject<string>
     {
-        // Id is created by Stripe, should exist before this gets called
-        return;
+        [MaxLength(40)]
+        public string Id { get; set; }
+        [MaxLength(50)]
+        public string Country { get; set; }
+        [MaxLength(2)]
+        public string State { get; set; }
+        [MaxLength(10)]
+        public string PostalCode { get; set; }
+        public decimal Rate { get; set; }
+        public bool Active { get; set; }
+
+        public void SetNewId()
+        {
+            // Id is created by Stripe, should exist before this gets called
+            return;
+        }
     }
 }

src/Core/Entities/Transaction.cs

@@ -2,27 +2,28 @@
 using Bit.Core.Enums;
 using Bit.Core.Utilities;
 
-namespace Bit.Core.Entities;
-
-public class Transaction : ITableObject<Guid>
+namespace Bit.Core.Entities
 {
-    public Guid Id { get; set; }
-    public Guid? UserId { get; set; }
-    public Guid? OrganizationId { get; set; }
-    public TransactionType Type { get; set; }
-    public decimal Amount { get; set; }
-    public bool? Refunded { get; set; }
-    public decimal? RefundedAmount { get; set; }
-    [MaxLength(100)]
-    public string Details { get; set; }
-    public PaymentMethodType? PaymentMethodType { get; set; }
-    public GatewayType? Gateway { get; set; }
-    [MaxLength(50)]
-    public string GatewayId { get; set; }
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-
-    public void SetNewId()
+    public class Transaction : ITableObject<Guid>
     {
-        Id = CoreHelpers.GenerateComb();
+        public Guid Id { get; set; }
+        public Guid? UserId { get; set; }
+        public Guid? OrganizationId { get; set; }
+        public TransactionType Type { get; set; }
+        public decimal Amount { get; set; }
+        public bool? Refunded { get; set; }
+        public decimal? RefundedAmount { get; set; }
+        [MaxLength(100)]
+        public string Details { get; set; }
+        public PaymentMethodType? PaymentMethodType { get; set; }
+        public GatewayType? Gateway { get; set; }
+        [MaxLength(50)]
+        public string GatewayId { get; set; }
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+
+        public void SetNewId()
+        {
+            Id = CoreHelpers.GenerateComb();
+        }
     }
 }

src/Core/Entities/User.cs

@@ -5,188 +5,189 @@ using Bit.Core.Models;
 using Bit.Core.Utilities;
 using Microsoft.AspNetCore.Identity;
 
-namespace Bit.Core.Entities;
-
-public class User : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable, ITwoFactorProvidersUser, IReferenceable
+namespace Bit.Core.Entities
 {
-    private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
-
-    public Guid Id { get; set; }
-    [MaxLength(50)]
-    public string Name { get; set; }
-    [Required]
-    [MaxLength(256)]
-    public string Email { get; set; }
-    public bool EmailVerified { get; set; }
-    [MaxLength(300)]
-    public string MasterPassword { get; set; }
-    [MaxLength(50)]
-    public string MasterPasswordHint { get; set; }
-    [MaxLength(10)]
-    public string Culture { get; set; } = "en-US";
-    [Required]
-    [MaxLength(50)]
-    public string SecurityStamp { get; set; }
-    public string TwoFactorProviders { get; set; }
-    [MaxLength(32)]
-    public string TwoFactorRecoveryCode { get; set; }
-    public string EquivalentDomains { get; set; }
-    public string ExcludedGlobalEquivalentDomains { get; set; }
-    public DateTime AccountRevisionDate { get; set; } = DateTime.UtcNow;
-    public string Key { get; set; }
-    public string PublicKey { get; set; }
-    public string PrivateKey { get; set; }
-    public bool Premium { get; set; }
-    public DateTime? PremiumExpirationDate { get; set; }
-    public DateTime? RenewalReminderDate { get; set; }
-    public long? Storage { get; set; }
-    public short? MaxStorageGb { get; set; }
-    public GatewayType? Gateway { get; set; }
-    [MaxLength(50)]
-    public string GatewayCustomerId { get; set; }
-    [MaxLength(50)]
-    public string GatewaySubscriptionId { get; set; }
-    public string ReferenceData { get; set; }
-    [MaxLength(100)]
-    public string LicenseKey { get; set; }
-    [Required]
-    [MaxLength(30)]
-    public string ApiKey { get; set; }
-    public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256;
-    public int KdfIterations { get; set; } = 5000;
-    public DateTime CreationDate { get; set; } = DateTime.UtcNow;
-    public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
-    public bool ForcePasswordReset { get; set; }
-    public bool UsesKeyConnector { get; set; }
-    public int FailedLoginCount { get; set; }
-    public DateTime? LastFailedLoginDate { get; set; }
-    public bool UnknownDeviceVerificationEnabled { get; set; }
-
-    public void SetNewId()
+    public class User : ITableObject<Guid>, ISubscriber, IStorable, IStorableSubscriber, IRevisable, ITwoFactorProvidersUser, IReferenceable
     {
-        Id = CoreHelpers.GenerateComb();
-    }
+        private Dictionary<TwoFactorProviderType, TwoFactorProvider> _twoFactorProviders;
 
-    public string BillingEmailAddress()
-    {
-        return Email?.ToLowerInvariant()?.Trim();
-    }
+        public Guid Id { get; set; }
+        [MaxLength(50)]
+        public string Name { get; set; }
+        [Required]
+        [MaxLength(256)]
+        public string Email { get; set; }
+        public bool EmailVerified { get; set; }
+        [MaxLength(300)]
+        public string MasterPassword { get; set; }
+        [MaxLength(50)]
+        public string MasterPasswordHint { get; set; }
+        [MaxLength(10)]
+        public string Culture { get; set; } = "en-US";
+        [Required]
+        [MaxLength(50)]
+        public string SecurityStamp { get; set; }
+        public string TwoFactorProviders { get; set; }
+        [MaxLength(32)]
+        public string TwoFactorRecoveryCode { get; set; }
+        public string EquivalentDomains { get; set; }
+        public string ExcludedGlobalEquivalentDomains { get; set; }
+        public DateTime AccountRevisionDate { get; set; } = DateTime.UtcNow;
+        public string Key { get; set; }
+        public string PublicKey { get; set; }
+        public string PrivateKey { get; set; }
+        public bool Premium { get; set; }
+        public DateTime? PremiumExpirationDate { get; set; }
+        public DateTime? RenewalReminderDate { get; set; }
+        public long? Storage { get; set; }
+        public short? MaxStorageGb { get; set; }
+        public GatewayType? Gateway { get; set; }
+        [MaxLength(50)]
+        public string GatewayCustomerId { get; set; }
+        [MaxLength(50)]
+        public string GatewaySubscriptionId { get; set; }
+        public string ReferenceData { get; set; }
+        [MaxLength(100)]
+        public string LicenseKey { get; set; }
+        [Required]
+        [MaxLength(30)]
+        public string ApiKey { get; set; }
+        public KdfType Kdf { get; set; } = KdfType.PBKDF2_SHA256;
+        public int KdfIterations { get; set; } = 5000;
+        public DateTime CreationDate { get; set; } = DateTime.UtcNow;
+        public DateTime RevisionDate { get; set; } = DateTime.UtcNow;
+        public bool ForcePasswordReset { get; set; }
+        public bool UsesKeyConnector { get; set; }
+        public int FailedLoginCount { get; set; }
+        public DateTime? LastFailedLoginDate { get; set; }
+        public bool UnknownDeviceVerificationEnabled { get; set; }
 
-    public string BillingName()
-    {
-        return Name;
-    }
-
-    public string BraintreeCustomerIdPrefix()
-    {
-        return "u";
-    }
-
-    public string BraintreeIdField()
-    {
-        return "user_id";
-    }
-
-    public string GatewayIdField()
-    {
-        return "userId";
-    }
-
-    public bool IsUser()
-    {
-        return true;
-    }
-
-    public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
-    {
-        if (string.IsNullOrWhiteSpace(TwoFactorProviders))
+        public void SetNewId()
         {
-            return null;
+            Id = CoreHelpers.GenerateComb();
         }
 
-        try
+        public string BillingEmailAddress()
         {
-            if (_twoFactorProviders == null)
+            return Email?.ToLowerInvariant()?.Trim();
+        }
+
+        public string BillingName()
+        {
+            return Name;
+        }
+
+        public string BraintreeCustomerIdPrefix()
+        {
+            return "u";
+        }
+
+        public string BraintreeIdField()
+        {
+            return "user_id";
+        }
+
+        public string GatewayIdField()
+        {
+            return "userId";
+        }
+
+        public bool IsUser()
+        {
+            return true;
+        }
+
+        public Dictionary<TwoFactorProviderType, TwoFactorProvider> GetTwoFactorProviders()
+        {
+            if (string.IsNullOrWhiteSpace(TwoFactorProviders))
             {
-                _twoFactorProviders =
-                    JsonHelpers.LegacyDeserialize<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
-                        TwoFactorProviders);
+                return null;
             }
 
-            return _twoFactorProviders;
-        }
-        catch (JsonException)
-        {
-            return null;
-        }
-    }
+            try
+            {
+                if (_twoFactorProviders == null)
+                {
+                    _twoFactorProviders =
+                        JsonHelpers.LegacyDeserialize<Dictionary<TwoFactorProviderType, TwoFactorProvider>>(
+                            TwoFactorProviders);
+                }
 
-    public Guid? GetUserId()
-    {
-        return Id;
-    }
-
-    public bool GetPremium()
-    {
-        return Premium;
-    }
-
-    public void SetTwoFactorProviders(Dictionary<TwoFactorProviderType, TwoFactorProvider> providers)
-    {
-        // When replacing with system.text remember to remove the extra serialization in WebAuthnTokenProvider.
-        TwoFactorProviders = JsonHelpers.LegacySerialize(providers, JsonHelpers.LegacyEnumKeyResolver);
-        _twoFactorProviders = providers;
-    }
-
-    public void ClearTwoFactorProviders()
-    {
-        SetTwoFactorProviders(new Dictionary<TwoFactorProviderType, TwoFactorProvider>());
-    }
-
-    public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)
-    {
-        var providers = GetTwoFactorProviders();
-        if (providers == null || !providers.ContainsKey(provider))
-        {
-            return null;
+                return _twoFactorProviders;
+            }
+            catch (JsonException)
+            {
+                return null;
+            }
         }
 
-        return providers[provider];
-    }
-
-    public long StorageBytesRemaining()
-    {
-        if (!MaxStorageGb.HasValue)
+        public Guid? GetUserId()
         {
-            return 0;
+            return Id;
         }
 
-        return StorageBytesRemaining(MaxStorageGb.Value);
-    }
-
-    public long StorageBytesRemaining(short maxStorageGb)
-    {
-        var maxStorageBytes = maxStorageGb * 1073741824L;
-        if (!Storage.HasValue)
+        public bool GetPremium()
         {
-            return maxStorageBytes;
+            return Premium;
         }
 
-        return maxStorageBytes - Storage.Value;
-    }
-
-    public IdentityUser ToIdentityUser(bool twoFactorEnabled)
-    {
-        return new IdentityUser
+        public void SetTwoFactorProviders(Dictionary<TwoFactorProviderType, TwoFactorProvider> providers)
         {
-            Id = Id.ToString(),
-            Email = Email,
-            NormalizedEmail = Email,
-            EmailConfirmed = EmailVerified,
-            UserName = Email,
-            NormalizedUserName = Email,
-            TwoFactorEnabled = twoFactorEnabled,
-            SecurityStamp = SecurityStamp
-        };
+            // When replacing with system.text remember to remove the extra serialization in WebAuthnTokenProvider.
+            TwoFactorProviders = JsonHelpers.LegacySerialize(providers, JsonHelpers.LegacyEnumKeyResolver);
+            _twoFactorProviders = providers;
+        }
+
+        public void ClearTwoFactorProviders()
+        {
+            SetTwoFactorProviders(new Dictionary<TwoFactorProviderType, TwoFactorProvider>());
+        }
+
+        public TwoFactorProvider GetTwoFactorProvider(TwoFactorProviderType provider)
+        {
+            var providers = GetTwoFactorProviders();
+            if (providers == null || !providers.ContainsKey(provider))
+            {
+                return null;
+            }
+
+            return providers[provider];
+        }
+
+        public long StorageBytesRemaining()
+        {
+            if (!MaxStorageGb.HasValue)
+            {
+                return 0;
+            }
+
+            return StorageBytesRemaining(MaxStorageGb.Value);
+        }
+
+        public long StorageBytesRemaining(short maxStorageGb)
+        {
+            var maxStorageBytes = maxStorageGb * 1073741824L;
+            if (!Storage.HasValue)
+            {
+                return maxStorageBytes;
+            }
+
+            return maxStorageBytes - Storage.Value;
+        }
+
+        public IdentityUser ToIdentityUser(bool twoFactorEnabled)
+        {
+            return new IdentityUser
+            {
+                Id = Id.ToString(),
+                Email = Email,
+                NormalizedEmail = Email,
+                EmailConfirmed = EmailVerified,
+                UserName = Email,
+                NormalizedUserName = Email,
+                TwoFactorEnabled = twoFactorEnabled,
+                SecurityStamp = SecurityStamp
+            };
+        }
     }
 }