Fix issue with FromForm enums (#3164)

Fix issue with .NET 7+.
domaindrivendev · Nov 22, 2024 · e727e8d · e727e8d
1 parent 340eef3
commit e727e8d
Show file tree

Hide file tree

Showing 3 changed files with 62 additions and 52 deletions.
diff --git a/src/Swashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/SwaggerGenerator.cs b/src/Swashbuckle.AspNetCore.SwaggerGen/SwaggerGenerator/SwaggerGenerator.cs
@@ -851,7 +851,7 @@ private OpenApiSchema GenerateSchemaFromFormParameters(
                     : new OpenApiSchema { Type = "string" };
 
                     if (schema.Reference is null
-                    || (formParameter.Type is not null && (Nullable.GetUnderlyingType(formParameter.Type) ?? formParameter.Type).IsEnum))
+                    || (formParameter.ModelMetadata?.ModelType is not null && (Nullable.GetUnderlyingType(formParameter.ModelMetadata.ModelType) ?? formParameter.ModelMetadata.ModelType).IsEnum))
                     {
                         var name = _options.DescribeAllParametersInCamelCase
                             ? formParameter.Name.ToCamelCase()

diff --git a/...VerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Basic_DotNet_8.verified.txt b/...VerifyIntegrationTest.SwaggerEndpoint_ReturnsValidSwaggerJson_Basic_DotNet_8.verified.txt
@@ -675,32 +675,33 @@
           content: {
             multipart/form-data: {
               schema: {
-                allOf: [
-                  null,
-                  null,
-                  {
-                    type: object,
-                    properties: {
-                      name: {
-                        type: string,
-                        description: Summary for Name,
-                        example: MyName
-                      },
-                      phoneNumbers: {
-                        type: array,
-                        items: {
-                          type: integer,
-                          format: int32
-                        },
-                        description: Sumary for PhoneNumbers
-                      },
-                      formFile: {
-                        type: string,
-                        format: binary
-                      }
-                    }
+                type: object,
+                properties: {
+                  name: {
+                    type: string,
+                    description: Summary for Name,
+                    example: MyName
+                  },
+                  phoneNumbers: {
+                    type: array,
+                    items: {
+                      type: integer,
+                      format: int32
+                    },
+                    description: Sumary for PhoneNumbers
+                  },
+                  logLevel: {
+                    $ref: #/components/schemas/LogLevel
+                  },
+                  formFile: {
+                    type: string,
+                    description: Description for file,
+                    format: binary
+                  },
+                  dateTimeKind: {
+                    $ref: #/components/schemas/DateTimeKind
                   }
-                ]
+                }
               },
               encoding: {
                 name: {
@@ -709,8 +710,14 @@
                 phoneNumbers: {
                   style: form
                 },
+                logLevel: {
+                  style: form
+                },
                 formFile: {
                   style: form
+                },
+                dateTimeKind: {
+                  style: form
                 }
               }
             }

diff --git a/...point_ReturnsValidSwaggerJson_startupType=Basic.Startup_swaggerRequestUri=v1.verified.txt b/...point_ReturnsValidSwaggerJson_startupType=Basic.Startup_swaggerRequestUri=v1.verified.txt
@@ -684,36 +684,33 @@
           "content": {
             "multipart/form-data": {
               "schema": {
-                "allOf": [
-                  {
+                "type": "object",
+                "properties": {
+                  "name": {
+                    "type": "string",
+                    "description": "Summary for Name",
+                    "example": "MyName"
+                  },
+                  "phoneNumbers": {
+                    "type": "array",
+                    "items": {
+                      "type": "integer",
+                      "format": "int32"
+                    },
+                    "description": "Sumary for PhoneNumbers"
+                  },
+                  "logLevel": {
                     "$ref": "#/components/schemas/LogLevel"
                   },
-                  {
-                    "$ref": "#/components/schemas/DateTimeKind"
+                  "formFile": {
+                    "type": "string",
+                    "description": "Description for file",
+                    "format": "binary"
                   },
-                  {
-                    "type": "object",
-                    "properties": {
-                      "name": {
-                        "type": "string",
-                        "description": "Summary for Name",
-                        "example": "MyName"
-                      },
-                      "phoneNumbers": {
-                        "type": "array",
-                        "items": {
-                          "type": "integer",
-                          "format": "int32"
-                        },
-                        "description": "Sumary for PhoneNumbers"
-                      },
-                      "formFile": {
-                        "type": "string",
-                        "format": "binary"
-                      }
-                    }
+                  "dateTimeKind": {
+                    "$ref": "#/components/schemas/DateTimeKind"
                   }
-                ]
+                }
               },
               "encoding": {
                 "name": {
@@ -722,8 +719,14 @@
                 "phoneNumbers": {
                   "style": "form"
                 },
+                "logLevel": {
+                  "style": "form"
+                },
                 "formFile": {
                   "style": "form"
+                },
+                "dateTimeKind": {
+                  "style": "form"
                 }
               }
             }