Merge branch 'main' into dmkorolev/formvalueproviderfactory

Author: DeagleGross

.github/copilot-instructions.md

@@ -4,6 +4,7 @@
 * Always use the latest version C#, currently C# 13 features.
 * Never change global.json unless explicitly asked to.
 * Never change package.json or package-lock.json files unless explicitly asked to.
+* Never change NuGet.config files unless explicitly asked to.
 
 ## Formatting
 

docs/DailyBuilds.md

@@ -4,7 +4,7 @@ Daily builds include the latest source code changes. They are not supported for
 
 If you want to download the latest daily build and use it in a project, then you need to:
 
-* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
+* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/dotnet/blob/main/docs/builds-table.md).
 * Add a NuGet.Config to your project directory with the following content:
 
 ## .NET 8

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.5.25265.106"
+    "version": "10.0.100-preview.4.25216.37"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.5.25265.106",
+    "dotnet": "10.0.100-preview.4.25216.37",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

src/Http/Authentication.Abstractions/src/AuthenticationOptions.cs

@@ -91,7 +91,7 @@ public void AddScheme(string name, Action<AuthenticationSchemeBuilder> configure
     public string? DefaultForbidScheme { get; set; }
 
     /// <summary>
-    /// If true, SignIn should throw if attempted with a user is not authenticated.
+    /// If true, SignIn should throw if attempted with a user who is not authenticated.
     /// A user is considered authenticated if <see cref="ClaimsIdentity.IsAuthenticated"/> returns <see langword="true" /> for the <see cref="ClaimsPrincipal"/> associated with the HTTP request.
     /// </summary>
     public bool RequireAuthenticatedSignIn { get; set; } = true;

src/OpenApi/src/Schemas/OpenApiJsonSchema.Helpers.cs

@@ -140,6 +140,8 @@ internal sealed partial class OpenApiJsonSchema
         {
             type = JsonSchemaType.Array;
             var array = new JsonArray();
+            // Read to process JsonTokenType.StartArray before advancing
+            reader.Read();
             while (reader.TokenType != JsonTokenType.EndArray)
             {
                 array.Add(ReadJsonNode(ref reader));

src/OpenApi/test/Microsoft.AspNetCore.OpenApi.Tests/Services/OpenApiSchemaService/OpenApiSchemaService.ParameterSchemas.cs

@@ -722,4 +722,93 @@ public static bool TryParse(string value, out Student result)
             return true;
         }
     }
+
+    // Regression test for https://github.com/dotnet/aspnetcore/issues/62023
+    // Testing that the array parsing in our OpenApiJsonSchema works
+    [Fact]
+    public async Task CustomConverterThatOutputsArrayWithDefaultValue()
+    {
+        // Arrange
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.ConfigureHttpJsonOptions(options =>
+        {
+            options.SerializerOptions.Converters.Add(new EnumArrayTypeConverter());
+        });
+        var builder = CreateBuilder(serviceCollection);
+
+        // Act
+        builder.MapPost("/api", (EnumArrayType e = EnumArrayType.None) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var param = Assert.Single(operation.Parameters);
+            Assert.NotNull(param.Schema);
+            Assert.IsType<JsonArray>(param.Schema.Default);
+            // Type is null, it's up to the user to configure this via a custom schema
+            // transformer for types with a converter.
+            Assert.Null(param.Schema.Type);
+        });
+    }
+
+    [Fact]
+    public async Task CustomConverterThatOutputsObjectWithDefaultValue()
+    {
+        // Arrange
+        var serviceCollection = new ServiceCollection();
+        serviceCollection.ConfigureHttpJsonOptions(options =>
+        {
+            options.SerializerOptions.Converters.Add(new EnumObjectTypeConverter());
+        });
+        var builder = CreateBuilder(serviceCollection);
+
+        // Act
+        builder.MapPost("/api", (EnumArrayType e = EnumArrayType.None) => { });
+
+        // Assert
+        await VerifyOpenApiDocument(builder, document =>
+        {
+            var operation = document.Paths["/api"].Operations[HttpMethod.Post];
+            var param = Assert.Single(operation.Parameters);
+            Assert.NotNull(param.Schema);
+            Assert.IsType<JsonObject>(param.Schema.Default);
+            // Type is null, it's up to the user to configure this via a custom schema
+            // transformer for types with a converter.
+            Assert.Null(param.Schema.Type);
+        });
+    }
+
+    public enum EnumArrayType
+    {
+        None = 1
+    }
+
+    public class EnumArrayTypeConverter : JsonConverter<EnumArrayType>
+    {
+        public override EnumArrayType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new EnumArrayType();
+        }
+
+        public override void Write(Utf8JsonWriter writer, EnumArrayType value, JsonSerializerOptions options)
+        {
+            writer.WriteStartArray();
+            writer.WriteEndArray();
+        }
+    }
+
+    public class EnumObjectTypeConverter : JsonConverter<EnumArrayType>
+    {
+        public override EnumArrayType Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            return new EnumArrayType();
+        }
+
+        public override void Write(Utf8JsonWriter writer, EnumArrayType value, JsonSerializerOptions options)
+        {
+            writer.WriteStartObject();
+            writer.WriteEndObject();
+        }
+    }
 }

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/ExternalLogin.razor

@@ -72,12 +72,14 @@
         if (RemoteError is not null)
         {
             RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
+            return;
         }
 
         var info = await SignInManager.GetExternalLoginInfoAsync();
         if (info is null)
         {
             RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
+            return;
         }
 
         externalLoginInfo = info;
@@ -118,6 +120,7 @@
                 externalLoginInfo.Principal.Identity?.Name,
                 externalLoginInfo.LoginProvider);
             RedirectManager.RedirectTo(ReturnUrl);
+            return;
         }
         else if (result.IsLockedOut)
         {
@@ -168,13 +171,17 @@
                 {
                     RedirectManager.RedirectTo("Account/RegisterConfirmation", new() { ["email"] = Input.Email });
                 }
-
-                await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
-                RedirectManager.RedirectTo(ReturnUrl);
+                else
+                {
+                    await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
+                    RedirectManager.RedirectTo(ReturnUrl);
+                }
             }
         }
-
-        message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
+        else
+        {
+            message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
+        }
     }
 
     private ApplicationUser CreateUser()

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/ExternalLogins.razor

@@ -123,9 +123,11 @@
         {
             RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not removed.", HttpContext);
         }
-
-        await SignInManager.RefreshSignInAsync(user);
-        RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
+        else
+        {
+            await SignInManager.RefreshSignInAsync(user);
+            RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
+        }
     }
 
     private async Task OnGetLinkLoginCallbackAsync()
@@ -145,14 +147,16 @@
         }
 
         var result = await UserManager.AddLoginAsync(user, info);
-        if (!result.Succeeded)
+        if (result.Succeeded)
+        {
+            // Clear the existing external cookie to ensure a clean login process
+            await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
+
+            RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
+        }
+        else
         {
             RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not added. External logins can only be associated with one account.", HttpContext);
         }
-
-        // Clear the existing external cookie to ensure a clean login process
-        await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
-
-        RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
     }
 }

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/Index.razor

@@ -72,6 +72,7 @@
             if (!setPhoneResult.Succeeded)
             {
                 RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to set phone number.", HttpContext);
+                return;
             }
         }
 

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Account/Pages/Manage/PersonalData.razor

@@ -37,7 +37,6 @@
         if (user is null)
         {
             RedirectManager.RedirectToInvalidUser(UserManager, HttpContext);
-            return;
         }
     }
 }