paul/yavsc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more info from Me

Browse Source
This commit is contained in:
Paul Schneider
2018-01-15 14:09:19 +01:00
parent 73c27d0e68
commit 7279ac292a
3 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Yavsc/ApiControllers/AccountController.cs
View File

@ -13,6 +13,8 @@ namespace Yavsc.WebApi.Controllers
using Models.Auth;
using Yavsc.Helpers;
using System.Linq;
using Microsoft.Data.Entity;
using Microsoft.AspNet.Identity.EntityFramework;
[Authorize(),Route("~/api/account")]
public class ApiAccountController : Controller
@ -21,14 +23,16 @@ namespace Yavsc.WebApi.Controllers
private UserManager<ApplicationUser> _userManager;
private readonly SignInManager<ApplicationUser> _signInManager;
ApplicationDbContext _dbContext;
private ILogger _logger;
public ApiAccountController(UserManager<ApplicationUser> userManager,
SignInManager<ApplicationUser> signInManager, ILoggerFactory loggerFactory)
SignInManager<ApplicationUser> signInManager, ILoggerFactory loggerFactory, ApplicationDbContext dbContext)
{
UserManager = userManager;
_signInManager = signInManager;
_logger = loggerFactory.CreateLogger("ApiAuth");
_dbContext = dbContext;
}
public UserManager<ApplicationUser> UserManager
@ -131,13 +135,20 @@ namespace Yavsc.WebApi.Controllers
new { error = "user not found" });
var uid = User.GetUserId();
var iduser = await UserManager.FindByIdAsync(uid);
var userData = await _dbContext.Users
.Include(u=>u.PostalAddress)
.Include(u=>u.AccountBalance)
.Include(u=>u.Roles)
.FirstAsync(u=>u.Id == uid);
var user = new Me(userData);
var userRoles = _dbContext.UserRoles.Where(u=>u.UserId == uid).ToArray();
IdentityRole [] roles = _dbContext.Roles.Where(r=>userRoles.Any(ur=>ur.RoleId==r.Id)).ToArray();
user.Roles = roles.Select(r=>r.Name).ToArray();
var user = new Me(iduser.Id,iduser.UserName,
new string [] { iduser.Email },
await UserManager.GetRolesAsync(iduser),
iduser.Avatar, iduser.PostalAddress?.Address
);
return Ok(user);
}