Hb 135

generate-client.sh

@@ -7,11 +7,14 @@ CLIENT_CLASS="BackendClient"
 CLIENT_NAMESPACE="HomeBook.Client"
 OPENAPI_FILE="./source/HomeBook.Backend/HomeBook.Backend.json"
 CLIENT_OUTPUT_DIR="./source/HomeBook.Client"
+CLIENT_CSPROJ="HomeBook.Client.csproj"
 
-# build backend
+# Clean output dir except the client csproj
+find "${CLIENT_OUTPUT_DIR}" -mindepth 1 ! -name "${CLIENT_CSPROJ}" -exec rm -rf {} +
 
-dotnet restore "${BACKEND_CSPROJ}"
-dotnet build "${BACKEND_CSPROJ}" --no-restore -c Release
+# build backend
+dotnet build "${BACKEND_CSPROJ}" -c Debug
+dotnet build "${BACKEND_CSPROJ}" -c Release
 
 # install/update kiota
 dotnet tool install --global Microsoft.OpenApi.Kiota
@@ -26,3 +29,6 @@ kiota generate \
 
 echo "Client generation completed successfully!"
 echo "Output directory: ${CLIENT_OUTPUT_DIR}"
+
+# nuget restore client
+dotnet restore "${CLIENT_OUTPUT_DIR}/${CLIENT_CSPROJ}"

homebook.slnx

@@ -1,37 +1,42 @@
 <Solution>
   <Folder Name="/Backend/">
-    <Project Path="source\HomeBook.Backend.Abstractions\HomeBook.Backend.Abstractions.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.DTOs\HomeBook.Backend.DTOs.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend\HomeBook.Backend.csproj" Type="Classic C#" />
+    <Project Path="source/HomeBook.Backend.Modules.Abstractions/HomeBook.Backend.Modules.Abstractions.csproj" />
+    <Project Path="source\HomeBook.Backend.Abstractions\HomeBook.Backend.Abstractions.csproj" />
+    <Project Path="source\HomeBook.Backend.DTOs\HomeBook.Backend.DTOs.csproj" />
+    <Project Path="source\HomeBook.Backend\HomeBook.Backend.csproj" />
   </Folder>
   <Folder Name="/Backend/Core/">
-    <Project Path="source\HomeBook.Backend.Core.Account\HomeBook.Backend.Core.Account.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Core.DataProvider\HomeBook.Backend.Core.DataProvider.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Core.Finances\HomeBook.Backend.Core.Finances.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Core.Kitchen\HomeBook.Backend.Core.Kitchen.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Core.Licenses\HomeBook.Backend.Core.Licenses.csproj" Type="Classic C#" />
-    <Project Path="source\Homebook.Backend.Core.Setup\Homebook.Backend.Core.Setup.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Core\HomeBook.Backend.Core.csproj" Type="Classic C#" />
+    <Project Path="source/HomeBook.Backend.Core.Modules/HomeBook.Backend.Core.Modules.csproj" />
+    <Project Path="source/HomeBook.Backend.Core.Search/HomeBook.Backend.Core.Search.csproj" />
+    <Project Path="source\HomeBook.Backend.Core.Account\HomeBook.Backend.Core.Account.csproj" />
+    <Project Path="source\HomeBook.Backend.Core.DataProvider\HomeBook.Backend.Core.DataProvider.csproj" />
+    <Project Path="source\HomeBook.Backend.Core.Licenses\HomeBook.Backend.Core.Licenses.csproj" />
+    <Project Path="source\Homebook.Backend.Core.Setup\Homebook.Backend.Core.Setup.csproj" />
+    <Project Path="source\HomeBook.Backend.Core\HomeBook.Backend.Core.csproj" />
   </Folder>
   <Folder Name="/Backend/Data/">
-    <Project Path="source\HomeBook.Backend.Data.Mysql\HomeBook.Backend.Data.Mysql.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Data.PostgreSql\HomeBook.Backend.Data.PostgreSql.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Data.Sqlite\HomeBook.Backend.Data.Sqlite.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Backend.Data\HomeBook.Backend.Data.csproj" Type="Classic C#" />
+    <Project Path="source\HomeBook.Backend.Data.Mysql\HomeBook.Backend.Data.Mysql.csproj" />
+    <Project Path="source\HomeBook.Backend.Data.PostgreSql\HomeBook.Backend.Data.PostgreSql.csproj" />
+    <Project Path="source\HomeBook.Backend.Data.Sqlite\HomeBook.Backend.Data.Sqlite.csproj" />
+    <Project Path="source\HomeBook.Backend.Data\HomeBook.Backend.Data.csproj" />
+  </Folder>
+  <Folder Name="/Backend/Modules/">
+    <Project Path="source/HomeBook.Backend.Module.Finances/HomeBook.Backend.Module.Finances.csproj" />
+    <Project Path="source/HomeBook.Backend.Module.Kitchen/HomeBook.Backend.Module.Kitchen.csproj" />
   </Folder>
   <Folder Name="/Frontend/">
-    <Project Path="source\HomeBook.Client\HomeBook.Client.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.Abstractions\HomeBook.Frontend.Abstractions.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.Core\HomeBook.Frontend.Core.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.Modules.Abstractions\HomeBook.Frontend.Modules.Abstractions.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.Services\HomeBook.Frontend.Services.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.UI\HomeBook.Frontend.UI.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend\HomeBook.Frontend.csproj" Type="Classic C#" />
+    <Project Path="source\HomeBook.Client\HomeBook.Client.csproj" />
+    <Project Path="source\HomeBook.Frontend.Abstractions\HomeBook.Frontend.Abstractions.csproj" />
+    <Project Path="source\HomeBook.Frontend.Core\HomeBook.Frontend.Core.csproj" />
+    <Project Path="source\HomeBook.Frontend.Modules.Abstractions\HomeBook.Frontend.Modules.Abstractions.csproj" />
+    <Project Path="source\HomeBook.Frontend.Services\HomeBook.Frontend.Services.csproj" />
+    <Project Path="source\HomeBook.Frontend.UI\HomeBook.Frontend.UI.csproj" />
+    <Project Path="source\HomeBook.Frontend\HomeBook.Frontend.csproj" />
   </Folder>
   <Folder Name="/Frontend/Modules/">
-    <Project Path="source\HomeBook.Frontend.Module.Finances\HomeBook.Frontend.Module.Finances.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.Module.Kitchen\HomeBook.Frontend.Module.Kitchen.csproj" Type="Classic C#" />
-    <Project Path="source\HomeBook.Frontend.Module.PlatformInfo\HomeBook.Frontend.Module.PlatformInfo.csproj" Type="Classic C#" />
+    <Project Path="source\HomeBook.Frontend.Module.Finances\HomeBook.Frontend.Module.Finances.csproj" />
+    <Project Path="source\HomeBook.Frontend.Module.Kitchen\HomeBook.Frontend.Module.Kitchen.csproj" />
+    <Project Path="source\HomeBook.Frontend.Module.PlatformInfo\HomeBook.Frontend.Module.PlatformInfo.csproj" />
   </Folder>
   <Folder Name="/Solution/">
     <File Path="LICENSE" />
@@ -63,6 +68,6 @@
     <File Path=".github\workflows\pull-request.yml" />
   </Folder>
   <Folder Name="/Tests/">
-    <Project Path="source\HomeBook.UnitTests\HomeBook.UnitTests.csproj" Type="Classic C#" />
+    <Project Path="source\HomeBook.UnitTests\HomeBook.UnitTests.csproj" />
   </Folder>
 </Solution>

source/HomeBook.Backend.Abstractions/Contracts/IEndpointDataAccessor.cs

@@ -0,0 +1,5 @@
+namespace HomeBook.Backend.Abstractions.Contracts;
+
+public interface IEndpointDataAccessor
+{
+}

source/HomeBook.Backend.Abstractions/Contracts/ISearchAggregationResult.cs

@@ -0,0 +1,8 @@
+namespace HomeBook.Backend.Abstractions.Contracts;
+
+public interface ISearchAggregationResult
+{
+    public string ModuleKey { get; }
+    public int TotalCount { get; }
+    public IEnumerable<ISearchResultItem> Items { get; }
+}

source/HomeBook.Backend.Abstractions/Contracts/ISearchProvider.cs

@@ -0,0 +1,19 @@
+namespace HomeBook.Backend.Abstractions.Contracts;
+
+/// <summary>
+///
+/// </summary>
+public interface ISearchProvider
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="query"></param>
+    /// <param name="userId"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<IReadOnlyList<ISearchAggregationResult>>
+        SearchAsync(string query,
+            Guid userId,
+            CancellationToken cancellationToken = default);
+}

source/HomeBook.Backend.Abstractions/Contracts/ISearchRegistrationFactory.cs

@@ -0,0 +1,6 @@
+namespace HomeBook.Backend.Abstractions.Contracts;
+
+public interface ISearchRegistrationFactory
+{
+    ISearchProvider CreateSearchProvider();
+}

source/HomeBook.Backend.Abstractions/Contracts/ISearchRegistrationInitiator.cs

@@ -0,0 +1,7 @@
+namespace HomeBook.Backend.Abstractions.Contracts;
+
+public interface ISearchRegistrationInitiator
+{
+    void AddModule(string moduleId);
+    void AddServiceProvider(IServiceProvider serviceProvider);
+}

source/HomeBook.Backend.Abstractions/Contracts/ISearchResultItem.cs

@@ -0,0 +1,10 @@
+namespace HomeBook.Backend.Abstractions.Contracts;
+
+public interface ISearchResultItem
+{
+    string Title { get; }
+    string? Description { get; }
+    string Url { get; }
+    string Icon { get; }
+    string Color { get; }
+}

source/HomeBook.Backend.Abstractions/Contracts/IUserProvider.cs

@@ -52,4 +52,13 @@ Task<bool> ContainsUserAsync(string username,
     Task UpdateAdminFlag(Guid userId,
         bool isAdmin,
         CancellationToken cancellationToken);
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="userId"></param>
+    /// <param name="cancellationToken"></param>
+    /// <returns></returns>
+    Task<UserInfo?> GetUserByIdAsync(Guid userId,
+        CancellationToken cancellationToken);
 }

source/HomeBook.Backend.Abstractions/HomeBook.Backend.Abstractions.csproj

@@ -7,7 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.11" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
     </ItemGroup>
 

source/HomeBook.Backend.Core.Account/HomeBook.Backend.Core.Account.csproj

@@ -14,8 +14,8 @@
     <ItemGroup>
       <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.11" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0" />
-      <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.14.0" />
-      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.14.0" />
+      <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="8.15.0" />
+      <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
     </ItemGroup>
 
 </Project>

source/HomeBook.Backend.Core.Account/JwtService.cs

@@ -14,16 +14,20 @@ namespace HomeBook.Backend.Core.Account;
 /// </summary>
 public class JwtService(IConfiguration configuration) : IJwtService
 {
-    private readonly string _secretKey = configuration["Jwt:SecretKey"] ?? throw new InvalidOperationException("JWT SecretKey is required");
-    private readonly string _issuer = configuration["Jwt:Issuer"] ?? "HomeBook";
-    private readonly string _audience = configuration["Jwt:Audience"] ?? "HomeBook";
-    private readonly int _expirationMinutes = int.Parse(configuration["Jwt:ExpirationMinutes"] ?? "60");
+    private readonly string _secretKey = configuration["Jwt:SecretKey"]
+                                         ?? throw new InvalidOperationException("JWT SecretKey is required");
+
+    private readonly string _issuer = configuration["Jwt:Issuer"]
+                                      ?? "HomeBook";
+
+    private readonly string _audience = configuration["Jwt:Audience"]
+                                        ?? "HomeBook";
+
+    private readonly int _expirationMinutes = int.Parse(configuration["Jwt:ExpirationMinutes"]
+                                                        ?? "60");
 
     /// <inheritdoc />
-    public JwtTokenResult GenerateToken(Guid userId, string username)
-    {
-        return GenerateToken(userId, username, false);
-    }
+    public JwtTokenResult GenerateToken(Guid userId, string username) => GenerateToken(userId, username, false);
 
     /// <inheritdoc />
     public JwtTokenResult GenerateToken(Guid userId, string username, bool isAdmin)
@@ -36,14 +40,18 @@ public JwtTokenResult GenerateToken(Guid userId, string username, bool isAdmin)
         [
             new(ClaimTypes.NameIdentifier, userId.ToString()),
             new(ClaimTypes.Name, username),
-            new(ClaimTypes.Role, isAdmin ? "Admin" : "User"),
-            new("IsAdmin", isAdmin.ToString(), ClaimValueTypes.Boolean),
             new(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
             new(JwtRegisteredClaimNames.Iat,
                 new DateTimeOffset(DateTime.UtcNow).ToUnixTimeSeconds().ToString(),
                 ClaimValueTypes.Integer64)
         ];
 
+        if (isAdmin)
+        {
+            claims = claims.Append(new Claim(ClaimTypes.Role, isAdmin ? "Admin" : "User")).ToArray();
+            claims = claims.Append(new Claim("IsAdmin", isAdmin.ToString(), ClaimValueTypes.Boolean)).ToArray();
+        }
+
         JwtSecurityToken token = new(
             issuer: _issuer,
             audience: _audience,
@@ -71,8 +79,8 @@ public bool ValidateToken(string token)
     {
         try
         {
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var key = Encoding.UTF8.GetBytes(_secretKey);
+            JwtSecurityTokenHandler tokenHandler = new();
+            byte[] key = Encoding.UTF8.GetBytes(_secretKey);
 
             tokenHandler.ValidateToken(token,
                 new TokenValidationParameters
@@ -101,10 +109,10 @@ public bool ValidateToken(string token)
     {
         try
         {
-            var tokenHandler = new JwtSecurityTokenHandler();
-            var key = Encoding.UTF8.GetBytes(_secretKey);
+            JwtSecurityTokenHandler tokenHandler = new();
+            byte[] key = Encoding.UTF8.GetBytes(_secretKey);
 
-            var principal = tokenHandler.ValidateToken(token,
+            ClaimsPrincipal? principal = tokenHandler.ValidateToken(token,
                 new TokenValidationParameters
                 {
                     ValidateIssuerSigningKey = true,
@@ -118,7 +126,7 @@ public bool ValidateToken(string token)
                 },
                 out SecurityToken validatedToken);
 
-            var userIdClaim = principal.FindFirst(ClaimTypes.NameIdentifier);
+            Claim? userIdClaim = principal.FindFirst(ClaimTypes.NameIdentifier);
             if (userIdClaim != null && Guid.TryParse(userIdClaim.Value, out Guid userId))
             {
                 return userId;

source/HomeBook.Backend.Core.DataProvider/HomeBook.Backend.Core.DataProvider.csproj

@@ -8,11 +8,10 @@
 
     <ItemGroup>
         <ProjectReference Include="..\HomeBook.Backend.Data\HomeBook.Backend.Data.csproj"/>
-        <ProjectReference Include="..\HomeBook.Frontend.Abstractions\HomeBook.Frontend.Abstractions.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="FluentValidation" Version="12.1.0" />
+      <PackageReference Include="FluentValidation" Version="12.1.1" />
     </ItemGroup>
 
 </Project>

source/HomeBook.Backend.Core.DataProvider/UserProvider.cs

@@ -82,4 +82,10 @@ public Task UpdateAdminFlag(Guid userId,
             },
             cancellationToken);
     }
+
+    /// <inheritdoc />
+    public async Task<UserInfo?> GetUserByIdAsync(Guid userId,
+        CancellationToken cancellationToken) =>
+        (await userRepository.GetUserByIdAsync(userId,
+            cancellationToken))?.ToUserInfo();
 }