netcore-blueprint 1.0.26 → 1.0.28

package/BlueprintTemplate/Blueprint.API/Blueprint.API.csproj

@@ -6,6 +6,13 @@
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="AsyncControllers\**" />
+    <Content Remove="AsyncControllers\**" />
+    <EmbeddedResource Remove="AsyncControllers\**" />
+    <None Remove="AsyncControllers\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />

package/BlueprintTemplate/Blueprint.API/Controllers/AuthController.cs

@@ -0,0 +1,46 @@
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.IdentityModel.Tokens;
+using System.IdentityModel.Tokens.Jwt;
+using System.Security.Claims;
+using System.Text;
+
+namespace Blueprint.API.Controllers
+{
+    [Route("auth")]
+    [ApiController]
+    public class AuthController : ControllerBase
+    {
+        private readonly IConfiguration _config;
+
+        public AuthController(IConfiguration config)
+        {
+            _config = config;
+        }
+
+        [HttpGet("token")]
+        public IActionResult GetToken(string role = "Admin")
+        {
+            var secret = _config["Jwt:Secret"];
+            var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(secret));
+            var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
+
+            var claims = new[]
+            {
+                new Claim(JwtRegisteredClaimNames.Sub, "test-user"),
+                new Claim(ClaimTypes.Role, role)
+            };
+
+            var token = new JwtSecurityToken(
+                issuer: _config["Jwt:Issuer"],
+                audience: _config["Jwt:Audience"],
+                claims: claims,
+                expires: DateTime.UtcNow.AddHours(1),
+                signingCredentials: creds
+            );
+
+            var tokenString = new JwtSecurityTokenHandler().WriteToken(token);
+
+            return Ok(new { token = tokenString });
+        }
+    }
+}

package/BlueprintTemplate/Blueprint.API/Controllers/UserController.cs

@@ -44,7 +44,7 @@ namespace Template.API.Controllers
         /// <param name="pagingParams"></param>
         /// <returns></returns>
         [HttpGet]
-        //[Authorize(Roles = "Admin")]
+        [Authorize(Roles = "Admin")]
         [ProducesResponseType(typeof(PagerData<UserResponseDto>), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetUsers([FromQuery] PagingParams pagingParams)
         {
@@ -85,41 +85,13 @@ namespace Template.API.Controllers
             return Ok(userResponseDto);
         }
 
-        /// <summary>
-        /// Checking user login
-        /// </summary>
-        /// <param name="token"></param>
-        /// <returns></returns>
-        [HttpGet("check-user-login")]
-        [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
-        [ProducesResponseType(StatusCodes.Status401Unauthorized)]
-        public async Task<IActionResult> CheckUserLogin()
-        {
-            _logger.LogInformation($"Start checking user login");
-            var stopwatch = Stopwatch.StartNew();
-
-            string? authorizationHeader = Request.Headers["Authorization"].FirstOrDefault();
-            if (string.IsNullOrEmpty(authorizationHeader) || !authorizationHeader.StartsWith("Bearer "))
-            {
-                return Unauthorized("Authorization header missing or invalid.");
-            }
-
-            string token = authorizationHeader.Replace("Bearer ", string.Empty);
-
-            string newToken = await _userService.CheckUserLogin(token);
-
-            stopwatch.Stop();
-            _logger.LogInformation($"Checking user login done in {stopwatch.ElapsedMilliseconds}");
-
-            return Ok(newToken);
-        }
-
         /// <summary>
         /// Update User
         /// </summary>
         /// <param name="userRequestDto"></param>
         /// <returns></returns>
         [HttpPut]
+        [Authorize(Roles = "Admin")]
         [ProducesResponseType(typeof(UserResponseDto), StatusCodes.Status200OK)]
         public async Task<IActionResult> UpdateUser([FromBody] UserRequestDto userRequestDto)
         {
@@ -141,6 +113,7 @@ namespace Template.API.Controllers
         /// <param name="userIds"></param>
         /// <returns></returns>
         [HttpDelete]
+        [Authorize(Roles = "Admin")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> DeleteUser([FromBody] List<int> userIds)
         {

package/BlueprintTemplate/Blueprint.API/Program.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.IdentityModel.Tokens;
 using Blueprint.Infra.Database;
@@ -21,6 +21,7 @@ using Amazon.SimpleSystemsManagement.Model;
 using Amazon.SimpleSystemsManagement;
 using Blueprint.Infra.Services.Mongo;
 using Blueprint.Infra.Services.MySQL;
+using System.Security.Claims;
 
 var builder = WebApplication.CreateBuilder(args);
 
@@ -58,7 +59,36 @@ void ConfigureSwagger()
 {
     // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
     builder.Services.AddEndpointsApiExplorer();
-    builder.Services.AddSwaggerGen();
+    builder.Services.AddSwaggerGen(c =>
+    {
+        c.SwaggerDoc("v1", new() { Title = "My API", Version = "v1" });
+
+        // ✅ Add JWT Auth to Swagger
+        c.AddSecurityDefinition("Bearer", new Microsoft.OpenApi.Models.OpenApiSecurityScheme
+        {
+            Name = "Authorization",
+            Type = Microsoft.OpenApi.Models.SecuritySchemeType.ApiKey,
+            Scheme = "Bearer",
+            BearerFormat = "JWT",
+            In = Microsoft.OpenApi.Models.ParameterLocation.Header,
+            Description = "Enter 'Bearer {your JWT token}'"
+        });
+
+        c.AddSecurityRequirement(new Microsoft.OpenApi.Models.OpenApiSecurityRequirement
+        {
+            {
+                new Microsoft.OpenApi.Models.OpenApiSecurityScheme
+                {
+                    Reference = new Microsoft.OpenApi.Models.OpenApiReference
+                    {
+                        Type = Microsoft.OpenApi.Models.ReferenceType.SecurityScheme,
+                        Id = "Bearer"
+                    }
+                },
+                new string[] {}
+            }
+        });
+    });
 }
 
 void ConfigureServices()
@@ -87,12 +117,12 @@ void ConfigureServices()
         options.SaveToken = true;
         options.TokenValidationParameters = new TokenValidationParameters
         {
-            ValidateIssuerSigningKey = false,
+            ValidateIssuerSigningKey = true,
             ValidateIssuer = false,
             ValidateAudience = false,
-            ValidateLifetime = false, // Ensure token expiration is checked
+            ValidateLifetime = true, // Ensure token expiration is checked
             ClockSkew = TimeSpan.Zero, // Optional: Prevents automatic expiration buffer
-            RoleClaimType = "http://schemas.microsoft.com/ws/2008/06/identity/claims/role",
+            RoleClaimType = ClaimTypes.Role,
             IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(builder.Configuration["Jwt:Secret"]!))
         };
     });

package/BlueprintTemplate/Blueprint.API/appsettings.json

@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "MySql": "Server=localhost;port=3306;Database=test10;User=root",
+    "MySql": "Server=localhost;Port=3306;Database=test11;User=root;Password=password;",
     "MongoDb": "mongodb://admin:password@localhost:27017"
   },
   "Database": {

package/BlueprintTemplate/README.md

@@ -1,5 +1,6 @@
-0. Run migration first (Package manager console)
-	- Add-Migration InitialCreate
+0. Files and folders can be delete when copy to other place (In each project folder): 
+	-　bin/
+	-　obj/
 1. Push the image to docker hub	
 	- chmod +x build-and-push.sh
 	- run docker desktop as administrator

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netcore-blueprint",
-  "version": "1.0.26",
+  "version": "1.0.28",
   "description": "A custom .NET Core project blueprint",
   "main": "create.js",
   "bin": {

package/BlueprintTemplate/Blueprint.API/AsyncControllers/UserControllerAsync.cs

@@ -1,51 +0,0 @@
-using Blueprint.Core.Interfaces.SPI;
-using Microsoft.AspNetCore.Mvc;
-using System.Text.Json;
-using Template.Core.Dtos.Requests;
-
-namespace Blueprint.API.AsyncControllers
-{
-    [Route("rest/v{version:apiVersion}/users-async")]
-    [ApiController]
-    public class UserControllerAsync : Controller
-    {
-        private readonly IRabbitMqService _rabbitMqService;
-        private readonly ILogger<UserControllerAsync> _logger;
-
-        public UserControllerAsync(IRabbitMqService rabbitMqService, ILogger<UserControllerAsync> logger)
-        {
-            _rabbitMqService = rabbitMqService;
-            _logger = logger;
-        }
-
-        [HttpPost]
-        public IActionResult CreateUser([FromBody] UserRequestDto userRequestDto)
-        {
-            _logger.LogInformation($"Start queuing a user creation request.");
-
-            // Serialize the user data as a message
-            string message = JsonSerializer.Serialize(userRequestDto);
-
-            // Publish the message to RabbitMQ
-            _rabbitMqService.PublishMessage("user-creation-queue", message);
-
-            _logger.LogInformation($"User creation request queued successfully.");
-            return Accepted("User creation request is being processed.");
-        }
-
-        [HttpDelete]
-        public IActionResult DeleteUser([FromBody] List<int> userIds)
-        {
-            _logger.LogInformation($"Start queuing a user deletion request.");
-
-            // Serialize the user IDs as a message
-            string message = JsonSerializer.Serialize(userIds);
-
-            // Publish the message to RabbitMQ
-            _rabbitMqService.PublishMessage("user-deletion-queue", message);
-
-            _logger.LogInformation($"User deletion request queued successfully.");
-            return Accepted("User deletion request is being processed.");
-        }
-    }
-}

package/BlueprintTemplate/Blueprint.API/WeatherForecast.cs

@@ -1,13 +0,0 @@
-namespace Blueprint.API
-{
-    public class WeatherForecast
-    {
-        public DateOnly Date { get; set; }
-
-        public int TemperatureC { get; set; }
-
-        public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-
-        public string? Summary { get; set; }
-    }
-}