commit
1b638d9367
@ -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);
|
||||
}
|
||||
|
||||
|
@ -8,16 +8,17 @@ 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.DadeSchoolAuthenticateAsync(userCredentials.username, userCredentials.password);
|
||||
var result = await userAccessProvider.AuthenticateAsync(userCredentials.username, userCredentials.password);
|
||||
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.TokenResponse);
|
||||
@ -25,11 +26,11 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
return Unauthorized(result.ErrorMessage);
|
||||
}
|
||||
|
||||
// [Authorize(Policy = "Dadeschools")]
|
||||
[HttpPost("token/{employecode}")]
|
||||
public async Task<ActionResult> AuthenticateAsync(string employecode)
|
||||
[Authorize(Policy = "Dadeschools")]
|
||||
[HttpGet("damageapp/token")]
|
||||
public async Task<ActionResult> AuthenticateAsync()
|
||||
{
|
||||
var result = await userAccessProvider.AuthenticateAsync(employecode);
|
||||
var result = await userAccessProvider.AuthenticateAsync();
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
return Ok(result.TokenResponse);
|
||||
@ -37,8 +38,8 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
return Unauthorized(result.ErrorMessage);
|
||||
}
|
||||
|
||||
// [Authorize(Policy = "Dadeschools")]
|
||||
[HttpPost("refreshtoken")]
|
||||
[Authorize(Policy = "Dadeschools")]
|
||||
[HttpPost("damageapp/refreshtoken")]
|
||||
public async Task<ActionResult> RefreshTokenAsync(TokenResponse tokenResponse)
|
||||
{
|
||||
var result = await userAccessProvider.RefreshTokenAsync(tokenResponse);
|
||||
@ -61,7 +62,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
return NoContent();
|
||||
}
|
||||
|
||||
[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
// [Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
[HttpGet("users/{Id}")]
|
||||
public async Task<ActionResult> GetUsersAsync(int Id)
|
||||
{
|
||||
@ -73,7 +74,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
return NotFound();
|
||||
}
|
||||
|
||||
[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
//[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
[HttpGet("roles")]
|
||||
public async Task<ActionResult> GetRolesAsync()
|
||||
{
|
||||
@ -84,7 +85,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
}
|
||||
return NoContent();
|
||||
}
|
||||
[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
//[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
[HttpPost("users")]
|
||||
public async Task<ActionResult> PostUserAsync(User user)
|
||||
{
|
||||
@ -96,7 +97,7 @@ namespace DamageAssesment.Api.UsersAccess.Controllers
|
||||
return BadRequest(result.ErrorMessage);
|
||||
}
|
||||
|
||||
[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
//[Authorize(Policy = "DamageApp", Roles = "admin")]
|
||||
[HttpPut("users/{Id}")]
|
||||
public async Task<ActionResult> PutUserAsync(int Id, User user)
|
||||
{
|
||||
|
@ -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>
|
||||
|
@ -7,5 +7,7 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
|
||||
{
|
||||
Task<string> GenerateToken(Models.User user);
|
||||
Task<TokenResponse> TokenAuthenticate(Models.User user, Claim[] claims);
|
||||
|
||||
Task<string> ConvertJsonToDadeSchoolsJwt(string json);
|
||||
}
|
||||
}
|
@ -10,8 +10,9 @@ 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.DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password);
|
||||
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);
|
||||
public void seedData();
|
||||
}
|
||||
|
@ -0,0 +1,19 @@
|
||||
namespace DamageAssesment.Api.UsersAccess.Models
|
||||
{
|
||||
public class FakeToken
|
||||
{
|
||||
public long nbf { get; set; }
|
||||
public long exp { get; set; }
|
||||
public string iss { get; set; } = "https://dev-graph.dadeschools.net";
|
||||
public string aud { get; set; } = "damage_assessment";
|
||||
public long iat { get; set; }
|
||||
public string at_hash { get; set; } = "Mw4sAsR_U3MfpqsffDhAqg";
|
||||
public string s_hash { get; set; } = "xADDtg6lVxAXUIFK8hm0Iw";
|
||||
public string sid { get; set; } = "A5EE26B57C27F28ADFEA8C021BB7C4F1";
|
||||
public string sub { get; set; }
|
||||
public long auth_time { get; set; }
|
||||
public string idp { get; set; } = "Dadeschools";
|
||||
public string[] amr { get; set; } = {"external"};
|
||||
|
||||
}
|
||||
}
|
@ -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")!;
|
||||
});
|
||||
|
@ -14,6 +14,7 @@ using System.IdentityModel.Tokens.Jwt;
|
||||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
|
||||
|
||||
namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
{
|
||||
public class UsersAccessProvider : IUsersAccessProvider
|
||||
@ -256,7 +257,19 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
|
||||
|
||||
public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> AuthenticateAsync(string username, string password)
|
||||
{
|
||||
var mode = configuration.GetValue<string>("ModeSettings:mode");
|
||||
if (mode == "online")
|
||||
return await DadeSchoolAuthenticateAsync(username, password);
|
||||
else if (mode == "offline") return await DadeSchoolAuthenticateFakeAsync(username, password);
|
||||
else return (false, null, "Invalid mode");
|
||||
}
|
||||
|
||||
|
||||
|
||||
private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
|
||||
{
|
||||
try
|
||||
{
|
||||
@ -278,6 +291,44 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
|
||||
}
|
||||
return (false, null, responseString);
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return (false, null, ex.Message);
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateFakeAsync(string username, string password)
|
||||
{
|
||||
try
|
||||
{
|
||||
var defaultPassword = configuration.GetValue<string>("ModeSettings:userPassword");
|
||||
if (password != defaultPassword)
|
||||
return (false, null, "Invalid Password");
|
||||
|
||||
long unixTimeNow = (long)DateTime.UtcNow.Subtract(DateTime.UnixEpoch).TotalSeconds;
|
||||
var tokenObject = new Models.FakeToken
|
||||
{
|
||||
nbf = unixTimeNow,
|
||||
exp = unixTimeNow + 259200,
|
||||
iat = unixTimeNow,
|
||||
auth_time = unixTimeNow,
|
||||
sub = username
|
||||
|
||||
};
|
||||
var tokenString = JsonConvert.SerializeObject(tokenObject);
|
||||
var jwtToken = await tokenServiceProvider.ConvertJsonToDadeSchoolsJwt(tokenString);
|
||||
|
||||
var response = new DadeSchoolToken
|
||||
{
|
||||
access_token = jwtToken,
|
||||
expires_in = 262800,
|
||||
scope = "openid profile",
|
||||
token_type = "Bearer"
|
||||
};
|
||||
|
||||
return (true, response, "");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -285,19 +336,40 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
}
|
||||
|
||||
}
|
||||
public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
|
||||
{
|
||||
|
||||
if (employecode != null)
|
||||
private string DecodeJwtToken(string token)
|
||||
{
|
||||
//implementation for dadeschools authentication
|
||||
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
// var employee = employees.Where(e=> e.EmployeeCode.ToLower() == employecode.ToLower()).SingleOrDefault();
|
||||
try
|
||||
{
|
||||
var handler = new JwtSecurityTokenHandler();
|
||||
var jsonToken = handler.ReadToken(token);
|
||||
var tokenS = handler.ReadToken(token) as JwtSecurityToken;
|
||||
|
||||
if (tokenS == null)
|
||||
return null;
|
||||
|
||||
var payload = tokenS.Payload.SerializeToJson();
|
||||
return payload;
|
||||
}
|
||||
catch
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
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();
|
||||
|
||||
@ -316,7 +388,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
|
||||
Audience = "",
|
||||
NotBefore = DateTime.Now,
|
||||
Subject = new ClaimsIdentity(authClaims),
|
||||
Expires = DateTime.Now.AddMinutes(30),
|
||||
Expires = DateTime.Now.AddDays(3),
|
||||
SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(tokenkey), SecurityAlgorithms.HmacSha256)
|
||||
};
|
||||
var token = tokenhandler.CreateToken(tokendesc);
|
||||
@ -329,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()
|
||||
{
|
||||
|
@ -6,8 +6,10 @@ using DamageAssesment.Api.UsersAccess.Db;
|
||||
using DamageAssesment.Api.UsersAccess.Interfaces;
|
||||
using DamageAssesment.Api.UsersAccess.Models;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.Options;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
namespace DamageAssesment.Api.UsersAccess.Services
|
||||
{
|
||||
@ -15,9 +17,11 @@ namespace DamageAssesment.Api.UsersAccess.Services
|
||||
{
|
||||
private readonly UsersAccessDbContext usersAccessDbContext;
|
||||
private readonly JwtSettings jwtSettings;
|
||||
public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext)
|
||||
private readonly IConfiguration configuration;
|
||||
public TokenServiceProvider(IOptions<JwtSettings> options, UsersAccessDbContext usersAccessDbContext, IConfiguration configuration)
|
||||
{
|
||||
this.usersAccessDbContext = usersAccessDbContext;
|
||||
this.configuration = configuration;
|
||||
this.jwtSettings = options.Value;
|
||||
}
|
||||
public async Task<string> GenerateToken(Models.User user)
|
||||
@ -55,5 +59,27 @@ namespace DamageAssesment.Api.UsersAccess.Services
|
||||
var jwttoken = new JwtSecurityTokenHandler().WriteToken(token);
|
||||
return new TokenResponse() { jwttoken = jwttoken, refreshtoken = await GenerateToken(user) };
|
||||
}
|
||||
|
||||
public async Task<string> ConvertJsonToDadeSchoolsJwt(string json)
|
||||
{
|
||||
var jsonObject = JObject.Parse(json);
|
||||
var claims = new Claim[jsonObject.Count];
|
||||
int i = 0;
|
||||
foreach (var property in jsonObject.Properties())
|
||||
{
|
||||
claims[i++] = new Claim(property.Name, property.Value.ToString());
|
||||
}
|
||||
var securityKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
|
||||
var credentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
|
||||
var tokenDescriptor = new SecurityTokenDescriptor
|
||||
{
|
||||
Subject = new ClaimsIdentity(claims),
|
||||
Expires = DateTime.UtcNow.AddDays(3),
|
||||
SigningCredentials = credentials
|
||||
};
|
||||
var tokenHandler = new JwtSecurityTokenHandler();
|
||||
var token = tokenHandler.CreateToken(tokenDescriptor);
|
||||
return tokenHandler.WriteToken(token);
|
||||
}
|
||||
}
|
||||
}
|
@ -18,6 +18,10 @@
|
||||
"Employee": "/Employees",
|
||||
"EmployeeById": "/Employees/{0}"
|
||||
},
|
||||
"ModeSettings": {
|
||||
"mode": "offline",
|
||||
"userPassword": "^R,cVAvEy7Z.qPkH9"
|
||||
},
|
||||
"AllowedHosts": "*",
|
||||
"Dadeschools": {
|
||||
"Authority": "https://graph2.dadeschools.net",
|
||||
@ -43,6 +47,5 @@
|
||||
"ConnectionStrings": {
|
||||
// "UsersAccessConnection": "Server=DESKTOP-OF5DPLQ\\SQLEXPRESS;Database=da_survey_dev;Trusted_Connection=True;TrustServerCertificate=True;"
|
||||
"UsersAccessConnection": "Server=207.180.248.35;Database=da_survey_dev;User Id=sa;Password=YourStrongPassw0rd;TrustServerCertificate=True;"
|
||||
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user