diff options
Diffstat (limited to 'src/server/Api/Internal')
| -rw-r--r-- | src/server/Api/Internal/Account/GetProfileDataRoute.cs | 35 | ||||
| -rw-r--r-- | src/server/Api/Internal/BaseInternalRoute.cs | 5 |
2 files changed, 2 insertions, 38 deletions
diff --git a/src/server/Api/Internal/Account/GetProfileDataRoute.cs b/src/server/Api/Internal/Account/GetProfileDataRoute.cs index c68f295..adf1cba 100644 --- a/src/server/Api/Internal/Account/GetProfileDataRoute.cs +++ b/src/server/Api/Internal/Account/GetProfileDataRoute.cs @@ -2,45 +2,10 @@ namespace IOL.BookmarkThing.Server.Api.Internal.Account; public class GetProfileDataRoute : RouteBaseInternalSync.WithoutRequest.WithActionResult<LoggedInInternalUser> { - private readonly AppDbContext _context; - private readonly ILogger<GetProfileDataRoute> _logger; - - public GetProfileDataRoute(ILogger<GetProfileDataRoute> logger, AppDbContext context) { - _logger = logger; - _context = context; - } - [ApiVersionNeutral] [ApiExplorerSettings(IgnoreApi = true)] [HttpGet("~/v{version:apiVersion}/account/profile-data")] public override ActionResult<LoggedInInternalUser> Handle() { - // if (!Guid.TryParse(User.FindFirstValue(ClaimTypes.NameIdentifier), out var _)) { - // var github_id = User.FindFirstValue(AppClaims.GITHUB_ID); - // if (github_id.HasValue()) { - // var existing_mapping = _context.GithubUserMappings.Include(c => c.User).SingleOrDefault(c => c.GithubId == github_id); - // var id = new ClaimsIdentity(); - // if (existing_mapping != default) { - // id.AddClaims(existing_mapping.User.DefaultClaims()); - // User.AddIdentity(id); - // } else { - // var name = User.FindFirstValue(ClaimTypes.Name); - // var user = new User(name) { - // Id = Guid.NewGuid() - // }; - // var mapping = new GithubUserMapping { - // GithubId = github_id, - // User = user - // }; - // _context.GithubUserMappings.Add(mapping); - // _context.SaveChanges(); - // id.AddClaims(mapping.User.DefaultClaims()); - // User.AddIdentity(id); - // } - // - // _logger.LogInformation("Added user mapping for github user"); - // } - // } - return Ok(LoggedInUser); } } diff --git a/src/server/Api/Internal/BaseInternalRoute.cs b/src/server/Api/Internal/BaseInternalRoute.cs index 6c0a2d9..b6b532f 100644 --- a/src/server/Api/Internal/BaseInternalRoute.cs +++ b/src/server/Api/Internal/BaseInternalRoute.cs @@ -5,12 +5,11 @@ namespace IOL.BookmarkThing.Server.Api.Internal; [ApiController] public class BaseInternalRoute : ControllerBase { - /// <summary> /// User data for the currently logged on user. /// </summary> protected LoggedInInternalUser LoggedInUser => new() { - Id = User.FindFirstValue(ClaimTypes.NameIdentifier).ToGuid(), - Username = User.Identity?.Name, + Id = User.FindFirstValue(AppClaims.USER_ID).ToGuid(), + Username = User.FindFirstValue(AppClaims.NAME), }; } |