Merge pull request #167 from Genocs/ver_900

Ver 900

Author: giovanninocco

Directory.Build.props

@@ -26,7 +26,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Roslynator.Analyzers" Version="4.12.10">
+        <PackageReference Include="Roslynator.Analyzers" Version="4.13.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

Makefile

@@ -1,7 +1,7 @@
 build:
 	dotnet build
 start:
-	dotnet run --project ./src/Genocs.TelegramIntegration.WebApi
+	dotnet run --project ./src/apps/Genocs.TelegramIntegration.WebApi
 nuget:
 	nuget pack -NoDefaultExcludes -OutputDirectory nupkgs
 publish:
@@ -23,4 +23,12 @@ fds: # force rededeploy aws ecs service
 gw: # git docker workflow to push docker image to the repository based on the main branch
 	@echo triggering github workflow to push docker image to container
 	@echo ensure that you have the gh-cli installed and authenticated.
-	gh workflow run dockerhub-publish -f push_to_docker=true
+	gh workflow run dockerhub-publish -f push_to_docker=true
+
+d-build: # docker build images
+	@echo building docker images
+	@echo you should have docker installed and running
+	bash ./src/apps/scripts/build-images.sh
+d-push: # docker tag and push images
+	@echo tag images as latest and publish
+	bash ./src/apps/scripts/push-images.sh

README.md

@@ -289,8 +289,8 @@ Use [**api-workbench**](./api-workbench.rest) inside Visual Studio code with [RE
       "password": "test",
       "rawData": ""
     },
-    "issuer": "genocs-identity-service",
-    "validIssuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,
@@ -521,35 +521,60 @@ docker builder prune
 Following commands are useful to build and push the images one by one
 
 ``` bash
-cd src/apps
+# Build images
+./src/apps/scripts/build-images.sh
 
-# Build the api gateway
-docker build -t genocs/apigateway:1.0.0 -t genocs/apigateway:latest -f ./apigateway.dockerfile .
+# Push images
+./src/apps/scripts/push-images.sh
+```
+
+### How to deploy the application on Kubernetes
 
-# Build the identity service
-docker build -t genocs/identities:1.0.0 -t genocs/identities:latest -f ./identity.dockerfile .
+You can deploy the application on Kubernetes cluster.
 
-# Build the order service
-docker build -t genocs/orders:1.0.0 -t genocs/orders:latest -f ./containers/order.dockerfile .
+``` bash
+# Build images
+./src/apps/scripts/deploy-k8s.sh
+```
 
-# Build the product service
-docker build -t genocs/products:1.0.0 -t genocs/products:latest -f ./product.dockerfile .
+### How to use makefile
 
-# Build the signalr service
-docker build -t genocs/signalr:1.0.0 -t genocs/signalr:latest -f ./signalr.dockerfile .
+Prerequisites:
+- make
 
+To install make on MacOS you can use brew
 
-# Push on Dockerhub
-docker push genocs/apigateway:1.0.0
-docker push genocs/apigateway:latest
-docker push genocs/identities:1.0.0
-docker push genocs/identities:latest
-docker push genocs/orders:1.0.0
-docker push genocs/orders:latest
-docker push genocs/products:1.0.0
-docker push genocs/products:latest
-docker push genocs/signalr:1.0.0
-docker push genocs/signalr:latest
+``` bash
+brew install make
+```
+
+To install make on Ubuntu you can use apt
+
+``` bash
+sudo apt install make
+```
+
+To install make on Windows you can use [choco](https://chocolatey.org/)
+
+``` bash
+choco install make
+```
+
+Upon installation you can use the makefile to build, run, deploy the application.
+
+``` bash
+# Build the solution
+make build
+```
+
+
+### How to use Helm chart
+
+Inside the folder **./src/apps/k8s/helm** you can find the Helm chart to deploy the application on Kubernetes.
+
+``` bash
+cd ./src/apps/k8s/helm
+microk8s helm install genocs ./gnxchart
 ```
 
 

containers/prometheus/prometheus.yml

@@ -7,13 +7,13 @@ scrape_configs:
     static_configs:
       - targets: ["prometheus:9090"]
 
-  - job_name: "api-gateway"
+  - job_name: "apigateway"
     static_configs:
-      - targets: ["api-gateway"]
+      - targets: ["apigateway"]
 
-  - job_name: "identity-service"
+  - job_name: "identities-service"
     static_configs:
-      - targets: ["identity-service"]
+      - targets: ["identities-service"]
 
   - job_name: "products-service"
     static_configs:
@@ -23,6 +23,6 @@ scrape_configs:
     static_configs:
       - targets: ["orders-service"]
 
-  - job_name: "signalr-service"
+  - job_name: "notifications-service"
     static_configs:
-      - targets: ["signalr-service"]
+      - targets: ["notifications-service"]

genocs.sln

@@ -120,7 +120,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Application", "Application"
 		src\apps\apigateway.dockerfile = src\apps\apigateway.dockerfile
 		src\apps\docker-compose.override.yml = src\apps\docker-compose.override.yml
 		src\apps\docker-compose.yml = src\apps\docker-compose.yml
-		src\apps\identity.dockerfile = src\apps\identity.dockerfile
+		src\apps\identities.dockerfile = src\apps\identities.dockerfile
 		src\apps\local.env = src\apps\local.env
 		src\apps\notifications.dockerfile = src\apps\notifications.dockerfile
 		src\apps\orders.dockerfile = src\apps\orders.dockerfile
@@ -133,6 +133,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Genocs.OpenTelemetry", "src
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Genocs.Core.Demo.HelloWorld", "src\Genocs.Core.Demo.HelloWorld\Genocs.Core.Demo.HelloWorld.csproj", "{D7C394CF-487D-470D-B05C-CC2DD7EC290B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Genocs.Persistence.EFCore", "src\Genocs.Persistence.EFCore\Genocs.Persistence.EFCore.csproj", "{69A6FE21-8FB1-4D4D-8C6B-B18C06EFF2CF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -307,6 +309,10 @@ Global
 		{D7C394CF-487D-470D-B05C-CC2DD7EC290B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D7C394CF-487D-470D-B05C-CC2DD7EC290B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D7C394CF-487D-470D-B05C-CC2DD7EC290B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{69A6FE21-8FB1-4D4D-8C6B-B18C06EFF2CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{69A6FE21-8FB1-4D4D-8C6B-B18C06EFF2CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{69A6FE21-8FB1-4D4D-8C6B-B18C06EFF2CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{69A6FE21-8FB1-4D4D-8C6B-B18C06EFF2CF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Genocs.Auth/Genocs.Auth.csproj

@@ -12,21 +12,24 @@
         <Authors>Nocco Giovanni Emanuele</Authors>
         <PackageTags>authentication jwt genocs microservice microservices solid solid-principles</PackageTags>
         <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
-        <PackageReleaseNotes>Upgraded to NET9.0</PackageReleaseNotes>
         <EnableNETAnalyzers>True</EnableNETAnalyzers>
         <AnalysisLevel>latest</AnalysisLevel>
+        <PackageReleaseNotes>
+            The change log and breaking changes are listed here.
+            https://github.com/Genocs/genocs-library/releases
+        </PackageReleaseNotes>
     </PropertyGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">
         <ProjectReference Include="..\Genocs.Security\Genocs.Security.csproj" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' != 'Debug'">
-        <PackageReference Include="Genocs.Security" Version="7.2.3" />
+        <PackageReference Include="Genocs.Security" Version="7.2.*" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
-        <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.*" />
+        <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="9.0.4" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">

src/Genocs.Auth/README_NUGET.md

@@ -1,11 +1,9 @@
 # .NET Core Auth client library
 
 This package contains a set of functionalities to handling authorization logic as JWT.
-First of all I have to say thanks to devmentors.
 
 The libraries are built using .NET9, .NET8, .NET7, .NET6.
 
-
 ## Description
 
 This package contains a set of functionalities to handling authorization logic as JWT.
@@ -26,60 +24,22 @@ Following are the project settings needed to enable monitoring
       "password": "test",
       "rawData": ""
     },
-    "issuer": "genocs-identity-service",
-    "validIssuer": "genocs-identity-service",
+    "issuer": "genocs-identities-service",
+    "validIssuer": "genocs-identities-service",
     "validateAudience": false,
     "validateIssuer": true,
     "validateLifetime": true,
     "expiry": "01:00:00"  
   }
 ```
 
-## Release notes
-
-### [2024-06-15] 6.0.0
-- Added support for Azure Key Vault
-- Unified settings
-
-### [2024-01-23] 5.0.6
-- Refactory Settings
-- Updated nuget packages
-
-### [2023-11-25] 5.0.5
-- Moved to NET8
-
-### [yyyy-mm-dd] 5.0.4
-- 
-
-### [yyyy-mm-dd] 5.0.3
-- 
-
-### [yyyy-mm-dd] 5.0.2
-- 
-
-### [yyyy-mm-dd] 5.0.1
-- 
-
-### [2023-11-25] 5.0.0
-- Moved to NET8
-
-### [2023-10-13] 5.0.0-preview.5.0
-- Added [editorconfig](https://editorconfig.org/)
-- Added StyleCop
-- Updated logo
-- Updated readme
+## Support
 
-### [2023-03-12] 5.0.0-preview.4.0
-- Implemented MongoDB repository interfaces
+Please check the [GitHub repository](https://github.com/Genocs/genocs-library) to get more info.
 
-### [2023-03-24] 5.0.0
-- New Architecture
 
-### [2023-03-12] 3.1.0
-- Added Builders
+## Release notes
 
-### [2023-03-12] 3.0.0
-- Refactory to implement CQRS pattern
+The change log and breaking changes are listed here.
 
-### [2023-03-04] 2.4.1
-- Updated System.Text.Json
+- [releases](https://github.com/Genocs/genocs-library/releases)

src/Genocs.Common/Genocs.Common.csproj

@@ -7,14 +7,18 @@
         <AssemblyName>Genocs.Common</AssemblyName>
         <Title>The Genocs common components.</Title>
         <Description>The common components to build .NET Core projects along with Genocs Library.</Description>
+        <Summary>The common components to build .NET Core projects along with Genocs Library.</Summary>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <MinClientVersion>5.0.0</MinClientVersion>
         <Authors>Nocco Giovanni Emanuele</Authors>
         <PackageTags>microservice microservices solid solid-principles genocs</PackageTags>
         <PackageReadmeFile>README_NUGET.md</PackageReadmeFile>
-        <PackageReleaseNotes>Upgraded to NET9.0</PackageReleaseNotes>
         <EnableNETAnalyzers>True</EnableNETAnalyzers>
         <AnalysisLevel>latest</AnalysisLevel>
+        <PackageReleaseNotes>
+            The change log and breaking changes are listed here.
+            https://github.com/Genocs/genocs-library/releases
+        </PackageReleaseNotes>
     </PropertyGroup>
 
 </Project>

src/Genocs.Common/Interfaces/ICurrentUser.cs

@@ -0,0 +1,39 @@
+using System.Security.Claims;
+
+namespace Genocs.Common.Interfaces;
+
+/// <summary>
+/// The CurrentUser interface.
+/// </summary>
+public interface ICurrentUser
+{
+    /// <summary>
+    /// The user id.
+    /// </summary>
+    string? Name { get; }
+
+    /// <summary>
+    /// Gets the user id.
+    /// </summary>
+    /// <returns>The default Id Type.</returns>
+    DefaultIdType GetUserId();
+
+    string? GetUserEmail();
+
+    string? GetTenant();
+
+    bool IsAuthenticated();
+
+    /// <summary>
+    /// Checks if the user is in a specific role.
+    /// </summary>
+    /// <param name="role">Role to check.</param>
+    /// <returns>True in case of sucesful otherwise False.</returns>
+    bool IsInRole(string role);
+
+    /// <summary>
+    /// Gets the user claims.
+    /// </summary>
+    /// <returns>List of the claims.</returns>
+    IEnumerable<Claim>? GetUserClaims();
+}

src/Genocs.Common/Interfaces/IDto.cs

@@ -0,0 +1,6 @@
+namespace Genocs.Common.Interfaces;
+
+/// <summary>
+/// Interface for DTOs.
+/// </summary>
+public interface IDto;