Changeset 1db5673 for Farmatiko/Controllers/LoginController.cs

Timestamp:

11/14/20 12:27:30 (3 years ago)

Author:

DimitarSlezenkovski <dslezenkovski@…>

Branches:

master

Children:

68454c6

Parents:

ad60966

Message:

Fix bugs, add some more

File:

• Farmatiko/Controllers/LoginController.cs (modified) (7 diffs)

Farmatiko/Controllers/LoginController.cs

@@ -61 +61 @@
                 Role = role,
                 AccessToken = jwtResult.AccessToken,
-                RefreshToken = jwtResult.RefreshToken.TokenString,
+                RefreshToken = jwtResult.RefreshToken.TokenString, 
                 Head = _pHService.GetPharmacyHead(request.UserName)
             });
@@ -110 +110 @@
                 return Ok(new LoginResult
                 {
+                    /*UserName = userName,
+                    
+                    Role = User.FindFirst(ClaimTypes.Role)?.Value ?? string.Empty,
+                    AccessToken = jwtResult.AccessToken,
+                    RefreshToken = jwtResult.RefreshToken.TokenString*/
+
                     UserName = userName,
                     Role = User.FindFirst(ClaimTypes.Role)?.Value ?? string.Empty,
                     AccessToken = jwtResult.AccessToken,
-                    RefreshToken = jwtResult.RefreshToken.TokenString
+                    RefreshToken = jwtResult.RefreshToken.TokenString,
+                    Head = _pHService.GetPharmacyHead(userName)
                 });
             }
@@ -156 +163 @@
                 OriginalUserName = userName,
                 AccessToken = jwtResult.AccessToken,
-                RefreshToken = jwtResult.RefreshToken.TokenString
+                RefreshToken = jwtResult.RefreshToken.TokenString,
+                Head = _pHService.GetPharmacyHead(userName)
             });
         }
@@ -186 +194 @@
                 OriginalUserName = null,
                 AccessToken = jwtResult.AccessToken,
-                RefreshToken = jwtResult.RefreshToken.TokenString
+                RefreshToken = jwtResult.RefreshToken.TokenString,
+                Head = _pHService.GetPharmacyHead(userName)
             });
         }
@@ -204 +213 @@
     public class LoginResult
     {
-        [JsonPropertyName("username")]
+        [JsonPropertyName("userName")]
         public string UserName { get; set; }
 
@@ -219 +228 @@
         public string RefreshToken { get; set; }
         [JsonPropertyName("head")]
-        public PharmacyHead Head { get; set; }
+        public object Head { get; set; }
     }
 
@@ -230 +239 @@
     public class ImpersonationRequest
     {
-        [JsonPropertyName("username")]
+        [JsonPropertyName("userName")]
         public string UserName { get; set; }
     }