From a9a000f40cb89fe8b4734061ebd4ca590cccc600 Mon Sep 17 00:00:00 2001 From: ivarlovlie Date: Mon, 7 Feb 2022 23:16:19 +0100 Subject: chore: Cleanup warnings and unused code --- .../Api/Internal/Account/GetProfileDataRoute.cs | 35 ---------------------- src/server/Api/Internal/BaseInternalRoute.cs | 5 ++-- src/server/Api/V1/BaseV1Route.cs | 4 +-- src/server/Jobs/JobRegister.cs | 2 -- src/server/Models/Database/User.cs | 6 ++-- src/server/StaticData/AppClaims.cs | 1 - src/server/Utilities/QuartzJsonSerializer.cs | 2 +- src/server/Utilities/SwaggerDefaultValues.cs | 2 +- 8 files changed, 8 insertions(+), 49 deletions(-) (limited to 'src/server') 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 { - private readonly AppDbContext _context; - private readonly ILogger _logger; - - public GetProfileDataRoute(ILogger logger, AppDbContext context) { - _logger = logger; - _context = context; - } - [ApiVersionNeutral] [ApiExplorerSettings(IgnoreApi = true)] [HttpGet("~/v{version:apiVersion}/account/profile-data")] public override ActionResult 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 { - /// /// User data for the currently logged on user. /// 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), }; } diff --git a/src/server/Api/V1/BaseV1Route.cs b/src/server/Api/V1/BaseV1Route.cs index 9322bf9..766291e 100644 --- a/src/server/Api/V1/BaseV1Route.cs +++ b/src/server/Api/V1/BaseV1Route.cs @@ -13,8 +13,8 @@ public class BaseV1Route : ControllerBase /// User data for the currently logged on user. /// protected LoggedInV1User LoggedInUser => new() { - Id = User.FindFirstValue(ClaimTypes.NameIdentifier).ToGuid(), - Username = User.Identity?.Name, + Id = User.FindFirstValue(AppClaims.USER_ID).ToGuid(), + Username = User.FindFirstValue(AppClaims.NAME), }; protected bool IsApiCall() { diff --git a/src/server/Jobs/JobRegister.cs b/src/server/Jobs/JobRegister.cs index 98eac97..a77db04 100644 --- a/src/server/Jobs/JobRegister.cs +++ b/src/server/Jobs/JobRegister.cs @@ -1,5 +1,3 @@ -using Quartz; - namespace IOL.BookmarkThing.Server.Jobs; public static class JobRegister diff --git a/src/server/Models/Database/User.cs b/src/server/Models/Database/User.cs index e034665..532dba3 100644 --- a/src/server/Models/Database/User.cs +++ b/src/server/Models/Database/User.cs @@ -2,10 +2,8 @@ namespace IOL.BookmarkThing.Server.Models.Database; public class User : Base { - public User(string username = "") => Username = username; - - public string Username { get; } - public string Password { get; private set; } + public string Username { get; set; } + private string Password { get; set; } public void HashAndSetPassword(string password) { Password = PasswordHelper.HashPassword(password); diff --git a/src/server/StaticData/AppClaims.cs b/src/server/StaticData/AppClaims.cs index 86437d4..762eb7b 100644 --- a/src/server/StaticData/AppClaims.cs +++ b/src/server/StaticData/AppClaims.cs @@ -2,7 +2,6 @@ namespace IOL.BookmarkThing.Server.StaticData; public static class AppClaims { - public const string GITHUB_ID = "gh_id"; public const string USER_ID = "user_id"; public const string NAME = "name"; } diff --git a/src/server/Utilities/QuartzJsonSerializer.cs b/src/server/Utilities/QuartzJsonSerializer.cs index 0caa63a..53ba89f 100644 --- a/src/server/Utilities/QuartzJsonSerializer.cs +++ b/src/server/Utilities/QuartzJsonSerializer.cs @@ -10,7 +10,7 @@ public class QuartzJsonSerializer : IObjectSerializer return JsonSerializer.SerializeToUtf8Bytes(obj); } - public T? DeSerialize(byte[] data) where T : class { + public T DeSerialize(byte[] data) where T : class { return JsonSerializer.Deserialize(data); } } diff --git a/src/server/Utilities/SwaggerDefaultValues.cs b/src/server/Utilities/SwaggerDefaultValues.cs index 24855ae..d0e46fe 100644 --- a/src/server/Utilities/SwaggerDefaultValues.cs +++ b/src/server/Utilities/SwaggerDefaultValues.cs @@ -40,7 +40,7 @@ public class SwaggerDefaultValues : IOperationFilter var description = apiDescription.ParameterDescriptions.First(p => p.Name == parameter.Name); if (parameter.Description == null) { - parameter.Description = description.ModelMetadata?.Description; + parameter.Description = description.ModelMetadata.Description; } if (parameter.Schema.Default == null && description.DefaultValue != null) { -- cgit v1.3