From f14ece42fff1f52c4faa2eecbd09b7fa7a47fafa Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Wed, 27 Jul 2022 20:00:02 +0300 Subject: [PATCH] revert: revert authentication response extension This reverts commit f158bad756b95afc90d746454319a36af126c207. --- 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, 2 insertions(+), 13 deletions(-) diff --git a/Server/Controllers/AuthenticationController.cs b/Server/Controllers/AuthenticationController.cs index f79d74e..939c826 100644 --- a/Server/Controllers/AuthenticationController.cs +++ b/Server/Controllers/AuthenticationController.cs @@ -41,7 +41,6 @@ public class AuthenticationController : ControllerBase return BadRequest("Username or password is incorrect."); } - var userId = await _authenticationService.GetIdByUsername(request.Username); - return Ok(new AuthenticationResponse { UserId = userId, Token = content } ); + return Ok(new AuthenticationResponse { Token = content } ); } } \ No newline at end of file diff --git a/Server/Program.cs b/Server/Program.cs index c64a7d7..180bbae 100644 --- a/Server/Program.cs +++ b/Server/Program.cs @@ -14,6 +14,7 @@ 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 809eaaf..fd8e849 100644 --- a/Server/Services/AuthenticationService.cs +++ b/Server/Services/AuthenticationService.cs @@ -59,12 +59,6 @@ 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 206eea3..6075a3e 100644 --- a/SharedModels/Responses/AuthenticationResponse.cs +++ b/SharedModels/Responses/AuthenticationResponse.cs @@ -2,6 +2,5 @@ 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 c8c3f74..b58b14e 100644 --- a/SharedModels/SharedModels.csproj +++ b/SharedModels/SharedModels.csproj @@ -7,8 +7,4 @@ DatabaseModels - - - -