misc: update Fusion to v3.1.11

Author: alexyakunin

docs/tutorial/Part11.md

@@ -166,6 +166,7 @@ public virtual async Task<List<OrderHeaderDto>> GetMyOrders(Session session, Can
     var sessionInfo = await _auth.GetSessionInfo(session, cancellationToken);
     // You can use any of such methods
     var user = await _authService.GetUser(session, CancellationToken);
+    user = user.AssertAuthenticated();
 
     await using var dbContext = CreateDbContext();
 
@@ -355,10 +356,12 @@ Services.TryAddTransient(c => c.GetRequiredService<ISessionProvider>().Session);
 So all we need is to make `ISessionResolver` to resolve `Session.Default` on the Blazor WASM client. One of ways to do this is to use this `App.razor` (your root Blazor component):
 
 ```cs --editable false
+@using Stl.OS
 @implements IDisposable
 @inject BlazorCircuitContext BlazorCircuitContext
+@inject ISessionProvider SessionProvider
 
-<CascadingAuthState SessionId="@SessionId">
+<CascadingAuthState>
     <Router AppAssembly="@typeof(Program).Assembly">
         <Found Context="routeData">
             <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)"/>
@@ -372,20 +375,16 @@ So all we need is to make `ISessionResolver` to resolve `Session.Default` on the
 </CascadingAuthState>
 
 @code {
-    [Parameter]
-    public string SessionId { get; set; } = Session.Default.Id;
+    private Theme Theme { get; } = new() { IsGradient = true, IsRounded = false };
 
-    protected override void OnInitialized()
-    {
-        if (!BlazorCircuitContext.IsPrerendering)
-            BlazorCircuitContext.RootComponent = this;
-    }
-
-    [Parameter] 
+    [Parameter]
     public string SessionId { get; set; } = Session.Default.Id;
 
     protected override void OnInitialized()
     {
+        SessionProvider.Session = OSInfo.IsWebAssembly 
+            ? Session.Default 
+            : new Session(SessionId);
         if (!BlazorCircuitContext.IsPrerendering)
             BlazorCircuitContext.RootComponent = this;
     }
@@ -395,11 +394,9 @@ So all we need is to make `ISessionResolver` to resolve `Session.Default` on the
 }
 ```
 
-It works as follows:
-- If this component is created from Blazor Server, the correct `SessionId` is expected to be passed there. It's safe, coz this `SessionId` never leaves the server.
-- And if this component is created in Blazor WASM, it doesn't expect any `SessionId`, so `Session.Default.Id` will be used in this case.
+You can see that when this component is initialized, it sets `SessionProvider.Session` to the value it gets as a parameter &ndash; unless we're running Blazor WASM. In this case it sets it to `Session.Default`. Any attempt to resolve `Session` (either via `ISessionResolver`, or via service provider) will return this value.  
 
-You may notice that this component wraps its content into `CascadingAuthState`, which actually does the rest by setting `ISessionResolver.Session` to a `Session` with the specified `SessionId`. In addition, it makes Blazor authentication to work as expected as well by embedding its `ChildContent` into Blazor's `<CascadingAuthenticationState>`. If you are interested in details, see its source:
+You may notice that `App.razor` wraps its content into `CascadingAuthState`, which makes Blazor authentication to work as expected as well by embedding its `ChildContent` into Blazor's `<CascadingAuthenticationState>`. If you are interested in details, see its source:
 - https://github.com/servicetitan/Stl.Fusion/blob/master/src/Stl.Fusion.Blazor/Authentication/CascadingAuthState.razor
 
 All of this implies you also need a bit special logic in `_Host.cshtml` to spawn `App.razor` on the server side:

docs/tutorial/Tutorial.csproj

@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Stl.Fusion.Client" Version="3.0.28" />
-    <PackageReference Include="Stl.Fusion.Server" Version="3.0.28" />
+    <PackageReference Include="Stl.Fusion.Client" Version="3.1.11" />
+    <PackageReference Include="Stl.Fusion.Server" Version="3.1.11" />
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta2.21617.1" />
     <PackageReference Include="System.CommandLine.DragonFruit" Version="0.4.0-alpha.21617.1" />
   </ItemGroup>

src/Blazor/Abstractions/Abstractions.csproj

@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.6" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    <PackageReference Include="Stl.Fusion.Client" Version="3.0.28" />
+    <PackageReference Include="Stl.Fusion.Client" Version="3.1.11" />
   </ItemGroup>
 
 </Project>

src/Blazor/Abstractions/IChatService.cs

@@ -1,58 +1,27 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Text.Json.Serialization;
 using Microsoft.EntityFrameworkCore;
 
 namespace Samples.Blazor.Abstractions;
 
-public class LongKeyedEntity : IHasId<long>
-{
-    [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
-    public long Id { get; set; }
-}
-
+// Entity
 [Index(nameof(UserId))]
 [Index(nameof(CreatedAt))]
-public class ChatMessage : LongKeyedEntity
+public class ChatMessage
 {
-    public long UserId { get; set; }
+    [Key, DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+    public long Id { get; set; }
+    public string UserId { get; set; } = "";
     public DateTime CreatedAt { get; set; }
     [Required, MaxLength(4000)]
     public string Text { get; set; } = "";
 }
 
-public class ChatPage
+public record ChatMessageList
 {
-    [JsonIgnore]
-    public long? MinMessageId { get; }
-    [JsonIgnore]
-    public long? MaxMessageId { get; }
     // Must be sorted by ChatMessage.Id
-    public List<ChatMessage> Messages { get; }
-    public Dictionary<long, ChatUser> Users { get; }
-
-    public ChatPage()
-        : this(new List<ChatMessage>(), new Dictionary<long, ChatUser>()) { }
-    [JsonConstructor]
-    public ChatPage(List<ChatMessage> messages, Dictionary<long, ChatUser> users)
-    {
-        Messages = messages;
-        Users = users;
-        if (messages.Count > 0) {
-            MinMessageId = messages.Min(m => m.Id);
-            MaxMessageId = messages.Max(m => m.Id);
-        }
-    }
-}
-
-// Not an entity!
-public class ChatUser : LongKeyedEntity
-{
-    public static ChatUser None => new() { Id = -1, Name = "No user found" };
-
-    [Required, MaxLength(120)]
-    public string Name { get; set; } = "";
-    public bool IsValid => Id >= 0;
+    public ImmutableArray<ChatMessage> Messages { get; init; } = ImmutableArray<ChatMessage>.Empty;
+    public ImmutableDictionary<string, User> Users { get; init; } = ImmutableDictionary<string, User>.Empty;
 }
 
 public interface IChatService
@@ -68,16 +37,10 @@ public PostCommand() : this("", Session.Null) { }
     Task<ChatMessage> Post(PostCommand command, CancellationToken cancellationToken = default);
 
     // Queries
-    [ComputeMethod(KeepAliveTime = 11)]
-    Task<ChatUser> GetCurrentUser(Session session, CancellationToken cancellationToken = default);
-    [ComputeMethod(KeepAliveTime = 1)]
-    Task<ChatUser> GetUser(long id, CancellationToken cancellationToken = default);
-    [ComputeMethod(KeepAliveTime = 61)]
+    [ComputeMethod(KeepAliveTime = 10)]
+    Task<ChatMessageList> GetChatTail(int length, CancellationToken cancellationToken = default);
+    [ComputeMethod(KeepAliveTime = 60)]
     Task<long> GetUserCount(CancellationToken cancellationToken = default);
-    [ComputeMethod(KeepAliveTime = 61)]
+    [ComputeMethod(KeepAliveTime = 60)]
     Task<long> GetActiveUserCount(CancellationToken cancellationToken = default);
-    [ComputeMethod(KeepAliveTime = 11)]
-    Task<ChatPage> GetChatTail(int length, CancellationToken cancellationToken = default);
-    [ComputeMethod(KeepAliveTime = 1)]
-    Task<ChatPage> GetChatPage(long minMessageId, long maxMessageId, CancellationToken cancellationToken = default);
 }

src/Blazor/Client/Client.csproj

@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
-    <PackageReference Include="Stl.Fusion.Client" Version="3.0.28" />
+    <PackageReference Include="Stl.Fusion.Client" Version="3.1.11" />
   </ItemGroup>
 
   <ItemGroup>

src/Blazor/Client/Clients.cs

@@ -6,45 +6,39 @@ namespace Samples.Blazor.Client;
 [BasePath("time")]
 public interface ITimeClientDef
 {
-    [Get("getTime")]
+    [Get(nameof(GetTime))]
     Task<DateTime> GetTime(CancellationToken cancellationToken = default);
-    [Get("getUptime")]
+    [Get(nameof(GetUptime))]
     Task<double> GetUptime(double updatePeriod, CancellationToken cancellationToken = default);
 }
 
 [BasePath("screenshot")]
 public interface IScreenshotClientDef
 {
-    [Get("getScreenshot")]
+    [Get(nameof(GetScreenshot))]
     Task<Screenshot> GetScreenshot(int width, CancellationToken cancellationToken = default);
 }
 
 [BasePath("chat")]
 public interface IChatClientDef
 {
     // Commands
-    [Post("post")]
+    [Post(nameof(Post))]
     Task<ChatMessage> Post([Body] IChatService.PostCommand command, CancellationToken cancellationToken = default);
 
     // Queries
-    [Get("getCurrentUser")]
-    Task<ChatUser> GetCurrentUser(Session? session, CancellationToken cancellationToken = default);
-    [Get("getUser")]
-    Task<ChatUser> GetUser(long id, CancellationToken cancellationToken = default);
-    [Get("getUserCount")]
+    [Get(nameof(GetChatTail))]
+    Task<ChatMessageList> GetChatTail(int length, CancellationToken cancellationToken = default);
+    [Get(nameof(GetUserCount))]
     Task<long> GetUserCount(CancellationToken cancellationToken = default);
-    [Get("getActiveUserCount")]
+    [Get(nameof(GetActiveUserCount))]
     Task<long> GetActiveUserCount(CancellationToken cancellationToken = default);
-    [Get("getChatTail")]
-    Task<ChatPage> GetChatTail(int length, CancellationToken cancellationToken = default);
-    [Get("getChatPage")]
-    Task<ChatPage> GetChatPage(long minMessageId, long maxMessageId, CancellationToken cancellationToken = default);
 }
 
 [BasePath("composer")]
 public interface IComposerClientDef
 {
-    [Get("getComposedValue")]
+    [Get(nameof(GetComposedValue))]
     Task<ComposedValue> GetComposedValue(string? parameter,
         Session session, CancellationToken cancellationToken = default);
 }
@@ -53,14 +47,14 @@ Task<ComposedValue> GetComposedValue(string? parameter,
 public interface ISumClientDef
 {
     // Commands
-    [Post("reset")]
+    [Post(nameof(Reset))]
     Task Reset(CancellationToken cancellationToken);
-    [Post("accumulate")]
+    [Post(nameof(Accumulate))]
     Task Accumulate(double value, CancellationToken cancellationToken);
 
     // Queries
-    [Get("getAccumulator")]
+    [Get(nameof(GetAccumulator))]
     Task<double> GetAccumulator(CancellationToken cancellationToken);
-    [Get("getSum")]
+    [Get(nameof(GetSum))]
     Task<double> GetSum(double[] values, bool addAccumulator, CancellationToken cancellationToken);
 }

src/Blazor/ConsoleClient/ConsoleClient.csproj

@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Stl.Fusion.Client" Version="3.0.28" />
+    <PackageReference Include="Stl.Fusion.Client" Version="3.1.11" />
   </ItemGroup>
 
   <ItemGroup>

src/Blazor/ConsoleClient/Program.cs

@@ -9,7 +9,7 @@
 var stateFactory = services.StateFactory();
 var chat = services.GetRequiredService<IChatService>();
 var seenMessageIds = new ConcurrentDictionary<long, Unit>();
-using var timeState = stateFactory.NewComputed<ChatPage>(async (s, cancellationToken) => {
+using var timeState = stateFactory.NewComputed<ChatMessageList>(async (s, cancellationToken) => {
     var chatPage = await chat.GetChatTail(10, cancellationToken);
     foreach (var message in chatPage.Messages) {
         if (!seenMessageIds.TryAdd(message.Id, default))

src/Blazor/Server/Controllers/ChatController.cs

@@ -22,12 +22,8 @@ public Task<ChatMessage> Post([FromBody] IChatService.PostCommand command, Cance
     // Queries
 
     [HttpGet, Publish]
-    public Task<ChatUser> GetCurrentUser(Session session, CancellationToken cancellationToken = default)
-        => _chat.GetCurrentUser(session, cancellationToken);
-
-    [HttpGet, Publish]
-    public Task<ChatUser> GetUser(long id, CancellationToken cancellationToken = default)
-        => _chat.GetUser(id, cancellationToken);
+    public Task<ChatMessageList> GetChatTail(int length, CancellationToken cancellationToken = default)
+        => _chat.GetChatTail(length, cancellationToken);
 
     [HttpGet, Publish]
     public Task<long> GetUserCount(CancellationToken cancellationToken = default)
@@ -36,12 +32,4 @@ public Task<long> GetUserCount(CancellationToken cancellationToken = default)
     [HttpGet, Publish]
     public Task<long> GetActiveUserCount(CancellationToken cancellationToken = default)
         => _chat.GetActiveUserCount(cancellationToken);
-
-    [HttpGet, Publish]
-    public Task<ChatPage> GetChatTail(int length, CancellationToken cancellationToken = default)
-        => _chat.GetChatTail(length, cancellationToken);
-
-    [HttpGet, Publish]
-    public Task<ChatPage> GetChatPage(long minMessageId, long maxMessageId, CancellationToken cancellationToken = default)
-        => _chat.GetChatPage(minMessageId, maxMessageId, cancellationToken);
 }

src/Blazor/Server/Pages/_Host.cshtml

@@ -29,7 +29,6 @@
     <script src="_content/Stl.Fusion.Blazor/scripts/fusionAuth.js"></script>
     <script>
         window.FusionAuth.schemas = "@authSchemas";
-        window.FusionAuth.sessionId = "@sessionId";
     </script>
 </head>
 <body>

src/Blazor/Server/Server.csproj

@@ -22,8 +22,8 @@
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6" />
     <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
     <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta13" />
-    <PackageReference Include="Stl.Fusion.Server" Version="3.0.28" />
-    <PackageReference Include="Stl.Fusion.EntityFramework" Version="3.0.28" />
+    <PackageReference Include="Stl.Fusion.Server" Version="3.1.11" />
+    <PackageReference Include="Stl.Fusion.EntityFramework" Version="3.1.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.3.1" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>

src/Blazor/Server/Services/ChatService.cs

@@ -41,9 +41,8 @@ public virtual async Task<ChatMessage> Post(
         }
 
         text = await NormalizeText(text, cancellationToken);
-        var user = await GetCurrentUser(session, cancellationToken);
-        if (user == null)
-            throw new AuthenticationException("Please sign in first.");
+        var user = await _auth.GetUser(session, cancellationToken);
+        user = user.AssertAuthenticated();
 
         await using var dbContext = await CreateCommandDbContext(cancellationToken);
         var message = new ChatMessage() {
@@ -77,19 +76,7 @@ public virtual async Task<long> GetActiveUserCount(CancellationToken cancellatio
             .LongCountAsync(cancellationToken);
     }
 
-    public virtual async Task<ChatUser> GetCurrentUser(Session session, CancellationToken cancellationToken = default)
-    {
-        var user = await _auth.GetUser(session, cancellationToken);
-        return ToChatUser(user);
-    }
-
-    public virtual async Task<ChatUser> GetUser(long id, CancellationToken cancellationToken = default)
-    {
-        var user = await _authBackend.GetUser(default, id.ToString(), cancellationToken);
-        return ToChatUser(user ?? throw new KeyNotFoundException());
-    }
-
-    public virtual async Task<ChatPage> GetChatTail(int length, CancellationToken cancellationToken = default)
+    public virtual async Task<ChatMessageList> GetChatTail(int length, CancellationToken cancellationToken = default)
     {
         await PseudoGetAnyChatTail();
         await using var dbContext = CreateDbContext();
@@ -103,16 +90,19 @@ public virtual async Task<ChatPage> GetChatTail(int length, CancellationToken ca
 
         // Fetching users via GetUserAsync
         var userIds = messages.Select(m => m.UserId).Distinct().ToArray();
-        var userTasks = userIds.Select(id => GetUser(id, cancellationToken));
-        var users = await Task.WhenAll(userTasks);
+        var userTasks = userIds.Select(async id => {
+            var user = await _authBackend.GetUser(default, id, cancellationToken);
+            return user.OrGuest("<Deleted user>").ToClientSideUser();
+        });
+        var users = (await Task.WhenAll(userTasks)).OfType<User>();
 
         // Composing the end result
-        return new ChatPage(messages, users.ToDictionary(u => u.Id));
+        return new ChatMessageList() {
+            Messages = messages.ToImmutableArray(), 
+            Users = users.ToImmutableDictionary(u => u.Id.Value),
+        };
     }
 
-    public virtual Task<ChatPage> GetChatPage(long minMessageId, long maxMessageId, CancellationToken cancellationToken = default)
-        => throw new NotImplementedException();
-
     // Helpers
 
     [ComputeMethod]
@@ -141,14 +131,4 @@ private async ValueTask<string> NormalizeText(
         var jObject = JObject.Parse(json);
         return jObject.Value<string>("quoteText")!;
     }
-
-    private ChatUser ToChatUser(User? user)
-    {
-        if (user == null || !long.TryParse(user.Id, out var userId))
-            return ChatUser.None;
-        return new() {
-            Id = userId,
-            Name = user.Name,
-        };
-    }
 }