on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

Added IdUser claim to authenticated user claims

Browse Source
This commit is contained in:
KharchenkoVV 2021-08-17 13:03:17 +05:00
parent b1495dda34
commit d6bf5d3252
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AsbCloudInfrastructure/Services/AuthService.cs
View File

@ -27,6 +27,7 @@ namespace AsbCloudInfrastructure.Services
private static readonly TimeSpan expiresTimespan = TimeSpan.FromDays(365.25); private static readonly TimeSpan expiresTimespan = TimeSpan.FromDays(365.25);
private static readonly Encoding encoding = Encoding.UTF8; private static readonly Encoding encoding = Encoding.UTF8;
private const int PasswordSaltLength = 5; private const int PasswordSaltLength = 5;
private const string claimIdUser = "id";
private const string claimNameidCompany = "idCompany"; private const string claimNameidCompany = "idCompany";
private readonly HashAlgorithm hashAlgoritm; private readonly HashAlgorithm hashAlgoritm;
private readonly Random rnd; private readonly Random rnd;
@ -157,6 +158,7 @@ namespace AsbCloudInfrastructure.Services
var claims = new List<Claim> var claims = new List<Claim>
{ {
new Claim(claimIdUser, user.Id.ToString()),
new Claim(ClaimsIdentity.DefaultNameClaimType, user.Login), new Claim(ClaimsIdentity.DefaultNameClaimType, user.Login),
new Claim(ClaimsIdentity.DefaultRoleClaimType, user.Role?.Caption??"GUEST"), new Claim(ClaimsIdentity.DefaultRoleClaimType, user.Role?.Caption??"GUEST"),
new Claim(claimNameidCompany, user.IdCompany.ToString()), new Claim(claimNameidCompany, user.IdCompany.ToString()),

7
AsbCloudWebApi/Controllers/FileController.cs
View File

@ -37,11 +37,12 @@ namespace AsbCloudWebApi.Controllers
[HttpPost] [HttpPost]
[ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(int), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> SaveFilesAsync(int idWell, int idCategory, public async Task<IActionResult> SaveFilesAsync(int idWell, int idCategory,
int idUser, [FromForm] IFormFileCollection files, CancellationToken token = default) [FromForm] IFormFileCollection files, CancellationToken token = default)
{ {
int? idCompany = User.GetCompanyId(); int? idCompany = User.GetCompanyId();
int? idUser = User.GetUserId();
if (idCompany is null) if (idCompany is null || idUser is null)
return Forbid(); return Forbid();
if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany, if (!await wellService.IsCompanyInvolvedInWellAsync((int)idCompany,
@ -49,7 +50,7 @@ namespace AsbCloudWebApi.Controllers
return Forbid(); return Forbid();
var fileInfoCollection = files.Select(f => var fileInfoCollection = files.Select(f =>
(f.FileName, idWell, idCategory, DateTime.Now, idUser)); (f.FileName, idWell, idCategory, DateTime.Now, (int)idUser));
var fileNamesAndIds = fileService.SaveFilesPropertiesToDb(idWell, var fileNamesAndIds = fileService.SaveFilesPropertiesToDb(idWell,
idCategory, fileInfoCollection); idCategory, fileInfoCollection);

11
AsbCloudWebApi/Extensions.cs
View File

@ -15,5 +15,16 @@ namespace AsbCloudWebApi
? uid ? uid
: null; : null;
} }
public static int? GetUserId(this ClaimsPrincipal user)
{
var userId = user.FindFirst(nameof(User.Id));
if (userId is null)
return null;
return int.TryParse(userId.Value, out int uid)
? uid
: null;
}
} }
} }