fergalmoran/podnoms
1
0
Fork 0
mirror of https://github.com/fergalmoran/podnoms.git synced 2026-01-07 00:56:40 +00:00
Code Issues 4 Packages Projects Releases Wiki Activity

Profile model working

Browse Source
This commit is contained in:
Fergal Moran
2018-04-22 19:36:08 +01:00
parent 6da5c22904
commit 07eced07ff
16 changed files with 286 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/Controllers/AccountsController.cs
View File

@@ -30,7 +30,7 @@ namespace PodNoms.Api.Controllers {
// var result = await _userRepository.AddOrUpdate(userIdentity, model.Password);
if (!result.Succeeded) return new BadRequestObjectResult(result);
return new OkObjectResult(model);
return new OkObjectResult(model );
}
}
}

32
server/Controllers/PodcastController.cs
View File

@@ -8,6 +8,7 @@ using AutoMapper;
using Hangfire;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options;
using PodNoms.Api.Models;
@@ -23,17 +24,19 @@ namespace PodNoms.Api.Controllers {
public class PodcastController : Controller {
private readonly IPodcastRepository _repository;
private readonly IUserRepository _userRepository;
private readonly UserManager<ApplicationUser> _userManager;
private readonly IOptions<AppSettings> _settings;
private readonly IMapper _mapper;
private ClaimsPrincipal _caller;
private readonly IUnitOfWork _uow;
public PodcastController(IPodcastRepository repository, IUserRepository userRepository,
public PodcastController(IPodcastRepository repository, IUserRepository userRepository, UserManager<ApplicationUser> userManager,
IOptions<AppSettings> options, IMapper mapper, IUnitOfWork unitOfWork, IHttpContextAccessor httpContextAccessor) {
_caller = httpContextAccessor.HttpContext.User;
this._caller = httpContextAccessor.HttpContext.User;
this._uow = unitOfWork;
this._repository = repository;
this._userRepository = userRepository;
this._userManager = userManager;
this._settings = options;
this._mapper = mapper;
}
@@ -62,28 +65,25 @@ namespace PodNoms.Api.Controllers {
[HttpPost]
public async Task<IActionResult> Post([FromBody] PodcastViewModel vm) {
var userId = _caller.Claims.Single(c => c.Type == "id");
var user = _userRepository.Get(userId.Value);
if (user == null)
return new BadRequestObjectResult("Unable to look up user profile");
var user = await this._userManager.FindByIdAsync(userId.Value);
if (user != null) {
if (ModelState.IsValid) {
var item = _mapper.Map<PodcastViewModel, Podcast>(vm);
if (ModelState.IsValid) {
var item = _mapper.Map<PodcastViewModel, Podcast>(vm);
item.User = user;
//remove once we're ready
item.User = _userRepository.Get("fergal.moran@gmail.com");
item.AppUser = user;
var ret = await _repository.AddOrUpdateAsync(item);
await _uow.CompleteAsync();
return new OkObjectResult(_mapper.Map<Podcast, PodcastViewModel>(ret));
var ret = await _repository.AddOrUpdateAsync(item);
await _uow.CompleteAsync();
return new OkObjectResult(_mapper.Map<Podcast, PodcastViewModel>(ret));
}
}
return BadRequest("Invalid request data");
}
[HttpPut]
public async Task<IActionResult> Put([FromBody] PodcastViewModel vm) {
var email = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)?.Value;
var user = _userRepository.Get(email);
if (string.IsNullOrEmpty(email) || user == null)
return new BadRequestObjectResult("Unable to look up user profile");
if (ModelState.IsValid) {
var podcast = await _repository.GetAsync(vm.Id);
if (podcast != null) {

30
server/Controllers/ProfileController.cs
View File

@@ -3,43 +3,50 @@ using System.Security.Claims;
using System.Threading.Tasks;
using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Mvc;
using PodNoms.Api.Models;
using PodNoms.Api.Models.ViewModels;
using PodNoms.Api.Persistence;
using PodNoms.Api.Services.Auth;
namespace PodNoms.Api.Controllers {
[Authorize]
[Route("[controller]")]
public class ProfileController : Controller {
private IUserRepository _userRepository;
private readonly UserManager<ApplicationUser> _userManager;
public IUnitOfWork _unitOfWork { get; }
private readonly ClaimsPrincipal _caller;
public IMapper _mapper { get; }
public ProfileController(IUserRepository userRepository, IMapper mapper, IUnitOfWork unitOfWork) {
public ProfileController(IUserRepository userRepository, IMapper mapper, IUnitOfWork unitOfWork,
UserManager<ApplicationUser> userManager, IHttpContextAccessor httpContextAccessor) {
this._caller = httpContextAccessor.HttpContext.User;
this._mapper = mapper;
this._unitOfWork = unitOfWork;
this._userManager = userManager;
this._userRepository = userRepository;
}
[HttpGet]
public async Task<ActionResult<ProfileViewModel>> Get() {
var email = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)?.Value;
var user = await _userRepository.GetAsync(email);
if (user != null) {
var result = _mapper.Map<User, ProfileViewModel>(user);
return new OkObjectResult(result);
}
return new NotFoundResult();
var userId = _caller.Claims.Single(c => c.Type == "id");
var user = await this._userManager.FindByIdAsync(userId.Value);
var result = _mapper.Map<ApplicationUser, ProfileViewModel>(user);
return new OkObjectResult(result);
}
[HttpPost]
public async Task<ActionResult> Post([FromBody] ProfileViewModel item) {
/* TODO: Update this to the new model
var email = User.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Email)?.Value;
var user = _userRepository.Get(email);
if (user == null || user.Id != item.Id)
return new UnauthorizedResult();
user.Id = item.Id;
user.EmailAddress = item.Email;
user.FullName = item.Name;
@@ -48,6 +55,7 @@ namespace PodNoms.Api.Controllers {
_userRepository.AddOrUpdate(user);
await _unitOfWork.CompleteAsync();
*/
return new OkObjectResult(item);
}