Feature/architecture upgrade (#16)

Fixed the Dockerfile, seed data and additional fields in Contact Form

Author: nitin27may

.env.prod

@@ -0,0 +1,22 @@
+# .env
+ENVIRONMENT=Production
+
+# SQL Server Connection
+SQL_SERVER=mssql
+SQL_DATABASE=Contacts
+SQL_USER=sa
+SQL_PASSWORD=PasYourPassword123
+
+# JWT Settings
+JWT_SECRET=THIS  USED TO SIGN AND VERIFY JWT TOKENS, REPLACE IT WITH YOUR OWN SECRET, IT CAN BE ANY STRING
+JWT_ISSUER=http://localhost
+JWT_AUDIENCE=http://localhost
+PASSWORD_RESET_URL=http://localhost/reset-password/
+
+# SMTP Settings
+SMTP_SERVER=smtp.office365.com
+SMTP_PORT=587
+SMTP_USERNAME=nitin.singh21@hotmail.com
+SMTP_PASSWORD=Sh@kti009
+SMTP_FROM_EMAIL=nitin.singh21@hotmail.com
+SMTP_ENABLE_SSL=true

README.md

@@ -20,6 +20,8 @@ Stay tuned and watch this repository for the latest updates!
 
 To understand this project in-depth, refer to our detailed series of articles on Clean Architecture. This series explains the architectural decisions, setup processes, and best practices used throughout this project.
 
+# Work in Progress
+
 1. [Clean Architecture: Introduction to the Project Structure]() - High-level structure and role of each layer.
 2. [Clean Architecture: Implementing AutoMapper for DTO Mapping and Audit Logging]() - Utilizing AutoMapper to handle data mapping and audit tracking.
 3. [Clean Architecture: Validating Inputs with FluentValidation]() - Ensuring robust input validation using FluentValidation.
@@ -58,20 +60,22 @@ A complete backend and frontend project structure to build on, with login, user
 - [ ] Docker Debug mode with hot reload for the API and UI
 - [ ] Docker Production version
 
-
 ## Architecture
 The project is structured with Clean Architecture principles, separating the solution into distinct layers to ensure scalability, maintainability, and testability. This includes a modular design with API, Application, Domain, and Infrastructure layers.
 
 ![](documents/CleanArchitecture.png)
 
+## Containers
+![](documents/architecture.png)
+
 ## Quick Start
 To quickly start the application, clone the repository and run Docker Compose:
 
 ```
   git clone https://github.com/nitin27may/clean-architecture-docker-dotnet-angular.git angular-dotnet
   cd angular-dotnet 
   //rename .env.example to .env 
-  docker-compose -f docker-compose.yml -f docker-compose.override.yml up
+  docker-compose up
 ```
 
 **Note** I have used SMTP send function, please update the account details
@@ -121,8 +125,8 @@ It contains sample for:
 8. Complete CRUD example for Contact
 
 
-**[Dockerfile for production](/Api/Dockerfile)**
-**[Dockerfile for development](/Api/debug.dockerfile)**
+**[Dockerfile for production](/backend/src/Dockerfile)**
+**[Dockerfile for development](/backend/src/Debug.Dockerfile)**
 
 
 ## Getting started

backend/scripts/seed-data.sql

@@ -193,7 +193,7 @@ BEGIN
 	INSERT [dbo].[Operations]
 		([Id], [Name], [Description], [CreatedOn], [CreatedBy], [UpdatedOn], [UpdatedBy])
 	VALUES
-		(N'09be3f29-6429-4089-a2a9-a17efe46cd7b', N'Write', N'Write', CAST(N'2024-08-24T02:56:23.6635113+00:00' AS DateTimeOffset), N'26402b6c-ebdd-44c3-9188-659a134819cb', NULL, NULL)
+		(N'09be3f29-6429-4089-a2a9-a17efe46cd7b', N'Create', N'Create', CAST(N'2024-08-24T02:56:23.6635113+00:00' AS DateTimeOffset), N'26402b6c-ebdd-44c3-9188-659a134819cb', NULL, NULL)
 
 END;
 GO
@@ -509,7 +509,7 @@ BEGIN
 	INSERT [dbo].[Users]
 		([Id], [FirstName], [LastName], [UserName], [Email], [Mobile], [Password], [CreatedOn], [Createdby], [UpdatedOn], [UpdatedBy])
 	VALUES
-		(N'424ffb80-05bf-43f8-8814-2772a5de2543', N'Sachin', N'Singh', N'sachin@gmail.com', N'sachin@gmail.com', 9833364, N'AQAAAAIAAYagAAAAEC1iNqNI7oqJKNcpJ+kYreWvBzjMxE/FWhfoDXzP5CoV60u6JHm5PwHIb3w7K7lWxw==', CAST(N'2024-09-05T14:48:17.0399044+00:00' AS DateTimeOffset), N'00000000-0000-0000-0000-000000000000', NULL, NULL)
+		(N'424ffb80-05bf-43f8-8814-2772a5de2543', N'Sachin', N'Singh', N'reader@gmail.com', N'reader@gmail.com', 9833364, N'AQAAAAIAAYagAAAAEC1iNqNI7oqJKNcpJ+kYreWvBzjMxE/FWhfoDXzP5CoV60u6JHm5PwHIb3w7K7lWxw==', CAST(N'2024-09-05T14:48:17.0399044+00:00' AS DateTimeOffset), N'00000000-0000-0000-0000-000000000000', NULL, NULL)
 
 	INSERT [dbo].[Users]
 		([Id], [FirstName], [LastName], [UserName], [Email], [Mobile], [Password], [CreatedOn], [Createdby], [UpdatedOn], [UpdatedBy])
@@ -519,7 +519,7 @@ BEGIN
 	INSERT [dbo].[Users]
 		([Id], [FirstName], [LastName], [UserName], [Email], [Mobile], [Password], [CreatedOn], [Createdby], [UpdatedOn], [UpdatedBy])
 	VALUES
-		(N'3aa35df1-2578-4ed3-a93b-8b8eb955499e', N'Vikram', N'Singh', N'vikram@gmail.com', N'vikram@gmail.com', 9833364, N'AQAAAAIAAYagAAAAEC1iNqNI7oqJKNcpJ+kYreWvBzjMxE/FWhfoDXzP5CoV60u6JHm5PwHIb3w7K7lWxw==', CAST(N'2024-08-28T20:29:02.2362893+00:00' AS DateTimeOffset), N'00000000-0000-0000-0000-000000000000', NULL, NULL)
+		(N'3aa35df1-2578-4ed3-a93b-8b8eb955499e', N'Vikram', N'Singh', N'editor@gmail.com', N'editor@gmail.com', 9833364, N'AQAAAAIAAYagAAAAEC1iNqNI7oqJKNcpJ+kYreWvBzjMxE/FWhfoDXzP5CoV60u6JHm5PwHIb3w7K7lWxw==', CAST(N'2024-08-28T20:29:02.2362893+00:00' AS DateTimeOffset), N'00000000-0000-0000-0000-000000000000', NULL, NULL)
 
 END;
 GO

backend/src/Contact.Api/Core/Middleware/CustomAuthorizationPolicyProvider.cs

@@ -0,0 +1,47 @@
+using Contact.Api.Core.Authorization;
+using Contact.Application.Interfaces;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.Extensions.Options;
+
+namespace Contact.Api.Core.Middleware;
+public class CustomAuthorizationPolicyProvider : IAuthorizationPolicyProvider
+{
+    private readonly DefaultAuthorizationPolicyProvider _fallbackPolicyProvider;
+    private readonly IServiceProvider _serviceProvider;
+
+    public CustomAuthorizationPolicyProvider(IOptions<AuthorizationOptions> options, IServiceProvider serviceProvider)
+    {
+        _fallbackPolicyProvider = new DefaultAuthorizationPolicyProvider(options);
+        _serviceProvider = serviceProvider;
+    }
+
+    public async Task<AuthorizationPolicy> GetPolicyAsync(string policyName)
+    {
+        // Use a scope to resolve scoped services
+        using (var scope = _serviceProvider.CreateScope())
+        {
+            var permissionService = scope.ServiceProvider.GetRequiredService<IPermissionService>();
+            var permissionMappings = await permissionService.GetAllPageOperationMappingsAsync();
+
+            if (permissionMappings.Any(mapping => $"{mapping.PageName}.{mapping.OperationName}Policy" == policyName))
+            {
+                var policy = new AuthorizationPolicyBuilder();
+                policy.AddRequirements(new PermissionRequirement(policyName));
+                return policy.Build();
+            }
+        }
+
+        // Fallback to the default provider for other policies
+        return await _fallbackPolicyProvider.GetPolicyAsync(policyName);
+    }
+
+    public Task<AuthorizationPolicy> GetDefaultPolicyAsync()
+    {
+        return _fallbackPolicyProvider.GetDefaultPolicyAsync();
+    }
+
+    public Task<AuthorizationPolicy> GetFallbackPolicyAsync()
+    {
+        return _fallbackPolicyProvider.GetFallbackPolicyAsync();
+    }
+}

backend/src/Contact.Api/Program.cs

@@ -57,22 +57,10 @@
         //    },
         //};
     });
-builder.Services.AddAuthorization(options =>
-{
-    // Dynamically add policies based on permissions
-    var permissionService = builder.Services.BuildServiceProvider().GetRequiredService<IPermissionService>();
-    var permissionMappings = permissionService.GetAllPageOperationMappingsAsync().Result;
 
-    foreach (var mapping in permissionMappings)
-    {
-        var policyName = $"{mapping.PageName}.{mapping.OperationName}Policy";
-        options.AddPolicy(policyName, policy =>
-        {
-            policy.Requirements.Add(new PermissionRequirement(policyName));
-        });
-    }
-});
-builder.Services.AddSingleton<IAuthorizationHandler, PermissionHandler>();
+builder.Services.AddSingleton<IAuthorizationPolicyProvider, CustomAuthorizationPolicyProvider>();
+builder.Services.AddScoped<IAuthorizationHandler, PermissionHandler>();
+
 
 
 builder.Services.AddControllers();

backend/src/Contact.Application/Services/UserService.cs

@@ -108,7 +108,6 @@ public async Task<User> Create(CreateUser createUser)
     }
 
 
-
     public async Task<bool> Delete(Guid id)
     {
         return await _userRepository.Delete(id);
@@ -272,7 +271,6 @@ public async Task<bool> ForgotPassword(string email)
         return true;
     }
 
-
     public async Task<bool> ResetPassword(ResetPassword resetPasswordRequest)
     {
         // Step 1: Validate the reset token // token send as part of email

backend/src/Dockerfile

@@ -9,12 +9,11 @@ RUN groupadd -g 2000 dotnet \
     && useradd -m -u 2000 -g 2000 dotnet
 USER dotnet
 
-EXPOSE 8081
-
 
 # This stage is used to build the service project
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
+ARG DOTNET_SKIP_POLICY_LOADING=true
 WORKDIR /src
 COPY ["Contact.Api/Contact.Api.csproj", "Contact.Api/"]
 COPY ["Contact.Application/Contact.Application.csproj", "Contact.Application/"]
@@ -27,6 +26,8 @@ COPY . .
 WORKDIR "/src/Contact.Api"
 RUN dotnet build "./Contact.Api.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
+RUN ls /app/build
+
 # This stage is used to publish the service project to be copied to the final stage
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
@@ -35,5 +36,6 @@ RUN dotnet publish "./Contact.Api.csproj" -c $BUILD_CONFIGURATION -o /app/publis
 # This stage is used in production or when running from VS in regular mode (Default when not using the Debug configuration)
 FROM base AS final
 WORKDIR /app
+# COPY --from=publish /app/publish/Contact.Api.dll .
 COPY --from=publish /app/publish .
 ENTRYPOINT ["dotnet", "Contact.Api.dll"]

docker-compose-nginx.yml renamed to docker-compose.debug.yml

@@ -1,29 +1,35 @@
-# Please refer https://aka.ms/HTTPSinContainer on how to setup an https developer certificate for your ASP.NET Core service.
-
-version: '3.4'
 
 services:
   frontend:
     build:
       context: ./frontend
-      dockerfile: Dockerfile
-    # ports:
-    #   - 8080:8080
+      dockerfile: Debug.Dockerfile
+    command: ["npm", "run", "start:debug"]
+    ports:
+      - 4200:4200
+      - 49153:49153
+    volumes:
+      - ./frontend:/app
+      - /app/node_modules
+    stdin_open: true
+    tty: true
     depends_on:
       - api
     networks:
       - mssql_network
-
+ 
   api:
     build:
       context: ./backend/src
       dockerfile: Debug.Dockerfile
-      args:
-        - configuration=Debug
-    # ports:
-    #   - 5000:5000
+    command: ["dotnet", "watch", "--project", "Contact.Api/Contact.Api.csproj", "run", "--urls", "http://0.0.0.0:5000"] 
+    ports:
+      - 5000:5000
+
+      
     environment:
       - ASPNETCORE__ENVIRONMENT=${ENVIRONMENT}
+      - DOTNET_SKIP_POLICY_LOADING=false
       - AppSettings__ConnectionStrings__DefaultConnection=Server=${SQL_SERVER};Database=${SQL_DATABASE};User ID=${SQL_USER};Password=${SQL_PASSWORD};Trusted_Connection=False;Encrypt=False;
       - AppSettings__Secret=${JWT_SECRET}
       - AppSettings__Issuer=${JWT_ISSUER}
@@ -63,19 +69,6 @@ services:
         /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SQL_PASSWORD} -d master -i /scripts/seed-data.sql; wait
     networks:
       - mssql_network
-  
-  nginx: #name of the fourth service
-    build: loadbalancer # specify the directory of the Dockerfile
-    container_name: nginx
-    restart: always
-    ports:
-      - "80:80" #specify ports forewarding
-    depends_on:
-      - frontend
-      - api
-    networks:
-      - mssql_network
-
 
 volumes:
   mssql_data: # Named volume to persist data

docker-compose.override.yml

@@ -1,26 +1,23 @@
-
 services:
   frontend:
     build:
       context: ./frontend
       dockerfile: Dockerfile
-    ports:
-      - 4000:80
-    volumes:
-      - ./frontend:/app
+    # ports:
+    #   - 8080:8080
     depends_on:
       - api
     networks:
       - mssql_network
- 
+
   api:
     build:
       context: ./backend/src
-      dockerfile: Debug.Dockerfile
+      dockerfile: Dockerfile
       args:
-        - configuration=Debug
-    ports:
-      - 5000:5000
+        - configuration=Release
+    # ports:
+    #   - 8000:8000
     environment:
       - ASPNETCORE__ENVIRONMENT=${ENVIRONMENT}
       - AppSettings__ConnectionStrings__DefaultConnection=Server=${SQL_SERVER};Database=${SQL_DATABASE};User ID=${SQL_USER};Password=${SQL_PASSWORD};Trusted_Connection=False;Encrypt=False;
@@ -34,9 +31,6 @@ services:
       - SmtpSettings__Password=${SMTP_PASSWORD}
       - SmtpSettings__FromEmail=${SMTP_FROM_EMAIL}
       - SmtpSettings__EnableSsl=${SMTP_ENABLE_SSL}
-    volumes:
-      - ./backend/src:/app
-      - ~/.vsdbg:/remote_debugger:rw
     depends_on:
       - mssql
     networks:
@@ -62,6 +56,19 @@ services:
         /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P ${SQL_PASSWORD} -d master -i /scripts/seed-data.sql; wait
     networks:
       - mssql_network
+  
+  nginx: #name of the fourth service
+    build: loadbalancer # specify the directory of the Dockerfile
+    container_name: nginx
+    restart: always
+    ports:
+      - "80:80" #specify ports forewarding
+    depends_on:
+      - frontend
+      - api
+    networks:
+      - mssql_network
+
 
 volumes:
   mssql_data: # Named volume to persist data