Browse Source

Made changes so that Name and Surname displays when logged in

master
Lene Scholtz 5 years ago
parent
commit
c73a9d03c5

+ 4
- 1
UnivateProperties_API/Controllers/Users/RegisterController.cs View File

47
             if (user == null)
47
             if (user == null)
48
                 return BadRequest(new { message = "Username or password is incorrect" });
48
                 return BadRequest(new { message = "Username or password is incorrect" });
49
 
49
 
50
+            var name = _Repo.UserDetails(user.Id);
51
+
50
             var tokenHandler = new JwtSecurityTokenHandler();
52
             var tokenHandler = new JwtSecurityTokenHandler();
51
             var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
53
             var key = Encoding.ASCII.GetBytes(_appSettings.Secret);
52
             var tokenDescriptor = new SecurityTokenDescriptor
54
             var tokenDescriptor = new SecurityTokenDescriptor
66
             {
68
             {
67
                 user.Id,
69
                 user.Id,
68
                 user.Username,
70
                 user.Username,
69
-                Token = tokenString
71
+                Token = tokenString,
72
+                name
70
             });
73
             });
71
         }
74
         }
72
 
75
 

+ 1
- 0
UnivateProperties_API/Repository/Users/IRegisterRepository.cs View File

20
         void Delete(int id);
20
         void Delete(int id);
21
         void DeleteAgency(int id);
21
         void DeleteAgency(int id);
22
         void DeleteIndividual(int id);
22
         void DeleteIndividual(int id);
23
+        string UserDetails(int userId);
23
     }
24
     }
24
 }
25
 }

+ 22
- 0
UnivateProperties_API/Repository/Users/RegisterRepository.cs View File

258
         {
258
         {
259
             _dbContext.SaveChanges();
259
             _dbContext.SaveChanges();
260
         }
260
         }
261
+
262
+        public string UserDetails(int userId)
263
+        {
264
+            var individual = _dbContext.Individuals.Where(i => i.UserId == userId).FirstOrDefault();
265
+
266
+            if (individual == null)
267
+            {
268
+                var agent = _dbContext.Agents.Where(i => i.UserId == userId).FirstOrDefault();
269
+                if (agent != null)
270
+                {
271
+                    return agent.Name + " " + agent.Surname;
272
+                }
273
+                else
274
+                {
275
+                    return "";
276
+                }
277
+            }
278
+            else
279
+            {
280
+                return individual.Name + " " + individual.Surname;
281
+            }
282
+        }
261
     }
283
     }
262
 }
284
 }

Loading…
Cancel
Save