Fix AuthenticationStateSerializer to use declarative persistent component state

Co-authored-by: ilonatommy <[email protected]>

Author: Copilot

src/Components/WebAssembly/Server/src/AuthenticationStateSerializer.cs

@@ -2,55 +2,40 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.AspNetCore.Components.Authorization;
-using Microsoft.AspNetCore.Components.Web;
 using Microsoft.Extensions.Options;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Server;
 
-internal sealed class AuthenticationStateSerializer : IHostEnvironmentAuthenticationStateProvider, IDisposable
+internal sealed class AuthenticationStateSerializer : IHostEnvironmentAuthenticationStateProvider
 {
     // Do not change. This must match all versions of the server-side DeserializedAuthenticationStateProvider.PersistenceKey.
     internal const string PersistenceKey = $"__internal__{nameof(AuthenticationState)}";
 
-    private readonly PersistentComponentState _state;
     private readonly Func<AuthenticationState, ValueTask<AuthenticationStateData?>> _serializeCallback;
-    private readonly PersistingComponentStateSubscription _subscription;
 
     private Task<AuthenticationState>? _authenticationStateTask;
     private AuthenticationStateData? _authenticationStateData;
 
-    [PersistentComponentStateStore]
+    [SupplyParameterFromPersistentComponentState]
     public AuthenticationStateData? AuthStateData
     {
         get => _authenticationStateData;
         set => _authenticationStateData = value;
     }
 
-    public AuthenticationStateSerializer(PersistentComponentState persistentComponentState, IOptions<AuthenticationStateSerializationOptions> options)
+    public AuthenticationStateSerializer(IOptions<AuthenticationStateSerializationOptions> options)
     {
-        _state = persistentComponentState;
         _serializeCallback = options.Value.SerializationCallback;
-        _subscription = persistentComponentState.RegisterOnPersisting(OnPersistingAsync, RenderMode.InteractiveWebAssembly);
-    }
-
-    private async Task OnPersistingAsync()
-    {
-        if (_authenticationStateTask is null)
-        {
-            throw new InvalidOperationException($"{nameof(SetAuthenticationState)} must be called before the {nameof(PersistentComponentState)}.{nameof(PersistentComponentState.RegisterOnPersisting)} callback.");
-        }
-
-        AuthStateData = await _serializeCallback(await _authenticationStateTask);
     }
 
     /// <inheritdoc />
-    public void SetAuthenticationState(Task<AuthenticationState> authenticationStateTask)
+    public async void SetAuthenticationState(Task<AuthenticationState> authenticationStateTask)
     {
         _authenticationStateTask = authenticationStateTask ?? throw new ArgumentNullException(nameof(authenticationStateTask));
-    }
-
-    public void Dispose()
-    {
-        _subscription.Dispose();
+        
+        if (_authenticationStateTask is not null)
+        {
+            AuthStateData = await _serializeCallback(await _authenticationStateTask);
+        }
     }
 }

src/Components/WebAssembly/Server/src/WebAssemblyRazorComponentsBuilderExtensions.cs

@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Endpoints.Infrastructure;
 using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Server;
 using Microsoft.AspNetCore.Components.WebAssembly.Services;
 using Microsoft.Extensions.DependencyInjection.Extensions;

src/Components/WebAssembly/WebAssembly.Authentication/src/Services/DeserializedAuthenticationStateProvider.cs

@@ -1,11 +1,9 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Diagnostics.CodeAnalysis;
 using System.Security.Claims;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Options;
-using static Microsoft.AspNetCore.Internal.LinkerFlags;
 
 namespace Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 
@@ -19,7 +17,6 @@ internal sealed class DeserializedAuthenticationStateProvider : AuthenticationSt
     [SupplyParameterFromPersistentComponentState]
     private AuthenticationStateData? AuthStateData { get; set; }
 
-
     public DeserializedAuthenticationStateProvider(IOptions<AuthenticationStateDeserializationOptions> options)
     {
         _authenticationStateTask = AuthStateData is not null

src/Components/WebAssembly/WebAssembly.Authentication/src/WebAssemblyAuthenticationServiceCollectionExtensions.cs

@@ -6,6 +6,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Infrastructure;
+using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication;
 using Microsoft.AspNetCore.Components.WebAssembly.Authentication.Internal;
 using Microsoft.Extensions.DependencyInjection.Extensions;