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/Infrastructure.Dapper/Repositories/UserRepository.cs

@@ -6,165 +6,166 @@ using Bit.Core.Repositories;
 using Bit.Core.Settings;
 using Dapper;
 
-namespace Bit.Infrastructure.Dapper.Repositories;
-
-public class UserRepository : Repository<User, Guid>, IUserRepository
+namespace Bit.Infrastructure.Dapper.Repositories
 {
-    public UserRepository(GlobalSettings globalSettings)
-        : this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
-    { }
-
-    public UserRepository(string connectionString, string readOnlyConnectionString)
-        : base(connectionString, readOnlyConnectionString)
-    { }
-
-    public override async Task<User> GetByIdAsync(Guid id)
+    public class UserRepository : Repository<User, Guid>, IUserRepository
     {
-        return await base.GetByIdAsync(id);
-    }
+        public UserRepository(GlobalSettings globalSettings)
+            : this(globalSettings.SqlServer.ConnectionString, globalSettings.SqlServer.ReadOnlyConnectionString)
+        { }
 
-    public async Task<User> GetByEmailAsync(string email)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public UserRepository(string connectionString, string readOnlyConnectionString)
+            : base(connectionString, readOnlyConnectionString)
+        { }
+
+        public override async Task<User> GetByIdAsync(Guid id)
         {
-            var results = await connection.QueryAsync<User>(
-                $"[{Schema}].[{Table}_ReadByEmail]",
-                new { Email = email },
-                commandType: CommandType.StoredProcedure);
-
-            return results.SingleOrDefault();
+            return await base.GetByIdAsync(id);
         }
-    }
 
-    public async Task<User> GetBySsoUserAsync(string externalId, Guid? organizationId)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<User> GetByEmailAsync(string email)
         {
-            var results = await connection.QueryAsync<User>(
-                $"[{Schema}].[{Table}_ReadBySsoUserOrganizationIdExternalId]",
-                new { OrganizationId = organizationId, ExternalId = externalId },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<User>(
+                    $"[{Schema}].[{Table}_ReadByEmail]",
+                    new { Email = email },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.SingleOrDefault();
+                return results.SingleOrDefault();
+            }
         }
-    }
 
-    public async Task<UserKdfInformation> GetKdfInformationByEmailAsync(string email)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<User> GetBySsoUserAsync(string externalId, Guid? organizationId)
         {
-            var results = await connection.QueryAsync<UserKdfInformation>(
-                $"[{Schema}].[{Table}_ReadKdfByEmail]",
-                new { Email = email },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<User>(
+                    $"[{Schema}].[{Table}_ReadBySsoUserOrganizationIdExternalId]",
+                    new { OrganizationId = organizationId, ExternalId = externalId },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.SingleOrDefault();
+                return results.SingleOrDefault();
+            }
         }
-    }
 
-    public async Task<ICollection<User>> SearchAsync(string email, int skip, int take)
-    {
-        using (var connection = new SqlConnection(ReadOnlyConnectionString))
+        public async Task<UserKdfInformation> GetKdfInformationByEmailAsync(string email)
         {
-            var results = await connection.QueryAsync<User>(
-                $"[{Schema}].[{Table}_Search]",
-                new { Email = email, Skip = skip, Take = take },
-                commandType: CommandType.StoredProcedure,
-                commandTimeout: 120);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<UserKdfInformation>(
+                    $"[{Schema}].[{Table}_ReadKdfByEmail]",
+                    new { Email = email },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.ToList();
+                return results.SingleOrDefault();
+            }
         }
-    }
 
-    public async Task<ICollection<User>> GetManyByPremiumAsync(bool premium)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<ICollection<User>> SearchAsync(string email, int skip, int take)
         {
-            var results = await connection.QueryAsync<User>(
-                "[dbo].[User_ReadByPremium]",
-                new { Premium = premium },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ReadOnlyConnectionString))
+            {
+                var results = await connection.QueryAsync<User>(
+                    $"[{Schema}].[{Table}_Search]",
+                    new { Email = email, Skip = skip, Take = take },
+                    commandType: CommandType.StoredProcedure,
+                    commandTimeout: 120);
 
-            return results.ToList();
+                return results.ToList();
+            }
         }
-    }
 
-    public async Task<string> GetPublicKeyAsync(Guid id)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<ICollection<User>> GetManyByPremiumAsync(bool premium)
         {
-            var results = await connection.QueryAsync<string>(
-                $"[{Schema}].[{Table}_ReadPublicKeyById]",
-                new { Id = id },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<User>(
+                    "[dbo].[User_ReadByPremium]",
+                    new { Premium = premium },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.SingleOrDefault();
+                return results.ToList();
+            }
         }
-    }
 
-    public async Task<DateTime> GetAccountRevisionDateAsync(Guid id)
-    {
-        using (var connection = new SqlConnection(ReadOnlyConnectionString))
+        public async Task<string> GetPublicKeyAsync(Guid id)
         {
-            var results = await connection.QueryAsync<DateTime>(
-                $"[{Schema}].[{Table}_ReadAccountRevisionDateById]",
-                new { Id = id },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                var results = await connection.QueryAsync<string>(
+                    $"[{Schema}].[{Table}_ReadPublicKeyById]",
+                    new { Id = id },
+                    commandType: CommandType.StoredProcedure);
 
-            return results.SingleOrDefault();
+                return results.SingleOrDefault();
+            }
         }
-    }
 
-    public override async Task ReplaceAsync(User user)
-    {
-        await base.ReplaceAsync(user);
-    }
-
-    public override async Task DeleteAsync(User user)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public async Task<DateTime> GetAccountRevisionDateAsync(Guid id)
         {
-            await connection.ExecuteAsync(
-                $"[{Schema}].[{Table}_DeleteById]",
-                new { Id = user.Id },
-                commandType: CommandType.StoredProcedure,
-                commandTimeout: 180);
+            using (var connection = new SqlConnection(ReadOnlyConnectionString))
+            {
+                var results = await connection.QueryAsync<DateTime>(
+                    $"[{Schema}].[{Table}_ReadAccountRevisionDateById]",
+                    new { Id = id },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.SingleOrDefault();
+            }
         }
-    }
 
-    public async Task UpdateStorageAsync(Guid id)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public override async Task ReplaceAsync(User user)
         {
-            await connection.ExecuteAsync(
-                $"[{Schema}].[{Table}_UpdateStorage]",
-                new { Id = id },
-                commandType: CommandType.StoredProcedure,
-                commandTimeout: 180);
+            await base.ReplaceAsync(user);
         }
-    }
 
-    public async Task UpdateRenewalReminderDateAsync(Guid id, DateTime renewalReminderDate)
-    {
-        using (var connection = new SqlConnection(ConnectionString))
+        public override async Task DeleteAsync(User user)
         {
-            await connection.ExecuteAsync(
-                $"[{Schema}].[User_UpdateRenewalReminderDate]",
-                new { Id = id, RenewalReminderDate = renewalReminderDate },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                await connection.ExecuteAsync(
+                    $"[{Schema}].[{Table}_DeleteById]",
+                    new { Id = user.Id },
+                    commandType: CommandType.StoredProcedure,
+                    commandTimeout: 180);
+            }
         }
-    }
 
-    public async Task<IEnumerable<User>> GetManyAsync(IEnumerable<Guid> ids)
-    {
-        using (var connection = new SqlConnection(ReadOnlyConnectionString))
+        public async Task UpdateStorageAsync(Guid id)
         {
-            var results = await connection.QueryAsync<User>(
-                $"[{Schema}].[{Table}_ReadByIds]",
-                new { Ids = ids.ToGuidIdArrayTVP() },
-                commandType: CommandType.StoredProcedure);
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                await connection.ExecuteAsync(
+                    $"[{Schema}].[{Table}_UpdateStorage]",
+                    new { Id = id },
+                    commandType: CommandType.StoredProcedure,
+                    commandTimeout: 180);
+            }
+        }
 
-            return results.ToList();
+        public async Task UpdateRenewalReminderDateAsync(Guid id, DateTime renewalReminderDate)
+        {
+            using (var connection = new SqlConnection(ConnectionString))
+            {
+                await connection.ExecuteAsync(
+                    $"[{Schema}].[User_UpdateRenewalReminderDate]",
+                    new { Id = id, RenewalReminderDate = renewalReminderDate },
+                    commandType: CommandType.StoredProcedure);
+            }
+        }
+
+        public async Task<IEnumerable<User>> GetManyAsync(IEnumerable<Guid> ids)
+        {
+            using (var connection = new SqlConnection(ReadOnlyConnectionString))
+            {
+                var results = await connection.QueryAsync<User>(
+                    $"[{Schema}].[{Table}_ReadByIds]",
+                    new { Ids = ids.ToGuidIdArrayTVP() },
+                    commandType: CommandType.StoredProcedure);
+
+                return results.ToList();
+            }
         }
     }
 }