@ -1,9 +1,9 @@
using System.Linq ; using System.Linq ;
using System.Security.Claims ;
using System.Threading.Tasks ; using System.Threading.Tasks ;
using Microsoft.AspNet.Authorization ; using Microsoft.AspNetCore.Authorization ;
using Microsoft.AspNet.Identity ; using Microsoft.AspNetCore.Identity ;
using Microsoft.AspNet.Mvc ; using Microsoft.AspNetCore.Mvc ;
using Microsoft.Extensions.Logging ;
using Mvc.Server.Models ; using Mvc.Server.Models ;
using Mvc.Server.Services ; using Mvc.Server.Services ;
using Mvc.Server.ViewModels.Manage ; using Mvc.Server.ViewModels.Manage ;
@ -15,20 +15,23 @@ namespace Mvc.Server.Controllers {
private readonly SignInManager < ApplicationUser > _ signInManager ; private readonly SignInManager < ApplicationUser > _ signInManager ;
private readonly IEmailSender _ emailSender ; private readonly IEmailSender _ emailSender ;
private readonly ISmsSender _ smsSender ; private readonly ISmsSender _ smsSender ;
private readonly ILogger _l ogger ;
public ManageController ( public ManageController (
UserManager < ApplicationUser > userManager , UserManager < ApplicationUser > userManager ,
SignInManager < ApplicationUser > signInManager , SignInManager < ApplicationUser > signInManager ,
IEmailSender emailSender , IEmailSender emailSender ,
ISmsSender smsSender ) { ISmsSender smsSender ,
ILoggerFactory loggerFactory ) {
_ userManager = userManager ; _ userManager = userManager ;
_ signInManager = signInManager ; _ signInManager = signInManager ;
_ emailSender = emailSender ; _ emailSender = emailSender ;
_ smsSender = smsSender ; _ smsSender = smsSender ;
_l ogger = loggerFactory . CreateLogger < ManageController > ( ) ;
} }
//
//
// GET: /Account /Index
// GET: /Manage /Index
[HttpGet] [HttpGet]
public async Task < IActionResult > Index ( ManageMessageId ? message = null ) { public async Task < IActionResult > Index ( ManageMessageId ? message = null ) {
ViewData [ "StatusMessage" ] = ViewData [ "StatusMessage" ] =
@ -51,25 +54,15 @@ namespace Mvc.Server.Controllers {
return View ( model ) ; return View ( model ) ;
} }
//
// GET: /Account/RemoveLogin
[HttpGet]
public async Task < IActionResult > RemoveLogin ( ) {
var user = await GetCurrentUserAsync ( ) ;
var linkedAccounts = await _ userManager . GetLoginsAsync ( user ) ;
ViewData [ "ShowRemoveButton" ] = await _ userManager . HasPasswordAsync ( user ) | | linkedAccounts . Count > 1 ;
return View ( linkedAccounts ) ;
}
//
//
// POST: /Manage/RemoveLogin
// POST: /Manage/RemoveLogin
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] [ValidateAntiForgeryToken]
public async Task < IActionResult > RemoveLogin ( string loginProvider , string providerKey ) { public async Task < IActionResult > RemoveLogin ( RemoveLoginViewModel account ) {
ManageMessageId ? message = ManageMessageId . Error ; ManageMessageId ? message = ManageMessageId . Error ;
var user = await GetCurrentUserAsync ( ) ; var user = await GetCurrentUserAsync ( ) ;
if ( user ! = null ) { if ( user ! = null ) {
var result = await _ userManager . RemoveLoginAsync ( user , l oginProvider, p roviderKey) ; var result = await _ userManager . RemoveLoginAsync ( user , account . LoginProvider , account . ProviderKey ) ;
if ( result . Succeeded ) { if ( result . Succeeded ) {
await _ signInManager . SignInAsync ( user , isPersistent : false ) ; await _ signInManager . SignInAsync ( user , isPersistent : false ) ;
message = ManageMessageId . RemoveLoginSuccess ; message = ManageMessageId . RemoveLoginSuccess ;
@ -79,13 +72,13 @@ namespace Mvc.Server.Controllers {
} }
//
//
// GET: /Account /AddPhoneNumber
// GET: /Manage /AddPhoneNumber
public IActionResult AddPhoneNumber ( ) { public IActionResult AddPhoneNumber ( ) {
return View ( ) ; return View ( ) ;
} }
//
//
// POST: /Account /AddPhoneNumber
// POST: /Manage /AddPhoneNumber
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] [ValidateAntiForgeryToken]
public async Task < IActionResult > AddPhoneNumber ( AddPhoneNumberViewModel model ) { public async Task < IActionResult > AddPhoneNumber ( AddPhoneNumberViewModel model ) {
@ -108,6 +101,7 @@ namespace Mvc.Server.Controllers {
if ( user ! = null ) { if ( user ! = null ) {
await _ userManager . SetTwoFactorEnabledAsync ( user , true ) ; await _ userManager . SetTwoFactorEnabledAsync ( user , true ) ;
await _ signInManager . SignInAsync ( user , isPersistent : false ) ; await _ signInManager . SignInAsync ( user , isPersistent : false ) ;
_l ogger . LogInformation ( 1 , "User enabled two-factor authentication." ) ;
} }
return RedirectToAction ( nameof ( Index ) , "Manage" ) ; return RedirectToAction ( nameof ( Index ) , "Manage" ) ;
} }
@ -121,12 +115,13 @@ namespace Mvc.Server.Controllers {
if ( user ! = null ) { if ( user ! = null ) {
await _ userManager . SetTwoFactorEnabledAsync ( user , false ) ; await _ userManager . SetTwoFactorEnabledAsync ( user , false ) ;
await _ signInManager . SignInAsync ( user , isPersistent : false ) ; await _ signInManager . SignInAsync ( user , isPersistent : false ) ;
_l ogger . LogInformation ( 2 , "User disabled two-factor authentication." ) ;
} }
return RedirectToAction ( nameof ( Index ) , "Manage" ) ; return RedirectToAction ( nameof ( Index ) , "Manage" ) ;
} }
//
//
// GET: /Account /VerifyPhoneNumber
// GET: /Manage /VerifyPhoneNumber
[HttpGet] [HttpGet]
public async Task < IActionResult > VerifyPhoneNumber ( string phoneNumber ) { public async Task < IActionResult > VerifyPhoneNumber ( string phoneNumber ) {
var code = await _ userManager . GenerateChangePhoneNumberTokenAsync ( await GetCurrentUserAsync ( ) , phoneNumber ) ; var code = await _ userManager . GenerateChangePhoneNumberTokenAsync ( await GetCurrentUserAsync ( ) , phoneNumber ) ;
@ -135,7 +130,7 @@ namespace Mvc.Server.Controllers {
} }
//
//
// POST: /Account /VerifyPhoneNumber
// POST: /Manage /VerifyPhoneNumber
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] [ValidateAntiForgeryToken]
public async Task < IActionResult > VerifyPhoneNumber ( VerifyPhoneNumberViewModel model ) { public async Task < IActionResult > VerifyPhoneNumber ( VerifyPhoneNumberViewModel model ) {
@ -156,8 +151,9 @@ namespace Mvc.Server.Controllers {
} }
//
//
// GET: /Account/RemovePhoneNumber
// GET: /Manage/RemovePhoneNumber
[HttpGet] [HttpPost]
[ValidateAntiForgeryToken]
public async Task < IActionResult > RemovePhoneNumber ( ) { public async Task < IActionResult > RemovePhoneNumber ( ) {
var user = await GetCurrentUserAsync ( ) ; var user = await GetCurrentUserAsync ( ) ;
if ( user ! = null ) { if ( user ! = null ) {
@ -178,7 +174,7 @@ namespace Mvc.Server.Controllers {
} }
//
//
// POST: /Account/Manage
// POST: /Manage/ChangePassword
[HttpPost] [HttpPost]
[ValidateAntiForgeryToken] [ValidateAntiForgeryToken]
public async Task < IActionResult > ChangePassword ( ChangePasswordViewModel model ) { public async Task < IActionResult > ChangePassword ( ChangePasswordViewModel model ) {
@ -190,6 +186,7 @@ namespace Mvc.Server.Controllers {
var result = await _ userManager . ChangePasswordAsync ( user , model . OldPassword , model . NewPassword ) ; var result = await _ userManager . ChangePasswordAsync ( user , model . OldPassword , model . NewPassword ) ;
if ( result . Succeeded ) { if ( result . Succeeded ) {
await _ signInManager . SignInAsync ( user , isPersistent : false ) ; await _ signInManager . SignInAsync ( user , isPersistent : false ) ;
_l ogger . LogInformation ( 3 , "User changed their password successfully." ) ;
return RedirectToAction ( nameof ( Index ) , new { Message = ManageMessageId . ChangePasswordSuccess } ) ; return RedirectToAction ( nameof ( Index ) , new { Message = ManageMessageId . ChangePasswordSuccess } ) ;
} }
AddErrors ( result ) ; AddErrors ( result ) ;
@ -227,7 +224,7 @@ namespace Mvc.Server.Controllers {
return RedirectToAction ( nameof ( Index ) , new { Message = ManageMessageId . Error } ) ; return RedirectToAction ( nameof ( Index ) , new { Message = ManageMessageId . Error } ) ;
} }
//GET: /Account/Manage
//GET: /Manage/ManageLogins
[HttpGet] [HttpGet]
public async Task < IActionResult > ManageLogins ( ManageMessageId ? message = null ) { public async Task < IActionResult > ManageLogins ( ManageMessageId ? message = null ) {
ViewData [ "StatusMessage" ] = ViewData [ "StatusMessage" ] =
@ -255,8 +252,8 @@ namespace Mvc.Server.Controllers {
public IActionResult LinkLogin ( string provider ) { public IActionResult LinkLogin ( string provider ) {
// Request a redirect to the external login provider to link a login for the current user
// Request a redirect to the external login provider to link a login for the current user
var redirectUrl = Url . Action ( "LinkLoginCallback" , "Manage" ) ; var redirectUrl = Url . Action ( "LinkLoginCallback" , "Manage" ) ;
var properties = _ signInManager . ConfigureExternalAuthenticationProperties ( provider , redirectUrl , Us er. GetUserId ( ) ) ; var properties = _ signInManager . ConfigureExternalAuthenticationProperties ( provider , redirectUrl , _ userManag er. GetUserId ( User ) ) ;
return new ChallengeResult ( provider , properties ) ; return Challenge ( provider , properties ) ;
} }
//
//
@ -267,7 +264,7 @@ namespace Mvc.Server.Controllers {
if ( user = = null ) { if ( user = = null ) {
return View ( "Error" ) ; return View ( "Error" ) ;
} }
var info = await _ signInManager . GetExternalLoginInfoAsync ( Us er. GetUserId ( ) ) ; var info = await _ signInManager . GetExternalLoginInfoAsync ( await _ userManag er. GetUserIdAsync ( user ) ) ;
if ( info = = null ) { if ( info = = null ) {
return RedirectToAction ( nameof ( ManageLogins ) , new { Message = ManageMessageId . Error } ) ; return RedirectToAction ( nameof ( ManageLogins ) , new { Message = ManageMessageId . Error } ) ;
} }
@ -284,14 +281,6 @@ namespace Mvc.Server.Controllers {
} }
} }
private async Task < bool > HasPhoneNumber ( ) {
var user = await _ userManager . FindByIdAsync ( User . GetUserId ( ) ) ;
if ( user ! = null ) {
return user . PhoneNumber ! = null ;
}
return false ;
}
public enum ManageMessageId { public enum ManageMessageId {
AddPhoneSuccess , AddPhoneSuccess ,
AddLoginSuccess , AddLoginSuccess ,
@ -303,19 +292,10 @@ namespace Mvc.Server.Controllers {
Error Error
} }
private async Task < ApplicationUser > GetCurrentUserAsync ( ) { private Task < ApplicationUser > GetCurrentUserAsync ( ) {
return await _ userManager . FindByIdAsync ( User . GetUserId ( ) ) ; return _ userManager . GetUserAsync ( User ) ;
}
private IActionResult RedirectToLocal ( string returnUrl ) {
if ( Url . IsLocalUrl ( returnUrl ) ) {
return Redirect ( returnUrl ) ;
}
else {
return RedirectToAction ( nameof ( HomeController . Index ) , nameof ( HomeController ) ) ;
}
} }
#endregion
#endregion
} }
} }
Kévin Chalet
10 years ago