From 1a15e7a51d74b7acc06343a71d00ffa1f8d62541 Mon Sep 17 00:00:00 2001 From: Justin Baur <19896123+justindbaur@users.noreply.github.com> Date: Fri, 18 Apr 2025 13:25:36 -0400 Subject: [PATCH] Formatting --- .../InstallationClientProvider.cs | 2 +- .../ClientProviders/InternalClientProvider.cs | 2 +- .../OrganizationClientProvider.cs | 4 ++-- .../SecretsManagerApiKeyProvider.cs | 16 ++++++++-------- .../ClientProviders/UserClientProvider.cs | 2 +- .../IdentityServer/DynamicClientStore.cs | 2 +- .../ServiceCollectionExtensions.cs | 2 +- .../Endpoints/IdentityServerTests.cs | 1 - 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs index 768f02f660..f3ddef9812 100644 --- a/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs +++ b/src/Identity/IdentityServer/ClientProviders/InstallationClientProvider.cs @@ -1,4 +1,4 @@ -using Bit.Core.IdentityServer; +using Bit.Core.IdentityServer; using Bit.Core.Platform.Installations; using Duende.IdentityModel; using Duende.IdentityServer.Models; diff --git a/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs index 9cd1be2399..dff01c20a4 100644 --- a/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs +++ b/src/Identity/IdentityServer/ClientProviders/InternalClientProvider.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Diagnostics; using Bit.Core.IdentityServer; diff --git a/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs index 42c72faeda..d4d707ed12 100644 --- a/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs +++ b/src/Identity/IdentityServer/ClientProviders/OrganizationClientProvider.cs @@ -1,4 +1,4 @@ -using Bit.Core.Enums; +using Bit.Core.Enums; using Bit.Core.Identity; using Bit.Core.IdentityServer; using Bit.Core.Repositories; @@ -44,7 +44,7 @@ internal class OrganizationClientProvider : IClientProvider ClientId = $"organization.{organization.Id}", RequireClientSecret = true, ClientSecrets = [new Secret(orgApiKey.ApiKey.Sha256())], - AllowedScopes = [ ApiScopes.ApiOrganization ], + AllowedScopes = [ApiScopes.ApiOrganization], AllowedGrantTypes = GrantTypes.ClientCredentials, AccessTokenLifetime = 3600 * 1, Enabled = organization.Enabled && organization.UseApi, diff --git a/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs b/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs index c9003fcc42..87d2d8fb2c 100644 --- a/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs +++ b/src/Identity/IdentityServer/ClientProviders/SecretsManagerApiKeyProvider.cs @@ -1,4 +1,4 @@ -using Bit.Core.Identity; +using Bit.Core.Identity; using Bit.Core.Repositories; using Bit.Core.SecretsManager.Models.Data; using Bit.Core.SecretsManager.Repositories; @@ -34,13 +34,13 @@ internal class SecretsManagerApiKeyProvider : IClientProvider switch (apiKey) { - case ServiceAccountApiKeyDetails key: - var org = await _organizationRepository.GetByIdAsync(key.ServiceAccountOrganizationId); - if (!org.UseSecretsManager || !org.Enabled) - { - return null; - } - break; + case ServiceAccountApiKeyDetails key: + var org = await _organizationRepository.GetByIdAsync(key.ServiceAccountOrganizationId); + if (!org.UseSecretsManager || !org.Enabled) + { + return null; + } + break; } var client = new Client diff --git a/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs b/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs index a63c28aad1..e2da11e414 100644 --- a/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs +++ b/src/Identity/IdentityServer/ClientProviders/UserClientProvider.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using System.Collections.ObjectModel; using System.Security.Claims; diff --git a/src/Identity/IdentityServer/DynamicClientStore.cs b/src/Identity/IdentityServer/DynamicClientStore.cs index 8ad54e2226..997ff64d0b 100644 --- a/src/Identity/IdentityServer/DynamicClientStore.cs +++ b/src/Identity/IdentityServer/DynamicClientStore.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using Duende.IdentityServer.Models; using Duende.IdentityServer.Stores; diff --git a/src/Identity/IdentityServer/ServiceCollectionExtensions.cs b/src/Identity/IdentityServer/ServiceCollectionExtensions.cs index b0f45a4b60..fc97fb8e45 100644 --- a/src/Identity/IdentityServer/ServiceCollectionExtensions.cs +++ b/src/Identity/IdentityServer/ServiceCollectionExtensions.cs @@ -1,4 +1,4 @@ -using Bit.Identity.IdentityServer; +using Bit.Identity.IdentityServer; namespace Microsoft.Extensions.DependencyInjection; diff --git a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs index f4e36fa7d5..c29f25983d 100644 --- a/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs +++ b/test/Identity.IntegrationTest/Endpoints/IdentityServerTests.cs @@ -9,7 +9,6 @@ using Bit.Core.Enums; using Bit.Core.Platform.Installations; using Bit.Core.Repositories; using Bit.Core.Test.Auth.AutoFixture; -using Bit.Identity.IdentityServer; using Bit.IntegrationTestCommon.Factories; using Bit.Test.Common.AutoFixture.Attributes; using Bit.Test.Common.Helpers;