From bc17e7f789e23c183b66a1c727130018b7d7e7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Andr=C3=A9?= Date: Mon, 17 May 2021 18:08:19 +0200 Subject: [PATCH] Add the language to the user. --- Back/skydiveLogs-api.Domain/User.cs | 10 ++++++---- Back/skydiveLogs-api/Controllers/UserController.cs | 3 ++- Back/skydiveLogs-api/DataContract/UserReq.cs | 4 +++- Back/skydiveLogs-api/DataContract/UserResp.cs | 6 ++++-- Back/skydiveLogs-api/skydiveLogs-api.csproj | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Back/skydiveLogs-api.Domain/User.cs b/Back/skydiveLogs-api.Domain/User.cs index f21008a..83071bb 100644 --- a/Back/skydiveLogs-api.Domain/User.cs +++ b/Back/skydiveLogs-api.Domain/User.cs @@ -4,16 +4,18 @@ { public int Id { get; set; } - public string Email { get; set; } + public string Email { get; set; } - public string FirstName { get; set; } + public string FirstName { get; set; } - public string LastName { get; set; } + public string LastName { get; set; } public string Login { get; set; } public string Password { get; set; } public bool IsAdmin { get; set; } + + public string Language { get; set; } } -} +} \ No newline at end of file diff --git a/Back/skydiveLogs-api/Controllers/UserController.cs b/Back/skydiveLogs-api/Controllers/UserController.cs index 7529573..bba768d 100644 --- a/Back/skydiveLogs-api/Controllers/UserController.cs +++ b/Back/skydiveLogs-api/Controllers/UserController.cs @@ -118,7 +118,8 @@ namespace skydiveLogs_api.Controllers new Claim(ClaimTypes.Name, foundUser.Login), new Claim(ClaimTypes.UserData, foundUser.Id.ToString()), new Claim(ClaimTypes.Email, foundUser.Email), - new Claim(ClaimTypes.Role, foundUser.Roles) + new Claim(ClaimTypes.Role, foundUser.Roles), + new Claim("Language", foundUser.Language ?? "") }); return new JwtSecurityTokenHandler().WriteToken(token); diff --git a/Back/skydiveLogs-api/DataContract/UserReq.cs b/Back/skydiveLogs-api/DataContract/UserReq.cs index 7402a62..fd0da21 100644 --- a/Back/skydiveLogs-api/DataContract/UserReq.cs +++ b/Back/skydiveLogs-api/DataContract/UserReq.cs @@ -11,5 +11,7 @@ public string Password { get; set; } public string Email { get; set; } + + public string Language { get; set; } } -} +} \ No newline at end of file diff --git a/Back/skydiveLogs-api/DataContract/UserResp.cs b/Back/skydiveLogs-api/DataContract/UserResp.cs index 5bcf67e..9e9002a 100644 --- a/Back/skydiveLogs-api/DataContract/UserResp.cs +++ b/Back/skydiveLogs-api/DataContract/UserResp.cs @@ -4,7 +4,7 @@ { public int Id { get; set; } - public string Email { get; set; } + public string Email { get; set; } public string FirstName { get; set; } @@ -15,5 +15,7 @@ public string Roles { get; set; } public string Token { get; set; } + + public string Language { get; set; } } -} +} \ No newline at end of file diff --git a/Back/skydiveLogs-api/skydiveLogs-api.csproj b/Back/skydiveLogs-api/skydiveLogs-api.csproj index cea2cc4..a914049 100644 --- a/Back/skydiveLogs-api/skydiveLogs-api.csproj +++ b/Back/skydiveLogs-api/skydiveLogs-api.csproj @@ -20,7 +20,7 @@ - +