applied dotnet format

samples/Server/ConfigureServices.cs

@@ -169,8 +169,8 @@ string environmentName
       .AddUIApis(options =>
       {
         // Tell the system about the allowed Permissions it is built/configured for.
-        options.Permissions = new List<string>
-        {
+        options.Permissions =
+        [
           Permissions.Endpoints.Authorization,
           Permissions.Endpoints.Logout,
           Permissions.Endpoints.Token,
@@ -184,7 +184,7 @@ string environmentName
           Permissions.Scopes.Roles,
           Permissions.Prefixes.Scope + "server_scope",
           Permissions.Prefixes.Scope + "api_scope"
-        };
+        ];
       })
       // Register the EF based UI Store for the ASP.NET Identity related entities.
       .AddUIIdentityStore<ApplicationUser>(options =>

samples/Server/Controllers/AuthorizationController.cs

@@ -67,7 +67,7 @@ public async Task<IActionResult> Authorize()
           properties: new AuthenticationProperties
           {
             RedirectUri = Request.PathBase + Request.Path + QueryString.Create(
-                  Request.HasFormContentType ? Request.Form.ToList() : Request.Query.ToList())
+                  Request.HasFormContentType ? Request.Form.ToList() : [.. Request.Query])
           });
     }
 
@@ -80,13 +80,13 @@ public async Task<IActionResult> Authorize()
       var prompt = string.Join(" ", request.GetPrompts().Remove(Prompts.Login));
 
       var parameters = Request.HasFormContentType ?
-          Request.Form.Where(parameter =>
-          {
-            return parameter.Key != Parameters.Prompt;
+          Request.Form.Where(parameter =>
+          {
+            return parameter.Key != Parameters.Prompt;
           }).ToList() :
-          Request.Query.Where(parameter =>
-          {
-            return parameter.Key != Parameters.Prompt;
+          Request.Query.Where(parameter =>
+          {
+            return parameter.Key != Parameters.Prompt;
           }).ToList();
 
       parameters.Add(KeyValuePair.Create(Parameters.Prompt, new StringValues(prompt)));
@@ -120,7 +120,7 @@ public async Task<IActionResult> Authorize()
           properties: new AuthenticationProperties
           {
             RedirectUri = Request.PathBase + Request.Path + QueryString.Create(
-                  Request.HasFormContentType ? Request.Form.ToList() : Request.Query.ToList())
+                  Request.HasFormContentType ? Request.Form.ToList() : [.. Request.Query])
           });
     }
 
@@ -144,7 +144,7 @@ public async Task<IActionResult> Authorize()
     {
       // If the consent is external (e.g when authorizations are granted by a sysadmin),
       // immediately return an error if no authorization can be found in the database.
-      case ConsentTypes.External when !authorizations.Any():
+      case ConsentTypes.External when authorizations.Count == 0:
         return Forbid(
             authenticationSchemes: OpenIddictServerAspNetCoreDefaults.AuthenticationScheme,
             properties: new AuthenticationProperties(new Dictionary<string, string>
@@ -157,8 +157,8 @@ public async Task<IActionResult> Authorize()
       // If the consent is implicit or if an authorization was found,
       // return an authorization response without displaying the consent form.
       case ConsentTypes.Implicit:
-      case ConsentTypes.External when authorizations.Any():
-      case ConsentTypes.Explicit when authorizations.Any() && !request.HasPrompt(Prompts.Consent):
+      case ConsentTypes.External when authorizations.Count != 0:
+      case ConsentTypes.Explicit when authorizations.Count != 0 && !request.HasPrompt(Prompts.Consent):
         var principal = await _signInManager.CreateUserPrincipalAsync(user);
 
         // Note: in this sample, the granted scopes match the requested scope
@@ -241,7 +241,7 @@ public async Task<IActionResult> Accept()
     // Note: the same check is already made in the other action but is repeated
     // here to ensure a malicious user can't abuse this POST-only endpoint and
     // force it to return a valid response without the external authorization.
-    if (!authorizations.Any() && await _applicationManager.HasConsentTypeAsync(application, ConsentTypes.External))
+    if (authorizations.Count == 0 && await _applicationManager.HasConsentTypeAsync(application, ConsentTypes.External))
     {
       return Forbid(
           authenticationSchemes: OpenIddictServerAspNetCoreDefaults.AuthenticationScheme,
@@ -426,35 +426,35 @@ private static IEnumerable<string> GetDestinations(Claim claim, ClaimsPrincipal
       case Claims.Name:
         yield return Destinations.AccessToken;
 
-        if (principal.HasScope(Scopes.Profile))
-        {
-          yield return Destinations.IdentityToken;
-        }
-
+        if (principal.HasScope(Scopes.Profile))
+        {
+          yield return Destinations.IdentityToken;
+        }
+
         yield break;
 
       case Claims.Email:
         yield return Destinations.AccessToken;
 
-        if (principal.HasScope(Scopes.Email))
-        {
-          yield return Destinations.IdentityToken;
-        }
-
+        if (principal.HasScope(Scopes.Email))
+        {
+          yield return Destinations.IdentityToken;
+        }
+
         yield break;
 
       case Claims.Role:
         yield return Destinations.AccessToken;
 
-        if (principal.HasScope(Scopes.Roles))
-        {
-          yield return Destinations.IdentityToken;
-        }
-
+        if (principal.HasScope(Scopes.Roles))
+        {
+          yield return Destinations.IdentityToken;
+        }
+
         yield break;
 
       // Never include the security stamp in the access and identity tokens, as it's a secret value.
-      case "AspNet.Identity.SecurityStamp":
+      case "AspNet.Identity.SecurityStamp":
         yield break;
 
       default:

samples/Server/Models/Data/UI/20231220090227_OpenIddict5Support.cs

@@ -1,59 +1,57 @@
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
-#nullable disable
 
-namespace Server.Models.Data.UI
+namespace Server.Models.Data.UI;
+
+/// <inheritdoc />
+public partial class OpenIddict5Support : Migration
 {
-    /// <inheritdoc />
-    public partial class OpenIddict5Support : Migration
-    {
-        /// <inheritdoc />
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.RenameColumn(
-                name: "Type",
-                table: "OpenIddictApplications",
-                newName: "ClientType");
-
-            migrationBuilder.AddColumn<string>(
-                name: "ApplicationType",
-                table: "OpenIddictApplications",
-                type: "TEXT",
-                maxLength: 50,
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "JsonWebKeySet",
-                table: "OpenIddictApplications",
-                type: "TEXT",
-                nullable: true);
-
-            migrationBuilder.AddColumn<string>(
-                name: "Settings",
-                table: "OpenIddictApplications",
-                type: "TEXT",
-                nullable: true);
-        }
-
-        /// <inheritdoc />
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropColumn(
-                name: "ApplicationType",
-                table: "OpenIddictApplications");
-
-            migrationBuilder.DropColumn(
-                name: "JsonWebKeySet",
-                table: "OpenIddictApplications");
-
-            migrationBuilder.DropColumn(
-                name: "Settings",
-                table: "OpenIddictApplications");
-
-            migrationBuilder.RenameColumn(
-                name: "ClientType",
-                table: "OpenIddictApplications",
-                newName: "Type");
-        }
-    }
+  /// <inheritdoc />
+  protected override void Up(MigrationBuilder migrationBuilder)
+  {
+    migrationBuilder.RenameColumn(
+        name: "Type",
+        table: "OpenIddictApplications",
+        newName: "ClientType");
+
+    migrationBuilder.AddColumn<string>(
+        name: "ApplicationType",
+        table: "OpenIddictApplications",
+        type: "TEXT",
+        maxLength: 50,
+        nullable: true);
+
+    migrationBuilder.AddColumn<string>(
+        name: "JsonWebKeySet",
+        table: "OpenIddictApplications",
+        type: "TEXT",
+        nullable: true);
+
+    migrationBuilder.AddColumn<string>(
+        name: "Settings",
+        table: "OpenIddictApplications",
+        type: "TEXT",
+        nullable: true);
+  }
+
+  /// <inheritdoc />
+  protected override void Down(MigrationBuilder migrationBuilder)
+  {
+    migrationBuilder.DropColumn(
+        name: "ApplicationType",
+        table: "OpenIddictApplications");
+
+    migrationBuilder.DropColumn(
+        name: "JsonWebKeySet",
+        table: "OpenIddictApplications");
+
+    migrationBuilder.DropColumn(
+        name: "Settings",
+        table: "OpenIddictApplications");
+
+    migrationBuilder.RenameColumn(
+        name: "ClientType",
+        table: "OpenIddictApplications",
+        newName: "Type");
+  }
 }

src/identity/OpenIddict.UI.Identity.Api/DependencyInjection.cs

@@ -71,13 +71,9 @@ private static IServiceCollection AddAuthorizationServices(
     Action<AuthorizationPolicyBuilder> policy
   )
   {
-    services.AddAuthorization(options =>
-    {
-      options.AddPolicy(
-        Policies.OpenIddictUiIdentityApiPolicy,
-        policy
-      );
-    });
+    services.AddAuthorizationBuilder()
+        .AddPolicy(Policies.OpenIddictUiIdentityApiPolicy, policy
+);
 
     return services;
   }

src/identity/OpenIddict.UI.Identity.Infrastructure/Services/AccountService.cs

@@ -90,7 +90,7 @@ public async Task<UserInfo> GetUserAsync(string id)
           Value = x.Value
         };
       })),
-      Roles = roles.ToList()
+      Roles = [.. roles]
     };
   }
 

src/openiddict/OpenIddict.UI.Api/Application/ApplicationApiService.cs

@@ -4,7 +4,6 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using tomware.OpenIddict.UI.Infrastructure;
-using tomware.OpenIddict.UI.Suite.Core;
 
 namespace tomware.OpenIddict.UI.Api;
 

src/openiddict/OpenIddict.UI.Api/Application/ApplicationOptionsViewModel.cs

@@ -5,12 +5,12 @@ namespace tomware.OpenIddict.UI.Api;
 
 public class ApplicationOptionsViewModel
 {
-  public List<string> Permissions { get; set; } = new List<string>();
+  public List<string> Permissions { get; set; } = [];
 
-  public List<string> Requirements { get; set; } = new List<string>();
+  public List<string> Requirements { get; set; } = [];
 
-  public List<string> Types { get; set; } = new List<string>{
+  public List<string> Types { get; set; } = [
     ClientTypes.Public,
     ClientTypes.Confidential
-  };
+  ];
 }

src/openiddict/OpenIddict.UI.Api/DependencyInjection.cs

@@ -47,13 +47,9 @@ private static IServiceCollection AddAuthorizationServices(
     Action<AuthorizationPolicyBuilder> policy
   )
   {
-    services.AddAuthorization(options =>
-    {
-      options.AddPolicy(
-        Policies.OpenIddictUiApiPolicy,
-        policy
-      );
-    });
+    services.AddAuthorizationBuilder()
+        .AddPolicy(Policies.OpenIddictUiApiPolicy, policy
+);
 
     return services;
   }

src/openiddict/OpenIddict.UI.Api/Options/OpenIddictUIApiOptions.cs

@@ -10,7 +10,7 @@ public class OpenIddictUIApiOptions
   /// <summary>
   /// Tell the system about the allowed Permissions it is built/configured for.
   /// </summary>
-  public List<string> Permissions { get; set; } = new List<string>();
+  public List<string> Permissions { get; set; } = [];
 
   /// <summary>
   /// Registers a conventional route prefix for the API controllers. Defaults to "api/".

src/openiddict/OpenIddict.UI.Api/Scope/ScopeViewModel.cs

@@ -14,5 +14,5 @@ public class ScopeViewModel
 
   public string Description { get; set; }
 
-  public List<string> Resources { get; set; } = new List<string>();
+  public List<string> Resources { get; set; } = [];
 }

tests/Helpers/IntegrationContext.cs

@@ -35,7 +35,7 @@ protected IntegrationContext(IntegrationApplicationFactory<Testing> factory)
     _accessToken = _factory.AccessToken;
   }
 
-  protected static T Deserialize<T>(string responseBody) 
+  protected static T Deserialize<T>(string responseBody)
     => JsonSerializer.Deserialize<T>(responseBody, JsonSerializerOptions);
 
   protected async Task<HttpResponseMessage> GetAsync(

tests/Integration/ApplicationApiTest.cs

@@ -180,7 +180,7 @@ public async Task UpdateConfidentialApplicationApplicationIsNotUpdated()
     Assert.Equal(HttpStatusCode.BadRequest, response.StatusCode);
   }
 
-  [Fact(Skip = "There seems to be a bug when using InMemoryDatabase.")]
+  [Fact]
   public async Task DeleteAsyncApplicationDeleted()
   {
     // Arrange

tests/Integration/ScopeApiTest.cs

@@ -124,11 +124,11 @@ public async Task GetAsyncRoleReceived()
       Name = TEST_SCOPE,
       DisplayName = "displayname",
       Description = "description",
-      Resources = new List<string>
-      {
+      Resources =
+      [
         "resource1",
         "resource2"
-      }
+      ]
     });
     var id = await createResponse.Content.ReadAsJsonAsync<string>();