Merge pull request #197 from DuendeSoftware/dgb/update-editorconfig-20250428162925

Update .editorconfig

Author: adamralph

.editorconfig

@@ -7,6 +7,7 @@ indent_style = space
 insert_final_newline = true
 
 [*.cs]
+csharp_prefer_braces = true
 csharp_style_expression_bodied_accessors = true
 csharp_style_expression_bodied_constructors = true
 csharp_style_expression_bodied_indexers = true
@@ -23,6 +24,7 @@ csharp_style_var_when_type_is_apparent = true
 dotnet_diagnostic.IDE0003.severity = error # Remove this or Me qualification
 dotnet_diagnostic.IDE0005.severity = error # Remove unnecessary using directives
 dotnet_diagnostic.IDE0007.severity = error # Use var instead of explicit type
+dotnet_diagnostic.IDE0011.severity = error # Add braces
 dotnet_diagnostic.IDE0021.severity = error # Use expression body for constructors
 dotnet_diagnostic.IDE0022.severity = error # Use expression body for methods
 dotnet_diagnostic.IDE0023.severity = error # Use expression body for conversion operators

access-token-management/src/AccessTokenManagement/HybridClientCredentialsTokenCache.cs

@@ -116,7 +116,10 @@ public async Task<ClientCredentialsToken> GetOrCreateAsync(
     public async Task<ClientCredentialsToken?> GetAsync(string clientName, TokenRequestParameters requestParameters,
         CancellationToken cancellationToken = default)
     {
-        if (clientName is null) throw new ArgumentNullException(nameof(clientName));
+        if (clientName is null)
+        {
+            throw new ArgumentNullException(nameof(clientName));
+        }
 
         var cacheKey = cacheKeyGenerator.GenerateKey(clientName, requestParameters);
 

access-token-management/test/AccessTokenManagement.Tests/Framework/GenericHost.cs

@@ -43,13 +43,20 @@ public T Resolve<T>()
     public string Url(string? path = null)
     {
         path = path ?? string.Empty;
-        if (!path.StartsWith("/")) path = "/" + path;
+        if (!path.StartsWith("/"))
+        {
+            path = "/" + path;
+        }
+
         return BaseAddress + path;
     }
 
     public async Task InitializeAsync()
     {
-        if (Server != null) throw new InvalidOperationException("Already initialized");
+        if (Server != null)
+        {
+            throw new InvalidOperationException("Already initialized");
+        }
 
         var hostBuilder = new HostBuilder()
             .ConfigureWebHost(builder =>
@@ -184,9 +191,13 @@ public async ValueTask DisposeAsync()
         static async ValueTask CastAndDispose(IDisposable resource)
         {
             if (resource is IAsyncDisposable resourceAsyncDisposable)
+            {
                 await resourceAsyncDisposable.DisposeAsync();
+            }
             else
+            {
                 resource?.Dispose();
+            }
         }
     }
 }

access-token-management/test/AccessTokenManagement.Tests/Framework/TestBrowserClient.cs

@@ -216,7 +216,11 @@ public string? this[string key]
     {
         get
         {
-            if (Inputs.ContainsKey(key)) return Inputs[key];
+            if (Inputs.ContainsKey(key))
+            {
+                return Inputs[key];
+            }
+
             return null;
         }
         set => Inputs[key] = value;

access-token-management/test/AccessTokenManagement.Tests/Framework/TestDPoPProofService.cs

@@ -11,7 +11,11 @@ public class TestDPoPProofService : IDPoPProofService
 
     public Task<DPoPProof?> CreateProofTokenAsync(DPoPProofRequest request)
     {
-        if (ProofToken == null) return Task.FromResult<DPoPProof?>(null);
+        if (ProofToken == null)
+        {
+            return Task.FromResult<DPoPProof?>(null);
+        }
+
         Nonce = request.DPoPNonce;
         return Task.FromResult<DPoPProof?>(new DPoPProof { ProofToken = ProofToken + Nonce });
     }

access-token-management/test/AccessTokenManagement.Tests/TaskTimeoutExtensions.cs

@@ -10,7 +10,10 @@ public static class TaskTimeoutExtensions
     private static TimeSpan IncreaseTimeoutIfDebuggerAttached(TimeSpan timeout)
     {
         // Wait a bit longer if the debugger is attached. This prevents timeouts during debugging.
-        if (Debugger.IsAttached) return TimeSpan.FromMinutes(10);
+        if (Debugger.IsAttached)
+        {
+            return TimeSpan.FromMinutes(10);
+        }
 
         return timeout == default ? TimeSpan.FromSeconds(2) : timeout;
     }
@@ -25,8 +28,11 @@ public static async Task ThrowOnTimeout(this Task task, TimeSpan timeout = defau
 
             var resultTask = await Task.WhenAny(task, delayTask);
             if (resultTask == delayTask)
+            {
                 // Operation cancelled
                 throw new OperationCanceledException();
+            }
+
             cts.Cancel();
 
             await task;

identity-model-oidc-client/clients/ConsoleClientWithBrowser/Program.cs

@@ -151,8 +151,15 @@ private static async Task NextSteps(LoginResult result)
             Console.Write(menu);
             var key = Console.ReadKey();
 
-            if (key.Key == ConsoleKey.X) return;
-            if (key.Key == ConsoleKey.C) await CallApi();
+            if (key.Key == ConsoleKey.X)
+            {
+                return;
+            }
+
+            if (key.Key == ConsoleKey.C)
+            {
+                await CallApi();
+            }
         }
     }
 

identity-model-oidc-client/clients/ConsoleClientWithBrowser/SystemBrowser.cs

@@ -110,7 +110,10 @@ public class LoopbackHttpListener : IDisposable
     public LoopbackHttpListener(int port, string? path = null)
     {
         path = path ?? string.Empty;
-        if (path.StartsWith("/")) path = path.Substring(1);
+        if (path.StartsWith("/"))
+        {
+            path = path.Substring(1);
+        }
 
         _url = $"http://127.0.0.1:{port}/{path}";
 

identity-model-oidc-client/clients/ConsoleClientWithBrowserAndDPoP/Program.cs

@@ -107,7 +107,10 @@ private static string GetProofKey()
 
     private static void ShowResult(LoginResult? result)
     {
-        if (result == null) return;
+        if (result == null)
+        {
+            return;
+        }
 
         if (result.IsError)
         {
@@ -142,8 +145,15 @@ private static async Task NextSteps()
             Console.Write(menu);
             var key = Console.ReadKey();
 
-            if (key.Key == ConsoleKey.X) return;
-            if (key.Key == ConsoleKey.C) await CallApi();
+            if (key.Key == ConsoleKey.X)
+            {
+                return;
+            }
+
+            if (key.Key == ConsoleKey.C)
+            {
+                await CallApi();
+            }
         }
     }
 

identity-model-oidc-client/clients/ConsoleClientWithBrowserAndDPoP/SystemBrowser.cs

@@ -110,7 +110,10 @@ public class LoopbackHttpListener : IDisposable
     public LoopbackHttpListener(int port, string? path = null)
     {
         path = path ?? string.Empty;
-        if (path.StartsWith("/")) path = path.Substring(1);
+        if (path.StartsWith("/"))
+        {
+            path = path.Substring(1);
+        }
 
         _url = $"http://127.0.0.1:{port}/{path}";
 

identity-model-oidc-client/src/IdentityModel.OidcClient/OidcClient.cs

@@ -36,11 +36,18 @@ public class OidcClient
     /// <exception cref="System.ArgumentNullException">options</exception>
     public OidcClient(OidcClientOptions options)
     {
-        if (options == null) throw new ArgumentNullException(nameof(options));
+        if (options == null)
+        {
+            throw new ArgumentNullException(nameof(options));
+        }
 
         if (options.ProviderInformation == null)
         {
-            if (options.Authority.IsMissing()) throw new ArgumentException("No authority specified", nameof(Options.Authority));
+            if (options.Authority.IsMissing())
+            {
+                throw new ArgumentException("No authority specified", nameof(Options.Authority));
+            }
+
             _useDiscovery = true;
         }
 
@@ -61,7 +68,10 @@ public virtual async Task<LoginResult> LoginAsync(LoginRequest request = null, C
         _logger.LogTrace("LoginAsync");
         _logger.LogInformation("Starting authentication request.");
 
-        if (request == null) request = new LoginRequest();
+        if (request == null)
+        {
+            request = new LoginRequest();
+        }
 
         await EnsureConfigurationAsync(cancellationToken);
 
@@ -132,7 +142,10 @@ public virtual async Task<string> PrepareLogoutAsync(LogoutRequest request = def
     /// <returns></returns>
     public virtual async Task<LogoutResult> LogoutAsync(LogoutRequest request = null, CancellationToken cancellationToken = default)
     {
-        if (request == null) request = new LogoutRequest();
+        if (request == null)
+        {
+            request = new LogoutRequest();
+        }
 
         await EnsureConfigurationAsync(cancellationToken);
 
@@ -276,8 +289,15 @@ public virtual async Task<UserInfoResult> GetUserInfoAsync(string accessToken, C
         _logger.LogTrace("GetUserInfoAsync");
 
         await EnsureConfigurationAsync(cancellationToken);
-        if (accessToken.IsMissing()) throw new ArgumentNullException(nameof(accessToken));
-        if (!Options.ProviderInformation.SupportsUserInfo) throw new InvalidOperationException("No userinfo endpoint specified");
+        if (accessToken.IsMissing())
+        {
+            throw new ArgumentNullException(nameof(accessToken));
+        }
+
+        if (!Options.ProviderInformation.SupportsUserInfo)
+        {
+            throw new InvalidOperationException("No userinfo endpoint specified");
+        }
 
         var userInfoClient = Options.CreateClient();
 

identity-model-oidc-client/src/IdentityModel.OidcClient/RefreshTokenDelegatingHandler.cs

@@ -96,10 +96,17 @@ public RefreshTokenDelegatingHandler(OidcClient oidcClient, string accessToken,
 
         _logger = _oidcClient.Options.LoggerFactory.CreateLogger<RefreshTokenDelegatingHandler>();
 
-        if (refreshToken.IsMissing()) throw new ArgumentNullException(nameof(refreshToken));
+        if (refreshToken.IsMissing())
+        {
+            throw new ArgumentNullException(nameof(refreshToken));
+        }
+
         _refreshToken = refreshToken;
 
-        if (innerHandler != null) InnerHandler = innerHandler;
+        if (innerHandler != null)
+        {
+            InnerHandler = innerHandler;
+        }
     }
 
     /// <summary>

identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/DPoP/Framework/GenericHost.cs

@@ -15,7 +15,11 @@ public class GenericHost : IAsyncDisposable
 {
     public GenericHost(string baseAddress = "https://server")
     {
-        if (baseAddress.EndsWith("/")) baseAddress = baseAddress.Substring(0, baseAddress.Length - 1);
+        if (baseAddress.EndsWith("/"))
+        {
+            baseAddress = baseAddress.Substring(0, baseAddress.Length - 1);
+        }
+
         _baseAddress = baseAddress;
     }
 
@@ -37,7 +41,11 @@ public T Resolve<T>() where T : notnull =>
     public string Url(string path = null)
     {
         path = path ?? string.Empty;
-        if (!path.StartsWith("/")) path = "/" + path;
+        if (!path.StartsWith("/"))
+        {
+            path = "/" + path;
+        }
+
         return _baseAddress + path;
     }
 
@@ -99,18 +107,33 @@ void ConfigureApp(IApplicationBuilder app)
 
     public async ValueTask DisposeAsync()
     {
-        if (Server != null) await CastAndDispose(Server);
-        if (HttpClient != null) await CastAndDispose(HttpClient);
-        if (Logger != null) await CastAndDispose(Logger);
+        if (Server != null)
+        {
+            await CastAndDispose(Server);
+        }
+
+        if (HttpClient != null)
+        {
+            await CastAndDispose(HttpClient);
+        }
+
+        if (Logger != null)
+        {
+            await CastAndDispose(Logger);
+        }
 
         return;
 
         static async ValueTask CastAndDispose(IDisposable resource)
         {
             if (resource is IAsyncDisposable resourceAsyncDisposable)
+            {
                 await resourceAsyncDisposable.DisposeAsync();
+            }
             else
+            {
                 resource?.Dispose();
+            }
         }
     }
 }

identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/Infrastructure/NetworkHandler.cs

@@ -66,7 +66,10 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
             return _action(request);
         }
 
-        if (_behavior == Behavior.Throw) throw _exception;
+        if (_behavior == Behavior.Throw)
+        {
+            throw _exception;
+        }
 
         var response = new HttpResponseMessage(_statusCode);
 
@@ -92,7 +95,10 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
 
     private async Task<string> SafeReadContentFrom(HttpRequestMessage request)
     {
-        if (request.Content == null) return null;
+        if (request.Content == null)
+        {
+            return null;
+        }
 
         return await request.Content.ReadAsStringAsync();
     }

identity-model-oidc-client/test/IdentityModel.OidcClient.Tests/RefreshTokenDelegatingHandlerTests.cs

@@ -61,7 +61,9 @@ public async Task Can_refresh_access_tokens_in_parallel()
             async Task PerformPingRequests()
             {
                 for (var i = 0; i < callsPerThread; i++)
+                {
                     await client.SecuredPing();
+                }
             }
 
             var tasks = Enumerable.Range(0, logicalThreadCount).Select(i => PerformPingRequests());
@@ -94,7 +96,9 @@ public async Task SecuredPing()
                 var response = await _client.GetAsync("/whatever");
 
                 if (response.IsSuccessStatusCode)
+                {
                     return;
+                }
             }
 
             throw new Exception("The client was not able to recover.");
@@ -164,9 +168,13 @@ public bool IsValid(string accessToken)
                 var expired = useCount > _maxCallsPerAccessToken;
 
                 if (expired)
+                {
                     _writeLine?.Invoke($"{accessToken} is no longer valid because it has been used {useCount} times (more than the {_maxCallsPerAccessToken} allowed)");
+                }
                 else
+                {
                     _writeLine?.Invoke($"{accessToken} is still valid (used {useCount} times now)");
+                }
 
                 return !expired;
             }