cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 08:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Jordan Brown
2020-08-15 13:24:45 -04:00
parent 6cbae0a0f5 57050f4196
commit 27cb01f2ce
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Core/SwaggerConfiguration.cs
+8 -1
View File
@@ -4,6 +4,7 @@ using Microsoft.OpenApi.Any;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Net;
@@ -190,6 +191,11 @@ namespace Tgstation.Server.Host.Core
operation.OperationId = $"{context.MethodInfo.DeclaringType.Name}.{context.MethodInfo.Name}";
// request bodies are never nullable
var bodySchemas = operation.RequestBody?.Content.Select(x => x.Value.Schema) ?? Enumerable.Empty<OpenApiSchema>();
foreach (var bodySchema in bodySchemas)
bodySchema.Nullable = false;
var authAttributes = context
.MethodInfo
.DeclaringType
@@ -356,7 +362,8 @@ namespace Tgstation.Server.Host.Core
? context.Type.GenericTypeArguments.First()
: context.Type;
if (nonNullableType != context.Type)
if (nonNullableType != context.Type
&& !context.Type.GetInterfaces().Any(x => x == typeof(IEnumerable)))
schema.Nullable = true;
if (!schema.Enum?.Any() ?? false)