From a2116511c4b6d35969f9edae121d36a9a128204a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Chalet?= Date: Fri, 13 May 2022 21:14:02 +0200 Subject: [PATCH] Update the nullability attributes of OpenIddictRequest.Audiences/Resources to indicate that null values can be present in the returned array --- .../Primitives/OpenIddictParameter.cs | 4 ++-- .../Primitives/OpenIddictRequest.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/OpenIddict.Abstractions/Primitives/OpenIddictParameter.cs b/src/OpenIddict.Abstractions/Primitives/OpenIddictParameter.cs index 74d8da22..498404e3 100644 --- a/src/OpenIddict.Abstractions/Primitives/OpenIddictParameter.cs +++ b/src/OpenIddict.Abstractions/Primitives/OpenIddictParameter.cs @@ -1097,7 +1097,7 @@ public readonly struct OpenIddictParameter : IEquatable // a number or a boolean, return its string representation. JsonValueKind.String or JsonValueKind.Number or JsonValueKind.True or JsonValueKind.False - => element.ToString()!, + => element.ToString(), _ => null }; @@ -1165,7 +1165,7 @@ public readonly struct OpenIddictParameter : IEquatable // or a boolean, return an 1-item array with its string representation. JsonValueKind.String or JsonValueKind.Number or JsonValueKind.True or JsonValueKind.False - => new string?[] { element.ToString()! }, + => new string?[] { element.ToString() }, // When the parameter is a JsonElement representing an array, return the elements as strings. JsonValueKind.Array => CreateArrayFromJsonElement(element), diff --git a/src/OpenIddict.Abstractions/Primitives/OpenIddictRequest.cs b/src/OpenIddict.Abstractions/Primitives/OpenIddictRequest.cs index 5915b7c5..19848660 100644 --- a/src/OpenIddict.Abstractions/Primitives/OpenIddictRequest.cs +++ b/src/OpenIddict.Abstractions/Primitives/OpenIddictRequest.cs @@ -127,9 +127,9 @@ public class OpenIddictRequest : OpenIddictMessage /// /// Gets or sets the "audience" parameters. /// - public string[]? Audiences + public string?[]? Audiences { - get => (string[]?) GetParameter(OpenIddictConstants.Parameters.Audience); + get => (string?[]?) GetParameter(OpenIddictConstants.Parameters.Audience); set => SetParameter(OpenIddictConstants.Parameters.Audience, value); } @@ -379,9 +379,9 @@ public class OpenIddictRequest : OpenIddictMessage /// /// Gets or sets the "resource" parameters. /// - public string[]? Resources + public string?[]? Resources { - get => (string[]?) GetParameter(OpenIddictConstants.Parameters.Resource); + get => (string?[]?) GetParameter(OpenIddictConstants.Parameters.Resource); set => SetParameter(OpenIddictConstants.Parameters.Resource, value); }