Merge pull request #12 from argon-chat/contracts/user

urumo · web-flow · commit 126be2dd0c40 · 2024-10-28T02:01:04.000+03:00
&lt;!-- This is an auto-generated comment: release notes by coderabbit.ai --&gt;
## Summary by CodeRabbit

## Release Notes

- **New Features**
	- Introduced a new `UserInteractionService` for managing user interactions, including methods for retrieving user info, creating servers, and joining channels.
	- Added a new `IUserInteraction` interface to define user interaction methods.
	- Implemented implicit conversion operators for `ChannelStorage` and `ServerStorage` to enhance data handling.
	- Added new package references to support enhanced functionality.

- **Changes**
	- Renamed authentication methods to reflect a shift towards authorization.
	- Enhanced `UserStorageDto` with mapping capabilities and implicit conversion to `UserResponse`.
	- Reformatted authorization-related records for improved clarity.

- **Bug Fixes**
	- Simplified response handling in the `UserAuthorization` class.

- **Chores**
	- Updated package references and formatting in project files.
&lt;!-- end of auto-generated comment: release notes by coderabbit.ai --&gt;
diff --git a/src/Argon.Api/Argon.Api.csproj b/src/Argon.Api/Argon.Api.csproj
@@ -11,6 +11,10 @@
 		<PackageReference Include="Flurl.Http" Version="4.0.2"/>
 		<PackageReference Include="Flurl.Http.Newtonsoft" Version="0.9.1"/>
 		<PackageReference Include="MemoryPack" Version="1.21.3"/>
+		<PackageReference Include="MemoryPack.Generator" Version="1.21.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
 		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10"/>
 		<PackageReference Include="ActualLab.Fusion" Version="9.5.52"/>
 		<PackageReference Include="ActualLab.Fusion.EntityFramework.Npgsql" Version="9.5.52"/>
diff --git a/src/Argon.Api/Controllers/UsersController.cs b/src/Argon.Api/Controllers/UsersController.cs
@@ -28,7 +28,7 @@ public async Task<ActionResult<UserStorageDto>> Post([FromBody] UserInputDto dto
     public async Task<ActionResult<string>> Authenticate([FromBody] UserInputDto dto)
     {
         var userManager = grainFactory.GetGrain<IUserManager>(dto.Username);
-        var token = await userManager.Authenticate(dto.Password);
+        var token = await userManager.Authorize(dto.Password);
         return token;
     }
 
diff --git a/src/Argon.Api/Grains.Interfaces/IUserManager.cs b/src/Argon.Api/Grains.Interfaces/IUserManager.cs
@@ -11,8 +11,8 @@ public interface IUserManager : IGrainWithStringKey
     [Alias("Get")]
     Task<UserStorageDto> Get();
 
-    [Alias("Authenticate")]
-    Task<string> Authenticate(string password);
+    [Alias("Authorize")]
+    Task<string> Authorize(string password);
 
     [Alias("CreateServer")]
     Task<ServerStorage> CreateServer(string name, string description);
diff --git a/src/Argon.Api/Grains.Persistence.States/ChannelStorage.cs b/src/Argon.Api/Grains.Persistence.States/ChannelStorage.cs
@@ -1,5 +1,6 @@
 namespace Argon.Api.Grains.Persistence.States;
 
+using Contracts;
 using MemoryPack;
 
 [GenerateSerializer]
@@ -16,4 +17,18 @@ public sealed partial record ChannelStorage
     [Id(5)] public ServerRole AccessLevel { get; set; } = ServerRole.User;
     [Id(6)] public DateTime CreatedAt { get; } = DateTime.UtcNow;
     [Id(7)] public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
+
+    public static implicit operator ServerDetailsResponse(ChannelStorage channelStorage)
+    {
+        return new ServerDetailsResponse(
+            channelStorage.Id,
+            channelStorage.Name,
+            channelStorage.Description,
+            channelStorage.CreatedBy.ToString("N"),
+            channelStorage.ChannelType.ToString(),
+            channelStorage.AccessLevel.ToString(),
+            channelStorage.CreatedAt,
+            channelStorage.UpdatedAt
+        );
+    }
 }
diff --git a/src/Argon.Api/Grains.Persistence.States/ServerStorage.cs b/src/Argon.Api/Grains.Persistence.States/ServerStorage.cs
@@ -1,5 +1,6 @@
 namespace Argon.Api.Grains.Persistence.States;
 
+using Contracts;
 using MemoryPack;
 
 [GenerateSerializer]
@@ -15,4 +16,17 @@ public sealed partial record ServerStorage
     [Id(6)] public List<Guid> Channels { get; set; } = [];
     [Id(3)] public DateTime CreatedAt { get; } = DateTime.UtcNow;
     [Id(4)] public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
+
+    public static implicit operator ServerResponse(ServerStorage serverStorage)
+    {
+        return new ServerResponse(
+            serverStorage.Id,
+            serverStorage.Name,
+            serverStorage.Description,
+            serverStorage.AvatarUrl,
+            serverStorage.Channels,
+            serverStorage.CreatedAt,
+            serverStorage.UpdatedAt
+        );
+    }
 }
diff --git a/src/Argon.Api/Grains.Persistence.States/UserStorage.cs b/src/Argon.Api/Grains.Persistence.States/UserStorage.cs
@@ -1,19 +1,50 @@
 namespace Argon.Api.Grains.Persistence.States;
 
+using System.Runtime.Serialization;
 using MemoryPack;
+using MessagePack;
 
 [GenerateSerializer]
 [Serializable]
 [MemoryPackable]
 [Alias(nameof(UserStorage))]
 public sealed partial record UserStorage
 {
-    [Id(0)] public Guid Id { get; set; } = Guid.Empty;
-    [Id(1)] public string Username { get; set; } = string.Empty;
-    [Id(2)] public string Password { get; set; } = string.Empty;
-    [Id(5)] public string AvatarUrl { get; set; } = string.Empty;
-    [Id(3)] public DateTime CreatedAt { get; } = DateTime.UtcNow;
-    [Id(4)] public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
+    [property: DataMember(Order = 0)]
+    [property: MemoryPackOrder(0)]
+    [property: Key(0)]
+    [Id(0)]
+    public Guid Id { get; set; } = Guid.Empty;
+
+    [property: DataMember(Order = 1)]
+    [property: MemoryPackOrder(1)]
+    [property: Key(1)]
+    [Id(1)]
+    public string Username { get; set; } = string.Empty;
+
+    [property: DataMember(Order = 2)]
+    [property: MemoryPackOrder(2)]
+    [property: Key(2)]
+    [Id(2)]
+    public string Password { get; set; } = string.Empty;
+
+    [property: DataMember(Order = 5)]
+    [property: MemoryPackOrder(5)]
+    [property: Key(5)]
+    [Id(5)]
+    public string AvatarUrl { get; set; } = string.Empty;
+
+    [property: DataMember(Order = 3)]
+    [property: MemoryPackOrder(3)]
+    [property: Key(3)]
+    [Id(3)]
+    public DateTime CreatedAt { get; } = DateTime.UtcNow;
+
+    [property: DataMember(Order = 4)]
+    [property: MemoryPackOrder(4)]
+    [property: Key(4)]
+    [Id(4)]
+    public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
 
     public static implicit operator UserStorageDto(UserStorage userStorage)
     {
diff --git a/src/Argon.Api/Grains.Persistence.States/UserStorageDto.cs b/src/Argon.Api/Grains.Persistence.States/UserStorageDto.cs
@@ -1,16 +1,30 @@
 namespace Argon.Api.Grains.Persistence.States;
 
+using Contracts;
+using Mapster;
 using MemoryPack;
 
 [GenerateSerializer]
 [Serializable]
 [MemoryPackable]
 [Alias(nameof(UserStorageDto))]
+[GenerateMapper]
 public sealed partial record UserStorageDto
 {
     [Id(0)] public Guid Id { get; set; }
     [Id(1)] public string Username { get; set; } = string.Empty;
     [Id(4)] public string AvatarUrl { get; set; } = string.Empty;
     [Id(2)] public DateTime CreatedAt { get; set; }
     [Id(3)] public DateTime UpdatedAt { get; set; }
+
+    public static implicit operator UserResponse(UserStorageDto userStorageDto)
+    {
+        return new UserResponse(
+            userStorageDto.Id,
+            userStorageDto.Username,
+            userStorageDto.AvatarUrl,
+            userStorageDto.CreatedAt,
+            userStorageDto.UpdatedAt
+        );
+    }
 }
diff --git a/src/Argon.Api/Grains/UserManager.cs b/src/Argon.Api/Grains/UserManager.cs
@@ -36,7 +36,7 @@ public async Task<UserStorageDto> Get()
         return userStore.State;
     }
 
-    public Task<string> Authenticate(string password)
+    public Task<string> Authorize(string password)
     {
         var match = userStore.State.Password == HashPassword(password);
 
diff --git a/src/Argon.Api/Program.cs b/src/Argon.Api/Program.cs
@@ -18,6 +18,7 @@
 builder.Services.AddControllers(opts => { opts.Filters.Add<InjectUsernameFilter>(); });
 builder.Services.AddFusion(RpcServiceMode.Server, true)
     .Rpc.AddServer<IUserAuthorization, UserAuthorization>()
+    .AddServer<IUserInteraction, UserInteractionService>()
     .AddWebSocketServer(true);
 builder.AddSwaggerWithAuthHeader();
 builder.AddJwt();
diff --git a/src/Argon.Api/Services/UserAuthorization.cs b/src/Argon.Api/Services/UserAuthorization.cs
@@ -1,14 +1,14 @@
 ﻿namespace Argon.Api.Services;
 
-using Grains.Interfaces;
 using Contracts;
+using Grains.Interfaces;
 
 public class UserAuthorization(IGrainFactory grainFactory) : IUserAuthorization
 {
     public async Task<AuthorizeResponse> AuthorizeAsync(AuthorizeRequest request)
     {
         // TODO machineKey
-        var token = await grainFactory.GetGrain<IUserManager>(request.username).Authenticate(request.password);
-        return new AuthorizeResponse(token, [new ServerResponse(Guid.NewGuid(), "xuita", null)]);
+        var token = await grainFactory.GetGrain<IUserManager>(request.username).Authorize(request.password);
+        return new AuthorizeResponse(token);
     }
 }
diff --git a/src/Argon.Api/Services/UserInteractionService.cs b/src/Argon.Api/Services/UserInteractionService.cs
@@ -0,0 +1,41 @@
+namespace Argon.Api.Services;
+
+using Contracts;
+using Grains.Interfaces;
+
+public class UserInteractionService(
+    string username, // TODO to be injected
+    IGrainFactory grainFactory
+) : IUserInteraction
+{
+    private readonly IUserManager userManager = grainFactory.GetGrain<IUserManager>(username);
+
+    public async Task<UserResponse> GetMe()
+    {
+        return await userManager.Get();
+    }
+
+    public async Task<ServerResponse> CreateServer(CreateServerRequest request)
+    {
+        return await userManager.CreateServer(request.Name, request.Description);
+    }
+
+    public async Task<List<ServerResponse>> GetServers()
+    {
+        return (await userManager.GetServers())
+            .Select(x => (ServerResponse)x)
+            .ToList();
+    }
+
+    public async Task<List<ServerDetailsResponse>> GetServerDetails(ServerDetailsRequest request)
+    {
+        return (await userManager.GetServerChannels(request.ServerId))
+            .Select(x => (ServerDetailsResponse)x)
+            .ToList();
+    }
+
+    public async Task<ChannelJoinResponse> JoinChannel(ChannelJoinRequest request)
+    {
+        return new ChannelJoinResponse((await userManager.JoinChannel(request.ServerId, request.ChannelId)).value);
+    }
+}
diff --git a/src/Argon.Contracts/Argon.Contracts.csproj b/src/Argon.Contracts/Argon.Contracts.csproj
@@ -1,22 +1,23 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net8.0</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="ActualLab.Fusion" Version="9.5.52" />
-    <PackageReference Include="ActualLab.Fusion.Ext.Contracts" Version="9.5.52" />
-    <PackageReference Include="ActualLab.Generators" Version="9.5.52">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="MemoryPack.Generator" Version="1.21.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="ActualLab.Fusion" Version="9.5.52"/>
+		<PackageReference Include="ActualLab.Fusion.Ext.Contracts" Version="9.5.52"/>
+		<PackageReference Include="ActualLab.Generators" Version="9.5.52">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Mapster" Version="7.4.0"/>
+		<PackageReference Include="MemoryPack.Generator" Version="1.21.3">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>
 
 </Project>
diff --git a/src/Argon.Contracts/IUserAuthorization.cs b/src/Argon.Contracts/IUserAuthorization.cs
@@ -1,7 +1,6 @@
 ﻿namespace Argon.Contracts;
 
 using System.Runtime.Serialization;
-using ActualLab.Fusion;
 using ActualLab.Rpc;
 using MemoryPack;
 using MessagePack;
@@ -11,19 +10,25 @@ public interface IUserAuthorization : IRpcService
     Task<AuthorizeResponse> AuthorizeAsync(AuthorizeRequest request);
 }
 
-[DataContract, MemoryPackable(GenerateType.VersionTolerant), MessagePackObject]
+[DataContract]
+[MemoryPackable(GenerateType.VersionTolerant)]
+[MessagePackObject]
 public sealed partial record AuthorizeRequest(
-    [property: DataMember(Order = 0), MemoryPackOrder(0), Key(0)] string username,
-    [property: DataMember(Order = 1), MemoryPackOrder(1), Key(1)] string password,
-    [property: DataMember(Order = 2), MemoryPackOrder(2), Key(2)] string machineKey);
+    [property: DataMember(Order = 0)]
+    [property: MemoryPackOrder(0)]
+    [property: Key(0)]
+    string username,
+    [property: DataMember(Order = 1)]
+    [property: MemoryPackOrder(1)]
+    [property: Key(1)]
+    string password,
+    [property: DataMember(Order = 2)]
+    [property: MemoryPackOrder(2)]
+    [property: Key(2)]
+    string machineKey);
 
-
-public sealed partial record ServerResponse(
-    [property: DataMember(Order = 0), MemoryPackOrder(0), Key(0)] Guid serverId,
-    [property: DataMember(Order = 1), MemoryPackOrder(1), Key(1)] string serverName,
-    [property: DataMember(Order = 2), MemoryPackOrder(2), Key(2)] string? avatarFileId
-);
-
-public sealed partial record AuthorizeResponse(
-    [property: DataMember(Order = 0), MemoryPackOrder(0), Key(0)] string token,
-    [property: DataMember(Order = 1), MemoryPackOrder(1), Key(1)] List<ServerResponse> servers);
+public sealed record AuthorizeResponse(
+    [property: DataMember(Order = 0)]
+    [property: MemoryPackOrder(0)]
+    [property: Key(0)]
+    string token);
diff --git a/src/Argon.Contracts/IUserInteraction.cs b/src/Argon.Contracts/IUserInteraction.cs

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public async Task<ActionResult<UserStorageDto>> Post([FromBody] UserInputDto dto`
`28`	`28`	`public async Task<ActionResult<string>> Authenticate([FromBody] UserInputDto dto)`
`29`	`29`	`{`
`30`	`30`	`var userManager = grainFactory.GetGrain<IUserManager>(dto.Username);`
`31`		`- var token = await userManager.Authenticate(dto.Password);`
	`31`	`+ var token = await userManager.Authorize(dto.Password);`
`32`	`32`	`return token;`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public async Task<UserStorageDto> Get()`
`36`	`36`	`return userStore.State;`
`37`	`37`	`}`
`38`	`38`
`39`		`- public Task<string> Authenticate(string password)`
	`39`	`+ public Task<string> Authorize(string password)`
`40`	`40`	`{`
`41`	`41`	`var match = userStore.State.Password == HashPassword(password);`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`namespace Argon.Api.Services;`
`2`	`2`
`3`		`-using Grains.Interfaces;`
`4`	`3`	`using Contracts;`
	`4`	`+using Grains.Interfaces;`
`5`	`5`
`6`	`6`	`public class UserAuthorization(IGrainFactory grainFactory) : IUserAuthorization`
`7`	`7`	`{`
`8`	`8`	`public async Task<AuthorizeResponse> AuthorizeAsync(AuthorizeRequest request)`
`9`	`9`	`{`
`10`	`10`	`// TODO machineKey`
`11`		`- var token = await grainFactory.GetGrain<IUserManager>(request.username).Authenticate(request.password);`
`12`		`- return new AuthorizeResponse(token, [new ServerResponse(Guid.NewGuid(), "xuita", null)]);`
	`11`	`+ var token = await grainFactory.GetGrain<IUserManager>(request.username).Authorize(request.password);`
	`12`	`+ return new AuthorizeResponse(token);`
`13`	`13`	`}`
`14`	`14`	`}`