dotnet format (#425)

* Added pragmas

* dotnet format

* Disabled var_elsewhere

* Adding dotnet format to pipeline

* Added command to mac/linux too

* Remove format from windows because of changes to csproj?

Author: abergs

.editorconfig

@@ -60,7 +60,7 @@ dotnet_style_explicit_tuple_names = true:suggestion
 [*.cs]
 # Prefer "var" when the type is apparent on the right side of the assignment; otherwise, avoid it.
 csharp_style_var_when_type_is_apparent = true:suggestion
-csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_elsewhere = false:none
 
 # Prefer method-like constructs to have a block body
 csharp_style_expression_bodied_methods = false:none

BlazorWasmDemo/Client/Shared/UserService.cs

@@ -14,7 +14,7 @@ public class UserService
     private const string _routeRegister = "credential";
     private const string _routeAssertionOpts = "assertion-options";
     private const string _routeLogin = "assertion";
-    
+
     private readonly JsonSerializerOptions _jsonOptions = new FidoBlazorSerializerContext().Options;
     private readonly HttpClient _httpClient;
     private readonly WebAuthn _webAuthn;
@@ -103,7 +103,7 @@ public async Task<string> RegisterAsync(string? username, string? displayName =
         {
             Console.WriteLine(e);
             var errorMessage = e.Message;
-            if(options.ExcludeCredentials?.Count > 0)
+            if (options.ExcludeCredentials?.Count > 0)
             {
                 errorMessage += " (You may have already registered this device)";
             }

BlazorWasmDemo/Server/Controllers/UserController.cs

@@ -213,16 +213,16 @@ public AssertionOptions MakeAssertionOptions([FromRoute] string? username, [From
 
             var exts = new AuthenticationExtensionsClientInputs()
             {
-                    UserVerificationMethod = true,
-                    Extensions = true,
-                    DevicePubKey = new AuthenticationExtensionsDevicePublicKeyInputs()
+                UserVerificationMethod = true,
+                Extensions = true,
+                DevicePubKey = new AuthenticationExtensionsDevicePublicKeyInputs()
             };
 
-        // 2. Create options (usernameless users will be prompted by their device to select a credential from their own list)
-        var options = _fido2.GetAssertionOptions(
-            existingKeys,
-            userVerification ?? UserVerificationRequirement.Discouraged, 
-            exts);
+            // 2. Create options (usernameless users will be prompted by their device to select a credential from their own list)
+            var options = _fido2.GetAssertionOptions(
+                existingKeys,
+                userVerification ?? UserVerificationRequirement.Discouraged,
+                exts);
 
             // 4. Temporarily store options, session/in-memory cache/redis/db
             _pendingAssertions[new string(options.Challenge.Select(b => (char)b).ToArray())] = options;
@@ -300,7 +300,7 @@ public async Task<string> MakeAssertionAsync([FromBody] AuthenticatorAssertionRa
             var token = handler.CreateEncodedJwt(
                 HttpContext.Request.Host.Host,
                 HttpContext.Request.Headers.Referer,
-                new ClaimsIdentity(new Claim[]{new(ClaimTypes.Actor, Encoding.UTF8.GetString(creds.UserHandle))}),
+                new ClaimsIdentity(new Claim[] { new(ClaimTypes.Actor, Encoding.UTF8.GetString(creds.UserHandle)) }),
                 DateTime.Now.Subtract(TimeSpan.FromMinutes(1)),
                 DateTime.Now.AddDays(1),
                 DateTime.Now,

Demo/ConformanceTesting.cs

@@ -6,7 +6,7 @@ namespace Fido2Demo;
 
 public static class ConformanceTesting
 {
-    private static readonly object _syncRoot = new ();
+    private static readonly object _syncRoot = new();
 
     private static IMetadataService _instance;
 

Demo/Pages/_options.cshtml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -13,4 +13,4 @@ public void OnGet()
         {
         }
     }
-}
+}

Demo/TestController.cs

@@ -17,7 +17,7 @@ namespace Fido2Demo;
 public class TestController : Controller
 {
     /* CONFORMANCE TESTING ENDPOINTS */
-    private static readonly DevelopmentInMemoryStore _demoStorage = new ();
+    private static readonly DevelopmentInMemoryStore _demoStorage = new();
 
     private readonly IFido2 _fido2;
     private readonly string _origin;
@@ -31,7 +31,7 @@ public TestController(IOptions<Fido2Configuration> fido2Configuration)
             ServerDomain = fido2Configuration.Value.ServerDomain,
             ServerName = fido2Configuration.Value.ServerName,
             Origins = fido2Configuration.Value.FullyQualifiedOrigins,
-        }, 
+        },
         ConformanceTesting.MetadataServiceInstance(
             System.IO.Path.Combine(fido2Configuration.Value.MDSCacheDirPath, @"Conformance"), _origin)
         );
@@ -130,7 +130,7 @@ public IActionResult AssertionOptionsTest([FromBody] TEST_AssertionClientParams
             uv = assertionClientParams.authenticatorSelection.UserVerification;
 
         var exts = new AuthenticationExtensionsClientInputs
-        { 
+        {
             AppID = _origin,
             UserVerificationMethod = true
         };

Src/Fido2.AspNet/DistributedCacheMetadataService.cs

@@ -76,7 +76,8 @@ protected virtual DateTimeOffset GetMemoryCacheAbsoluteExpiryTime(DateTimeOffset
         var expiryTime = _systemClock.UtcNow.GetNextIncrement(_defaultMemoryCacheInterval);
 
         //Ensure that memory cache expiry time never exceeds the next update time from the service
-        if(nextUpdateTime.HasValue && expiryTime > nextUpdateTime.Value) expiryTime = nextUpdateTime.Value;
+        if (nextUpdateTime.HasValue && expiryTime > nextUpdateTime.Value)
+            expiryTime = nextUpdateTime.Value;
 
         return expiryTime;
     }
@@ -98,7 +99,7 @@ protected virtual async Task<MetadataBLOBPayload> GetRepositoryPayloadWithErrorH
         {
             return await repository.GetBLOBAsync(cancellationToken);
         }
-        catch(Exception ex)
+        catch (Exception ex)
         {
             _logger.LogError(ex, "Could not fetch metadata from {0}", repository.GetType().Name);
             return null;
@@ -113,7 +114,7 @@ await _distributedCache.SetStringAsync(
             new DistributedCacheEntryOptions()
             {
                 AbsoluteExpiration = GetDistributedCacheAbsoluteExpiryTime(GetNextUpdateTimeFromPayload(payload))
-            }, 
+            },
             cancellationToken);
     }
 
@@ -165,7 +166,7 @@ protected virtual async Task<MetadataBLOBPayload> GetMemoryCachedPayload(IMetada
         {
             var distributedCacheBlob = await GetDistributedCachedBlob(repository, cancellationToken);
 
-            if(distributedCacheBlob != null)
+            if (distributedCacheBlob != null)
             {
                 var nextUpdateTime = GetNextUpdateTimeFromPayload(distributedCacheBlob);
 

Src/Fido2.AspNet/Fido2NetLibBuilderExtensions.cs

@@ -62,7 +62,7 @@ public static IFido2MetadataServiceBuilder AddFileSystemMetadataRepository(this
 
     public static IFido2MetadataServiceBuilder AddConformanceMetadataRepository(
         this IFido2MetadataServiceBuilder builder,
-        HttpClient client = null, 
+        HttpClient client = null,
         string origin = "")
     {
         builder.Services.AddTransient<IMetadataRepository>(provider =>
@@ -77,7 +77,8 @@ public static IFido2MetadataServiceBuilder AddFidoMetadataRepository(this IFido2
     {
         var httpClientBuilder = builder.Services.AddHttpClient(nameof(Fido2MetadataServiceRepository));
 
-        if(clientBuilder != null) clientBuilder(httpClientBuilder);
+        if (clientBuilder != null)
+            clientBuilder(httpClientBuilder);
 
         builder.Services.AddTransient<IMetadataRepository, Fido2MetadataServiceRepository>();
 

Src/Fido2.Ctap2/Commands/AuthenticatorClientPinCommand.cs

@@ -13,12 +13,12 @@ public AuthenticatorClientPinCommand(
         byte[]? newPinEnc = null,
         byte[]? pinHashEnc = null)
     {
-        
+
         PinProtocol = pinProtocol;
         SubCommand = subCommand;
         KeyAgreement = keyAgreement;
         PinAuth = pinAuth;
-        NewPinEnc = newPinEnc; 
+        NewPinEnc = newPinEnc;
         PinHashEnc = pinHashEnc;
     }
 
@@ -96,6 +96,7 @@ public AuthenticatorClientPinCommand(
 
 public enum AuthenticatorClientPinSubCommand
 {
+    #pragma warning disable format
     GetRetries      = 0x01,
     GetKeyAgreement = 0x02,
     SetPin          = 0x03,

Src/Fido2.Ctap2/Commands/AuthenticatorGetAssertionCommand.cs

@@ -6,7 +6,7 @@ namespace Fido2NetLib.Ctap2;
 public sealed class AuthenticatorGetAssertionCommand : CtapCommand
 {
     public AuthenticatorGetAssertionCommand(
-        string rpId, 
+        string rpId,
         byte[] clientDataHash,
         PublicKeyCredentialDescriptor[] allowList,
         CborMap? extensions = null,