cjtibule/YABA
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects 1 Releases Wiki Activity

Added UserId to claims

Browse Source
This commit is contained in:
Carl Tibule
2023-01-25 23:41:17 -06:00
parent 406bd9a0d1
commit afab148337
5 changed files with 63 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
YABA.API/Extensions/ControllerExtensions.cs
View File

@ -1,6 +1,4 @@
using Microsoft.AspNetCore.Mvc;
using System.Security.Claims;
using YABA.Common.Extensions;
using YABA.Common.Lookups;
namespace YABA.API.Extensions
@ -9,21 +7,15 @@ namespace YABA.API.Extensions
{
public static string GetAuthProviderId(this ControllerBase controller)
{
return GetCustomClaim(controller, ClaimsLookup.AuthProviderId);
return controller.User.Identity.GetCustomClaim(ClaimsLookup.AuthProviderId);
}
public static int GetUserId(this ControllerBase controller)
{
var isValidUserId = int.TryParse(GetCustomClaim(controller, ClaimsLookup.UserId), out int userId);
var isValidUserId = int.TryParse(controller.User.Identity.GetCustomClaim(ClaimsLookup.UserId), out int userId);
return isValidUserId ? userId : 0;
}
public static string GetCustomClaim(this ControllerBase controller, ClaimsLookup claim)
{
var claimsIdentity = controller.User.Identity as ClaimsIdentity;
return claimsIdentity.FindFirst(claim.GetClaimName())?.Value.ToString();
}
public static string GetIpAddress(this ControllerBase controller)
{
if (controller.Request.Headers.ContainsKey("X-Forwarded-For"))

18
YABA.API/Extensions/UserIdentityExtensions.cs Normal file
View File

@ -0,0 +1,18 @@
using System.Security.Claims;
using System.Security.Principal;
using YABA.Common.Extensions;
using YABA.Common.Lookups;
namespace YABA.API.Extensions
{
public static class UserIdentityExtensions
{
public static string GetAuthProviderId(this IIdentity identity) => GetCustomClaim(identity, ClaimsLookup.AuthProviderId);
public static string GetCustomClaim(this IIdentity identity, ClaimsLookup claim)
{
var claimsIdentity = identity as ClaimsIdentity;
return claimsIdentity.FindFirst(claim.GetClaimName())?.Value.ToString();
}
}
}

36
YABA.API/Middlewares/AddCustomClaimsMiddleware.cs Normal file
View File

@ -0,0 +1,36 @@
using System.Security.Claims;
using YABA.API.Extensions;
using YABA.Common.Extensions;
using YABA.Common.Lookups;
using YABA.Service.Interfaces;
namespace YABA.API.Middlewares
{
public class AddCustomClaimsMiddleware
{
private readonly RequestDelegate _next;
public AddCustomClaimsMiddleware(RequestDelegate next)
{
_next = next;
}
public async Task InvokeAsync(HttpContext httpContext, IUserService userService)
{
if (httpContext.User != null && httpContext.User.Identity.IsAuthenticated)
{
var claims = new List<Claim>();
var userAuthProviderId = httpContext.User.Identity.GetAuthProviderId();
if (!string.IsNullOrEmpty(userAuthProviderId))
{
var userId = userService.GetUserId(userAuthProviderId);
httpContext.User.Identities.FirstOrDefault().AddClaim(new Claim(ClaimsLookup.UserId.GetClaimName(), userId.ToString()));
}
}
await _next(httpContext);
}
}
}

1
YABA.Service/Interfaces/IUserService.cs
View File

@ -9,5 +9,6 @@ namespace YABA.Service.Interfaces
{
public bool IsUserRegistered(string authProviderId);
public UserDTO RegisterUser(string authProviderId);
public int GetUserId(string authProviderId);
}
}

6
YABA.Service/UserService.cs
View File

@ -38,5 +38,11 @@ namespace YABA.Service
var registedUser = _context.Users.Add(userToRegister);
return _context.SaveChanges() > 0 ? new UserDTO(registedUser.Entity) : null;
}
public int GetUserId(string authProviderId)
{
var user = _roContext.Users.FirstOrDefault(x => x.Auth0Id == authProviderId);
return user != null ? user.Id : 0;
}
}
}