Revert filescoped (#2227)

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

This reverts commit 239286737d.

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

This reverts commit 34fb4cca2a.

test/Core.Test/Services/SsoConfigServiceTests.cs

@@ -9,308 +9,309 @@ using Bit.Test.Common.AutoFixture.Attributes;
 using NSubstitute;
 using Xunit;
 
-namespace Bit.Core.Test.Services;
-
-public class SsoConfigServiceTests
+namespace Bit.Core.Test.Services
 {
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_ExistingItem_UpdatesRevisionDateOnly(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
+    public class SsoConfigServiceTests
     {
-        var utcNow = DateTime.UtcNow;
-
-        var ssoConfig = new SsoConfig
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_ExistingItem_UpdatesRevisionDateOnly(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
         {
-            Id = 1,
-            Data = "{}",
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
+            var utcNow = DateTime.UtcNow;
 
-        sutProvider.GetDependency<ISsoConfigRepository>()
-            .UpsertAsync(ssoConfig).Returns(Task.CompletedTask);
-
-        await sutProvider.Sut.SaveAsync(ssoConfig, organization);
-
-        await sutProvider.GetDependency<ISsoConfigRepository>().Received()
-            .UpsertAsync(ssoConfig);
-
-        Assert.Equal(utcNow.AddDays(-10), ssoConfig.CreationDate);
-        Assert.True(ssoConfig.RevisionDate - utcNow < TimeSpan.FromSeconds(1));
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_NewItem_UpdatesCreationAndRevisionDate(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        var ssoConfig = new SsoConfig
-        {
-            Id = default,
-            Data = "{}",
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        sutProvider.GetDependency<ISsoConfigRepository>()
-            .UpsertAsync(ssoConfig).Returns(Task.CompletedTask);
-
-        await sutProvider.Sut.SaveAsync(ssoConfig, organization);
-
-        await sutProvider.GetDependency<ISsoConfigRepository>().Received()
-            .UpsertAsync(ssoConfig);
-
-        Assert.True(ssoConfig.CreationDate - utcNow < TimeSpan.FromSeconds(1));
-        Assert.True(ssoConfig.RevisionDate - utcNow < TimeSpan.FromSeconds(1));
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_PreventDisablingKeyConnector(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        var oldSsoConfig = new SsoConfig
-        {
-            Id = 1,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        var newSsoConfig = new SsoConfig
-        {
-            Id = 1,
-            Data = "{}",
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow,
-        };
-
-        var ssoConfigRepository = sutProvider.GetDependency<ISsoConfigRepository>();
-        ssoConfigRepository.GetByOrganizationIdAsync(organization.Id).Returns(oldSsoConfig);
-        ssoConfigRepository.UpsertAsync(newSsoConfig).Returns(Task.CompletedTask);
-        sutProvider.GetDependency<IOrganizationUserRepository>().GetManyDetailsByOrganizationAsync(organization.Id)
-            .Returns(new[] { new OrganizationUserUserDetails { UsesKeyConnector = true } });
-
-        var exception = await Assert.ThrowsAsync<BadRequestException>(
-            () => sutProvider.Sut.SaveAsync(newSsoConfig, organization));
-
-        Assert.Contains("Key Connector cannot be disabled at this moment.", exception.Message);
-
-        await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_AllowDisablingKeyConnectorWhenNoUserIsUsingIt(
-        SutProvider<SsoConfigService> sutProvider, Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        var oldSsoConfig = new SsoConfig
-        {
-            Id = 1,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        var newSsoConfig = new SsoConfig
-        {
-            Id = 1,
-            Data = "{}",
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow,
-        };
-
-        var ssoConfigRepository = sutProvider.GetDependency<ISsoConfigRepository>();
-        ssoConfigRepository.GetByOrganizationIdAsync(organization.Id).Returns(oldSsoConfig);
-        ssoConfigRepository.UpsertAsync(newSsoConfig).Returns(Task.CompletedTask);
-        sutProvider.GetDependency<IOrganizationUserRepository>().GetManyDetailsByOrganizationAsync(organization.Id)
-            .Returns(new[] { new OrganizationUserUserDetails { UsesKeyConnector = false } });
-
-        await sutProvider.Sut.SaveAsync(newSsoConfig, organization);
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_KeyConnector_SingleOrgNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        var ssoConfig = new SsoConfig
-        {
-            Id = default,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        var exception = await Assert.ThrowsAsync<BadRequestException>(
-            () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
-
-        Assert.Contains("Key Connector requires the Single Organization policy to be enabled.", exception.Message);
-
-        await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_KeyConnector_SsoPolicyNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        var ssoConfig = new SsoConfig
-        {
-            Id = default,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Enums.PolicyType.SingleOrg).Returns(new Policy
-            {
-                Enabled = true
-            });
-
-        var exception = await Assert.ThrowsAsync<BadRequestException>(
-            () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
-
-        Assert.Contains("Key Connector requires the Single Sign-On Authentication policy to be enabled.", exception.Message);
-
-        await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_KeyConnector_SsoConfigNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        var ssoConfig = new SsoConfig
-        {
-            Id = default,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = false,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
-            {
-                Enabled = true
-            });
-
-        var exception = await Assert.ThrowsAsync<BadRequestException>(
-            () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
-
-        Assert.Contains("You must enable SSO to use Key Connector.", exception.Message);
-
-        await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
-
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_KeyConnector_KeyConnectorAbilityNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
-
-        organization.UseKeyConnector = false;
-        var ssoConfig = new SsoConfig
-        {
-            Id = default,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
-
-        sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+            var ssoConfig = new SsoConfig
             {
+                Id = 1,
+                Data = "{}",
                 Enabled = true,
-            });
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
 
-        var exception = await Assert.ThrowsAsync<BadRequestException>(
-            () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
+            sutProvider.GetDependency<ISsoConfigRepository>()
+                .UpsertAsync(ssoConfig).Returns(Task.CompletedTask);
 
-        Assert.Contains("Organization cannot use Key Connector.", exception.Message);
+            await sutProvider.Sut.SaveAsync(ssoConfig, organization);
 
-        await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
-            .UpsertAsync(default);
-    }
+            await sutProvider.GetDependency<ISsoConfigRepository>().Received()
+                .UpsertAsync(ssoConfig);
 
-    [Theory, CustomAutoData(typeof(SutProviderCustomization))]
-    public async Task SaveAsync_KeyConnector_Success(SutProvider<SsoConfigService> sutProvider,
-        Organization organization)
-    {
-        var utcNow = DateTime.UtcNow;
+            Assert.Equal(utcNow.AddDays(-10), ssoConfig.CreationDate);
+            Assert.True(ssoConfig.RevisionDate - utcNow < TimeSpan.FromSeconds(1));
+        }
 
-        organization.UseKeyConnector = true;
-        var ssoConfig = new SsoConfig
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_NewItem_UpdatesCreationAndRevisionDate(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
         {
-            Id = default,
-            Data = new SsoConfigurationData
-            {
-                KeyConnectorEnabled = true,
-            }.Serialize(),
-            Enabled = true,
-            OrganizationId = organization.Id,
-            CreationDate = utcNow.AddDays(-10),
-            RevisionDate = utcNow.AddDays(-10),
-        };
+            var utcNow = DateTime.UtcNow;
 
-        sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
-            Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+            var ssoConfig = new SsoConfig
             {
+                Id = default,
+                Data = "{}",
                 Enabled = true,
-            });
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
 
-        await sutProvider.Sut.SaveAsync(ssoConfig, organization);
+            sutProvider.GetDependency<ISsoConfigRepository>()
+                .UpsertAsync(ssoConfig).Returns(Task.CompletedTask);
 
-        await sutProvider.GetDependency<ISsoConfigRepository>().ReceivedWithAnyArgs()
-            .UpsertAsync(default);
+            await sutProvider.Sut.SaveAsync(ssoConfig, organization);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().Received()
+                .UpsertAsync(ssoConfig);
+
+            Assert.True(ssoConfig.CreationDate - utcNow < TimeSpan.FromSeconds(1));
+            Assert.True(ssoConfig.RevisionDate - utcNow < TimeSpan.FromSeconds(1));
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_PreventDisablingKeyConnector(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            var oldSsoConfig = new SsoConfig
+            {
+                Id = 1,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            var newSsoConfig = new SsoConfig
+            {
+                Id = 1,
+                Data = "{}",
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow,
+            };
+
+            var ssoConfigRepository = sutProvider.GetDependency<ISsoConfigRepository>();
+            ssoConfigRepository.GetByOrganizationIdAsync(organization.Id).Returns(oldSsoConfig);
+            ssoConfigRepository.UpsertAsync(newSsoConfig).Returns(Task.CompletedTask);
+            sutProvider.GetDependency<IOrganizationUserRepository>().GetManyDetailsByOrganizationAsync(organization.Id)
+                .Returns(new[] { new OrganizationUserUserDetails { UsesKeyConnector = true } });
+
+            var exception = await Assert.ThrowsAsync<BadRequestException>(
+                () => sutProvider.Sut.SaveAsync(newSsoConfig, organization));
+
+            Assert.Contains("Key Connector cannot be disabled at this moment.", exception.Message);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
+                .UpsertAsync(default);
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_AllowDisablingKeyConnectorWhenNoUserIsUsingIt(
+            SutProvider<SsoConfigService> sutProvider, Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            var oldSsoConfig = new SsoConfig
+            {
+                Id = 1,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            var newSsoConfig = new SsoConfig
+            {
+                Id = 1,
+                Data = "{}",
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow,
+            };
+
+            var ssoConfigRepository = sutProvider.GetDependency<ISsoConfigRepository>();
+            ssoConfigRepository.GetByOrganizationIdAsync(organization.Id).Returns(oldSsoConfig);
+            ssoConfigRepository.UpsertAsync(newSsoConfig).Returns(Task.CompletedTask);
+            sutProvider.GetDependency<IOrganizationUserRepository>().GetManyDetailsByOrganizationAsync(organization.Id)
+                .Returns(new[] { new OrganizationUserUserDetails { UsesKeyConnector = false } });
+
+            await sutProvider.Sut.SaveAsync(newSsoConfig, organization);
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_KeyConnector_SingleOrgNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            var ssoConfig = new SsoConfig
+            {
+                Id = default,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            var exception = await Assert.ThrowsAsync<BadRequestException>(
+                () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
+
+            Assert.Contains("Key Connector requires the Single Organization policy to be enabled.", exception.Message);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
+                .UpsertAsync(default);
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_KeyConnector_SsoPolicyNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            var ssoConfig = new SsoConfig
+            {
+                Id = default,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
+                Arg.Any<Guid>(), Enums.PolicyType.SingleOrg).Returns(new Policy
+                {
+                    Enabled = true
+                });
+
+            var exception = await Assert.ThrowsAsync<BadRequestException>(
+                () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
+
+            Assert.Contains("Key Connector requires the Single Sign-On Authentication policy to be enabled.", exception.Message);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
+                .UpsertAsync(default);
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_KeyConnector_SsoConfigNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            var ssoConfig = new SsoConfig
+            {
+                Id = default,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = false,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
+                Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+                {
+                    Enabled = true
+                });
+
+            var exception = await Assert.ThrowsAsync<BadRequestException>(
+                () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
+
+            Assert.Contains("You must enable SSO to use Key Connector.", exception.Message);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
+                .UpsertAsync(default);
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_KeyConnector_KeyConnectorAbilityNotEnabled_Throws(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            organization.UseKeyConnector = false;
+            var ssoConfig = new SsoConfig
+            {
+                Id = default,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
+                Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+                {
+                    Enabled = true,
+                });
+
+            var exception = await Assert.ThrowsAsync<BadRequestException>(
+                () => sutProvider.Sut.SaveAsync(ssoConfig, organization));
+
+            Assert.Contains("Organization cannot use Key Connector.", exception.Message);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().DidNotReceiveWithAnyArgs()
+                .UpsertAsync(default);
+        }
+
+        [Theory, CustomAutoData(typeof(SutProviderCustomization))]
+        public async Task SaveAsync_KeyConnector_Success(SutProvider<SsoConfigService> sutProvider,
+            Organization organization)
+        {
+            var utcNow = DateTime.UtcNow;
+
+            organization.UseKeyConnector = true;
+            var ssoConfig = new SsoConfig
+            {
+                Id = default,
+                Data = new SsoConfigurationData
+                {
+                    KeyConnectorEnabled = true,
+                }.Serialize(),
+                Enabled = true,
+                OrganizationId = organization.Id,
+                CreationDate = utcNow.AddDays(-10),
+                RevisionDate = utcNow.AddDays(-10),
+            };
+
+            sutProvider.GetDependency<IPolicyRepository>().GetByOrganizationIdTypeAsync(
+                Arg.Any<Guid>(), Arg.Any<Enums.PolicyType>()).Returns(new Policy
+                {
+                    Enabled = true,
+                });
+
+            await sutProvider.Sut.SaveAsync(ssoConfig, organization);
+
+            await sutProvider.GetDependency<ISsoConfigRepository>().ReceivedWithAnyArgs()
+                .UpsertAsync(default);
+        }
     }
 }