info only at listing users, details at rendering specific user info

This commit is contained in:
2019-03-31 00:18:45 +00:00
parent f4e1da297f
commit e70b48fed4

View File

@ -5,6 +5,7 @@ using Microsoft.AspNet.Authorization;
using Microsoft.AspNet.Http; using Microsoft.AspNet.Http;
using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity; using Microsoft.Data.Entity;
using Yavsc.Abstract.Identity;
using Yavsc.Models; using Yavsc.Models;
namespace Yavsc.Controllers namespace Yavsc.Controllers
@ -22,9 +23,12 @@ namespace Yavsc.Controllers
// GET: api/ApplicationUserApi // GET: api/ApplicationUserApi
[HttpGet] [HttpGet]
public IEnumerable<ApplicationUser> GetApplicationUser() public IEnumerable<UserInfo> GetApplicationUser()
{ {
return _context.Users.Include(u=>u.Roles).Include(u=>u.Logins).Include(u=>u.Claims); return _context.Users.Select(u=> new UserInfo {
UserId = u.Id,
UserName = u.UserName,
Avatar = u.Avatar });
} }
// GET: api/ApplicationUserApi/5 // GET: api/ApplicationUserApi/5
@ -36,7 +40,7 @@ namespace Yavsc.Controllers
return HttpBadRequest(ModelState); return HttpBadRequest(ModelState);
} }
ApplicationUser applicationUser = _context.Users.Single(m => m.Id == id); ApplicationUser applicationUser = _context.Users.Include(u=>u.Roles).Include(u=>u.Logins).Include(u=>u.Claims).Single(m => m.Id == id);
if (applicationUser == null) if (applicationUser == null)
{ {
@ -145,4 +149,4 @@ namespace Yavsc.Controllers
return _context.Users.Count(e => e.Id == id) > 0; return _context.Users.Count(e => e.Id == id) > 0;
} }
} }
} }