Update UserAccess microservice to read Employee Code from token when retreiving App token. Update dadeschools Authorization policy to work offline

DamageAssesmentApi/DamageAssesment.Api.UsersAccess.Test/UsersAccessTest.cs

@@ -18,9 +18,9 @@ namespace DamageAssesment.Api.UsersAccess.Test
         public async Task GetTokenAsync_ShouldReturnStatusCode200()
         {
             var response = await MockData.getTokenResponse(true,null);
-            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
+            mockService.Setup(service => service.AuthenticateAsync()).ReturnsAsync(response);
             var controller = new UsersAccessController(mockService.Object);
-            var result = (OkObjectResult)await controller.AuthenticateAsync("Emp1");
+            var result = (OkObjectResult)await controller.AuthenticateAsync();
             Assert.Equal(200, result.StatusCode);
         }
 
@@ -28,9 +28,9 @@ namespace DamageAssesment.Api.UsersAccess.Test
         public async Task GetTokenAsync_ShouldReturnStatusCode401()
         {
             var response = await MockData.getTokenResponse(false, null);
-            mockService.Setup(service => service.AuthenticateAsync("Emp1")).ReturnsAsync(response);
+            mockService.Setup(service => service.AuthenticateAsync()).ReturnsAsync(response);
             var controller = new UsersAccessController(mockService.Object);
-            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync("Emp1");
+            var result = (UnauthorizedObjectResult)await controller.AuthenticateAsync();
             Assert.Equal(401, result.StatusCode);
         }
 

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Controllers/UsersAccessController.cs

@@ -8,13 +8,13 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
     [ApiController]
     public class UsersAccessController : ControllerBase
     {
-        private IUsersAccessProvider userAccessProvider;
+        private readonly IUsersAccessProvider userAccessProvider;
 
         public UsersAccessController(IUsersAccessProvider userAccessProvider)
         {
             this.userAccessProvider = userAccessProvider;
         }
-        [HttpPost("authenticate")]
+        [HttpPost("dadeschools/token")]
         public async Task<ActionResult> DadeSchoolAuthenticateAsync(UserCredentials userCredentials)
         {
             var result = await userAccessProvider.AuthenticateAsync(userCredentials.username, userCredentials.password);
@@ -26,11 +26,11 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return Unauthorized(result.ErrorMessage);
         }
 
-        // [Authorize(Policy = "Dadeschools")]
+        [Authorize(Policy = "Dadeschools")]
-        [HttpPost("token/{employecode}")]
+        [HttpGet("damageapp/token")]
-        public async Task<ActionResult> AuthenticateAsync(string employecode)
+        public async Task<ActionResult> AuthenticateAsync()
         {
-              var result = await userAccessProvider.AuthenticateAsync(employecode);
+            var result = await userAccessProvider.AuthenticateAsync();
             if (result.IsSuccess)
             {
                 return Ok(result.TokenResponse);
@@ -38,8 +38,8 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
             return Unauthorized(result.ErrorMessage);
         }
 
-      //  [Authorize(Policy = "Dadeschools")]
+        [Authorize(Policy = "Dadeschools")]
-        [HttpPost("refreshtoken")]
+        [HttpPost("damageapp/refreshtoken")]
         public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse)
         {
             var result = await userAccessProvider.RefreshTokenAsync(tokenResponse);

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj

@@ -27,6 +27,7 @@
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.21.0" />
   </ItemGroup>
 
 </Project>

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs

@@ -10,7 +10,7 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id,Models.User User);
         public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id);
         public Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync();
-        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employeCode);
+        public  Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync();
         public Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password);
 
         public Task<(bool IsSuccess, Models.TokenResponse TokenResponse, string ErrorMessage)>RefreshTokenAsync(TokenResponse tokenResponse);

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs

@@ -17,11 +17,13 @@ const int maxRetryForCircuitBraker = 5;
 const int intervalForCircuitBraker = 5; //5 seconds
 
 var builder = WebApplication.CreateBuilder(args);
-builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build => {
+builder.Services.AddCors(p => p.AddPolicy("DamageAppCorsPolicy", build =>
+{
     build.WithOrigins("*").AllowAnyMethod().AllowAnyHeader().AllowAnyOrigin();
 }));
 // Add services to the container.
 var authkey = builder.Configuration.GetValue<string>("JwtSettings:securitykey");
+var mode = builder.Configuration.GetValue<string>("ModeSettings:mode");
 
 
 builder.Services.AddAuthentication().
@@ -52,16 +54,20 @@ builder.Services.AddAuthorization(options =>
         .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("DamageApp")
         .Build();
-    var DadeschoolsPolicy = new AuthorizationPolicyBuilder()
+
-        .RequireAuthenticatedUser()
+    var DadeschoolsPolicy = new AuthorizationPolicyBuilder().RequireAuthenticatedUser()
         .AddAuthenticationSchemes("Dadeschools")
         .Build();
+
+    var DadeschoolsPolicyOffline = new AuthorizationPolicyBuilder().RequireAssertion(_ => true)
+                   .Build();
+
     var allPolicy = new AuthorizationPolicyBuilder()
         .RequireAuthenticatedUser()
         .AddAuthenticationSchemes("DamageApp", "Dadeschools")
         .Build();
     options.AddPolicy("DamageApp", DamageAppPolicy);
-    options.AddPolicy("Dadeschools", DadeschoolsPolicy);
+    options.AddPolicy("Dadeschools", mode == "online" ? DadeschoolsPolicy : DadeschoolsPolicyOffline);
     options.AddPolicy("AllPolicies", allPolicy);
     options.DefaultPolicy = options.GetPolicy("DamageApp")!;
 });

DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs

@@ -13,7 +13,7 @@ using Newtonsoft.Json;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
-using DamageAssesment.Api.UsersAccess.Services;
+
 
 namespace DamageAssesment.Api.UsersAccess.Providers
 {
@@ -337,19 +337,39 @@ namespace DamageAssesment.Api.UsersAccess.Providers
 
         }
 
-        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
+        private string DecodeJwtToken(string token)
         {
+            try
+            {
+                var handler = new JwtSecurityTokenHandler();
+                var jsonToken = handler.ReadToken(token);
+                var tokenS = handler.ReadToken(token) as JwtSecurityToken;
 
-            if (employecode != null)
+                if (tokenS == null)
+                    return null;
+
+                var payload = tokenS.Payload.SerializeToJson();
+                return payload;
+            }
+            catch
             {
-                //implementation for dadeschools authentication
+                return null;
-                // var employees = await employeeServiceProvider.getEmployeesAsync();
+            }
-                // var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
+        }
+
+        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync()
+        {
+            var dadeschoolsToken = GetToken();
+            var decodedToken = DecodeJwtToken(dadeschoolsToken);
+            var tokenObject = decodedToken == null ? null : JObject.Parse(decodedToken);
+
+            if (tokenObject == null)
+                return (false, null, "JWT authentication is required");
+
+            var employecode = (string)tokenObject["sub"];
             var user = userAccessDbContext.Users.Where(x => x.IsActive == true && x.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
-
             if (user != null)
             {
-
                 var r = await GetRolesAsync();
                 var role = r.Roles.Where(x => x.Id == user.RoleId).SingleOrDefault();
 
@@ -381,12 +401,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
             {
                 return (false, null, "user inactive or not exist.");
             }
-            }
 
-            else
-            {
-                return (false, null, "Credentials are required to authenticate.");
-            }
         }
         public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync()
         {