Annotate WebAssembly.Authentication for nullability (dotnet#43442)

* Annotate WebAssembly.Authentication for nullability
* PR feedback
* Fix build

Author: JamesNK

src/Components/Components/src/NavigationManager.cs

@@ -209,7 +209,7 @@ protected virtual void EnsureInitialized()
     /// </summary>
     /// <param name="relativeUri">The relative URI.</param>
     /// <returns>The absolute URI.</returns>
-    public Uri ToAbsoluteUri(string relativeUri)
+    public Uri ToAbsoluteUri(string? relativeUri)
     {
         AssertInitialized();
         return new Uri(_baseUri!, relativeUri);

src/Components/Components/src/PublicAPI.Unshipped.txt

@@ -56,3 +56,5 @@ static Microsoft.AspNetCore.Components.EventCallbackFactoryBinderExtensions.Crea
 static Microsoft.AspNetCore.Components.EventCallbackFactoryBinderExtensions.CreateBinder<T>(this Microsoft.AspNetCore.Components.EventCallbackFactory! factory, object! receiver, Microsoft.AspNetCore.Components.EventCallback<T> setter, T existingValue, System.Globalization.CultureInfo? culture = null) -> Microsoft.AspNetCore.Components.EventCallback<Microsoft.AspNetCore.Components.ChangeEventArgs!>
 virtual Microsoft.AspNetCore.Components.NavigationManager.HandleLocationChangingHandlerException(System.Exception! ex, Microsoft.AspNetCore.Components.Routing.LocationChangingContext! context) -> void
 virtual Microsoft.AspNetCore.Components.NavigationManager.SetNavigationLockState(bool value) -> void
+*REMOVED*Microsoft.AspNetCore.Components.NavigationManager.ToAbsoluteUri(string! relativeUri) -> System.Uri!
+Microsoft.AspNetCore.Components.NavigationManager.ToAbsoluteUri(string? relativeUri) -> System.Uri!

src/Components/WebAssembly/WebAssembly.Authentication/src/Microsoft.AspNetCore.Components.WebAssembly.Authentication.csproj

@@ -8,7 +8,6 @@
     <IsShippingPackage>true</IsShippingPackage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsTrimmable>true</IsTrimmable>
-    <Nullable>disable</Nullable>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/AccessToken.cs

@@ -11,7 +11,7 @@ public class AccessToken
     /// <summary>
     /// Gets or sets the list of granted scopes for the token.
     /// </summary>
-    public IReadOnlyList<string> GrantedScopes { get; set; }
+    public IReadOnlyList<string> GrantedScopes { get; set; } = default!;
 
     /// <summary>
     /// Gets the expiration time of the token.
@@ -21,5 +21,5 @@ public class AccessToken
     /// <summary>
     /// Gets the serialized representation of the token.
     /// </summary>
-    public string Value { get; set; }
+    public string Value { get; set; } = default!;
 }

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/InteractiveRequestOptions.cs

@@ -27,9 +27,9 @@ public sealed class InteractiveRequestOptions
     /// <summary>
     /// Gets the scopes this request must use in the operation.
     /// </summary>
-    public IEnumerable<string> Scopes { get; init; }
+    public IEnumerable<string> Scopes { get; init; } = Array.Empty<string>();
 
-    private Dictionary<string, object> AdditionalRequestParameters { get; set; }
+    private Dictionary<string, object>? AdditionalRequestParameters { get; set; }
 
     /// <summary>
     /// Tries to add an additional parameter to pass in to the underlying provider.
@@ -43,7 +43,7 @@ public sealed class InteractiveRequestOptions
     {
         ArgumentNullException.ThrowIfNull(name, nameof(name));
         AdditionalRequestParameters ??= new();
-        return AdditionalRequestParameters.TryAdd(name, value);
+        return AdditionalRequestParameters.TryAdd(name, value!);
     }
 
     /// <summary>
@@ -58,7 +58,7 @@ public bool TryRemoveAdditionalParameter(string name)
     /// <summary>
     /// Tries to retrieve an existing additional parameter.
     /// </summary>
-    public bool TryGetAdditionalParameter<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string name, out TValue value)
+    public bool TryGetAdditionalParameter<[DynamicallyAccessedMembers(JsonSerialized)] TValue>(string name, [NotNullWhen(true)] out TValue? value)
     {
         ArgumentNullException.ThrowIfNull(name);
 
@@ -69,7 +69,7 @@ public bool TryRemoveAdditionalParameter(string name)
         }
         if (rawValue is JsonElement json)
         {
-            value = Deserialize(json);
+            value = Deserialize(json)!;
             AdditionalRequestParameters[name] = value;
             return true;
         }
@@ -83,14 +83,14 @@ public bool TryRemoveAdditionalParameter(string name)
             "Trimming",
             "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code",
             Justification = "The types this method deserializes are anotated with 'DynamicallyAccessedMembers' to prevent them from being linked out as part of 'TryAddAdditionalParameter'.")]
-        static TValue Deserialize(JsonElement element) => element.Deserialize<TValue>();
+        static TValue Deserialize(JsonElement element) => element.Deserialize<TValue>()!;
     }
 
     internal string ToState() => JsonSerializer.Serialize(this, InteractiveRequestOptionsSerializerContext.Default.InteractiveRequestOptions);
 
     internal static InteractiveRequestOptions FromState(string state) => JsonSerializer.Deserialize(
         state,
-        InteractiveRequestOptionsSerializerContext.Default.InteractiveRequestOptions);
+        InteractiveRequestOptionsSerializerContext.Default.InteractiveRequestOptions)!;
 
     internal class Converter : JsonConverter<InteractiveRequestOptions>
     {
@@ -119,7 +119,7 @@ internal record struct OptionsRecord(
             [property: JsonInclude] string ReturnUrl,
             [property: JsonInclude] IEnumerable<string> Scopes,
             [property: JsonInclude] InteractionType Interaction,
-            [property: JsonInclude] Dictionary<string, object> AdditionalRequestParameters);
+            [property: JsonInclude] Dictionary<string, object>? AdditionalRequestParameters);
     }
 }
 

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteAuthenticationContext.cs

@@ -15,15 +15,15 @@ public class RemoteAuthenticationContext<[DynamicallyAccessedMembers(JsonSeriali
     /// <summary>
     /// Gets or sets the url for the current authentication operation.
     /// </summary>
-    public string Url { get; set; }
+    public string? Url { get; set; }
 
     /// <summary>
     /// Gets or sets the state instance for the current authentication operation.
     /// </summary>
-    public TRemoteAuthenticationState State { get; set; }
+    public TRemoteAuthenticationState? State { get; set; }
 
     /// <summary>
     /// Gets or sets the interaction request for the current authentication operation.
     /// </summary>
-    public InteractiveRequestOptions InteractiveRequest { get; set; }
+    public InteractiveRequestOptions? InteractiveRequest { get; set; }
 }

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteAuthenticationResult.cs

@@ -17,10 +17,10 @@ public class RemoteAuthenticationResult<TRemoteAuthenticationState> where TRemot
     /// <summary>
     /// Gets or sets the error message of a failed authentication operation.
     /// </summary>
-    public string ErrorMessage { get; set; }
+    public string? ErrorMessage { get; set; }
 
     /// <summary>
     /// Gets or sets the preserved state of a successful authentication operation.
     /// </summary>
-    public TRemoteAuthenticationState State { get; set; }
+    public TRemoteAuthenticationState? State { get; set; }
 }

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteAuthenticationState.cs

@@ -12,5 +12,5 @@ public class RemoteAuthenticationState
     /// Gets or sets the URL to which the application should redirect after a successful authentication operation.
     /// It must be a url within the page.
     /// </summary>
-    public string ReturnUrl { get; set; }
+    public string? ReturnUrl { get; set; }
 }

src/Components/WebAssembly/WebAssembly.Authentication/src/Models/RemoteUserAccount.cs

@@ -17,5 +17,5 @@ public class RemoteUserAccount
     /// Gets or sets properties not explicitly mapped about the user.
     /// </summary>
     [JsonExtensionData]
-    public IDictionary<string, object> AdditionalProperties { get; set; }
+    public IDictionary<string, object> AdditionalProperties { get; set; } = default!;
 }

src/Components/WebAssembly/WebAssembly.Authentication/src/NavigationManagerExtensions.cs

@@ -32,14 +32,14 @@ public static void NavigateToLogout(this NavigationManager manager, [StringSynta
     /// <param name="manager">The <see cref="NavigationManager"/>.</param>
     /// <param name="logoutPath">The path to navigate too.</param>
     /// <param name="returnUrl">The url to redirect the user to after logging out.</param>
-    public static void NavigateToLogout(this NavigationManager manager, [StringSyntax(StringSyntaxAttribute.Uri, UriKind.Relative)] string logoutPath, [StringSyntax(StringSyntaxAttribute.Uri)] string returnUrl)
+    public static void NavigateToLogout(this NavigationManager manager, [StringSyntax(StringSyntaxAttribute.Uri, UriKind.Relative)] string logoutPath, [StringSyntax(StringSyntaxAttribute.Uri)] string? returnUrl)
     {
         manager.NavigateTo(logoutPath, new NavigationOptions
         {
             HistoryEntryState = new InteractiveRequestOptions
             {
                 Interaction = InteractionType.SignOut,
-                ReturnUrl = returnUrl
+                ReturnUrl = returnUrl!
             }.ToState()
         });
     }