From f158bad756b95afc90d746454319a36af126c207 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Tue, 26 Jul 2022 23:11:28 +0300 Subject: [PATCH] feat: add userId field to the authentication response --- Server/Controllers/AuthenticationController.cs | 3 ++- Server/Program.cs | 1 - Server/Services/AuthenticationService.cs | 6 ++++++ SharedModels/Responses/AuthenticationResponse.cs | 1 + SharedModels/SharedModels.csproj | 4 ++++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Server/Controllers/AuthenticationController.cs b/Server/Controllers/AuthenticationController.cs index 939c826..f79d74e 100644 --- a/Server/Controllers/AuthenticationController.cs +++ b/Server/Controllers/AuthenticationController.cs @@ -41,6 +41,7 @@ public class AuthenticationController : ControllerBase return BadRequest("Username or password is incorrect."); } - return Ok(new AuthenticationResponse { Token = content } ); + var userId = await _authenticationService.GetIdByUsername(request.Username); + return Ok(new AuthenticationResponse { UserId = userId, Token = content } ); } } \ No newline at end of file diff --git a/Server/Program.cs b/Server/Program.cs index 180bbae..c64a7d7 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -14,7 +14,6 @@ var builder = WebApplication.CreateBuilder(args); // Add services to the container. builder.Services.AddControllers().AddNewtonsoftJson(o => { - o.SerializerSettings.ContractResolver = new DefaultContractResolver(); o.SerializerSettings.ReferenceLoopHandling = ReferenceLoopHandling.Ignore; }); builder.Services.AddEndpointsApiExplorer(); diff --git a/Server/Services/AuthenticationService.cs b/Server/Services/AuthenticationService.cs index fd8e849..809eaaf 100644 --- a/Server/Services/AuthenticationService.cs +++ b/Server/Services/AuthenticationService.cs @@ -59,6 +59,12 @@ public class AuthenticationService return (true, GenerateJwtToken(AssembleClaimsIdentity(user))); } + public async Task GetIdByUsername(string username) + { + var dbUser = await _dbContext.Users.FirstAsync(u => u.Username == username); + return dbUser.Id; + } + private ClaimsIdentity AssembleClaimsIdentity(User user) { var subject = new ClaimsIdentity(new[] { diff --git a/SharedModels/Responses/AuthenticationResponse.cs b/SharedModels/Responses/AuthenticationResponse.cs index 6075a3e..206eea3 100644 --- a/SharedModels/Responses/AuthenticationResponse.cs +++ b/SharedModels/Responses/AuthenticationResponse.cs @@ -2,5 +2,6 @@ namespace DatabaseModels.Responses; public class AuthenticationResponse { + public int UserId { get; set; } public string Token { get; set; } = null!; } \ No newline at end of file diff --git a/SharedModels/SharedModels.csproj b/SharedModels/SharedModels.csproj index b58b14e..c8c3f74 100644 --- a/SharedModels/SharedModels.csproj +++ b/SharedModels/SharedModels.csproj @@ -7,4 +7,8 @@ DatabaseModels + + + +