Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion src/Refitter.Core/ParameterExtractor.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
using System.Globalization;
using System.Text;
using NJsonSchema;
using NSwag;
Expand Down Expand Up @@ -54,7 +55,7 @@ public static IEnumerable<string> GetParameters(
&& securityScheme.In == OpenApiSecurityApiKeyLocation.Header
&& !operationModel.Parameters.Any(p => p.Kind == OpenApiParameterKind.Header && p.IsHeader && p.Name == securityScheme.Name))
{
headerParameters.Add($"[Header(\"{securityScheme.Name}\")] string {securityScheme.Name}");
headerParameters.Add($"[Header(\"{securityScheme.Name}\")] string {ReplaceUnsafeCharacters(securityScheme.Name)}");
}
}
}
Expand Down Expand Up @@ -95,6 +96,24 @@ public static IEnumerable<string> GetParameters(
return parameters;
}

private static string ReplaceUnsafeCharacters(
string unsafeText)
{
var safeText = string.Empty;
foreach (var character in unsafeText)
{
var safeCharacter = character;
if (char.GetUnicodeCategory(character) == UnicodeCategory.OtherPunctuation)
{
safeCharacter = '_';
}

safeText += safeCharacter;
}

return safeText;
}

private static List<string> ReOrderNullableParameters(
List<string> parameters,
RefitGeneratorSettings settings)
Expand Down
52 changes: 52 additions & 0 deletions src/Refitter.Tests/Resources/EmbeddedResources.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,50 @@ public static string SwaggerPetstoreYamlV3WithAuthenticationHeaders
}
}

public static string SwaggerPetstoreJsonV2WithUnsafeAuthenticationHeaders
{
get
{
using var stream = GetStream("V2.SwaggerPetstoreWithUnsafeAuthenticationHeaders.json");
using var reader = new StreamReader(stream);

return reader.ReadToEnd();
}
}

public static string SwaggerPetstoreJsonV3WithUnsafeAuthenticationHeaders
{
get
{
using var stream = GetStream("V3.SwaggerPetstoreWithUnsafeAuthenticationHeaders.json");
using var reader = new StreamReader(stream);

return reader.ReadToEnd();
}
}

public static string SwaggerPetstoreYamlV2WithUnsafeAuthenticationHeaders
{
get
{
using var stream = GetStream("V2.SwaggerPetstoreWithUnsafeAuthenticationHeaders.yaml");
using var reader = new StreamReader(stream);

return reader.ReadToEnd();
}
}

public static string SwaggerPetstoreYamlV3WithUnsafeAuthenticationHeaders
{
get
{
using var stream = GetStream("V3.SwaggerPetstoreWithUnsafeAuthenticationHeaders.yaml");
using var reader = new StreamReader(stream);

return reader.ReadToEnd();
}
}

public static string SwaggerIllegalPathsJsonV3
{
get
Expand Down Expand Up @@ -186,6 +230,14 @@ public static string GetSwaggerPetstore(SampleOpenSpecifications version)
SwaggerPetstoreYamlV2WithAuthenticationHeaders,
SampleOpenSpecifications.SwaggerPetstoreYamlV3WithAuthenticationHeaders =>
SwaggerPetstoreYamlV3WithAuthenticationHeaders,
SampleOpenSpecifications.SwaggerPetstoreJsonV2WithUnsafeAuthenticationHeaders =>
SwaggerPetstoreJsonV2WithUnsafeAuthenticationHeaders,
SampleOpenSpecifications.SwaggerPetstoreJsonV3WithUnsafeAuthenticationHeaders =>
SwaggerPetstoreJsonV3WithUnsafeAuthenticationHeaders,
SampleOpenSpecifications.SwaggerPetstoreYamlV2WithUnsafeAuthenticationHeaders =>
SwaggerPetstoreYamlV2WithUnsafeAuthenticationHeaders,
SampleOpenSpecifications.SwaggerPetstoreYamlV3WithUnsafeAuthenticationHeaders =>
SwaggerPetstoreYamlV3WithUnsafeAuthenticationHeaders,
_ => throw new ArgumentOutOfRangeException(nameof(version), version, null)
};
}
Expand Down
4 changes: 4 additions & 0 deletions src/Refitter.Tests/Resources/SampleOpenSpecifications.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,9 @@ public enum SampleOpenSpecifications
SwaggerPetstoreJsonV3WithAuthenticationHeaders,
SwaggerPetstoreYamlV2WithAuthenticationHeaders,
SwaggerPetstoreYamlV3WithAuthenticationHeaders,
SwaggerPetstoreJsonV2WithUnsafeAuthenticationHeaders,
SwaggerPetstoreJsonV3WithUnsafeAuthenticationHeaders,
SwaggerPetstoreYamlV2WithUnsafeAuthenticationHeaders,
SwaggerPetstoreYamlV3WithUnsafeAuthenticationHeaders,
IllegalPathsJsonV3
}
Loading