notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 2 Releases 8 Packages Wiki Activity Actions

saves external user names

Browse source
This commit is contained in:
Paul Schneider 2017-02-01 05:45:43 +01:00
commit 0593aced2b
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Yavsc/Controllers/AccountController.cs
View file

@ -16,6 +16,7 @@ using Yavsc.Services;
using Yavsc.ViewModels.Account; using Yavsc.ViewModels.Account;
using Yavsc.Helpers; using Yavsc.Helpers;
using Microsoft.Extensions.Localization; using Microsoft.Extensions.Localization;
using Microsoft.Data.Entity;
namespace Yavsc.Controllers namespace Yavsc.Controllers
{ {
@ -35,6 +36,8 @@ namespace Yavsc.Controllers
// TwilioSettings _twilioSettings; // TwilioSettings _twilioSettings;
ApplicationDbContext _dbContext;
public AccountController( public AccountController(
UserManager<ApplicationUser> userManager, UserManager<ApplicationUser> userManager,
SignInManager<ApplicationUser> signInManager, SignInManager<ApplicationUser> signInManager,
@ -42,7 +45,8 @@ namespace Yavsc.Controllers
IOptions<SiteSettings> siteSettings, IOptions<SiteSettings> siteSettings,
IOptions<SmtpSettings> smtpSettings, IOptions<SmtpSettings> smtpSettings,
ILoggerFactory loggerFactory, IOptions<TwilioSettings> twilioSettings, ILoggerFactory loggerFactory, IOptions<TwilioSettings> twilioSettings,
IStringLocalizer<Yavsc.Resources.YavscLocalisation> localizer) IStringLocalizer<Yavsc.Resources.YavscLocalisation> localizer,
ApplicationDbContext dbContext)
{ {
_userManager = userManager; _userManager = userManager;
_signInManager = signInManager; _signInManager = signInManager;
@ -54,7 +58,7 @@ namespace Yavsc.Controllers
_twilioSettings = twilioSettings.Value; _twilioSettings = twilioSettings.Value;
_logger = loggerFactory.CreateLogger<AccountController>(); _logger = loggerFactory.CreateLogger<AccountController>();
_localizer = localizer; _localizer = localizer;
_dbContext = dbContext;
} }
[HttpGet(Constants.LoginPath)] [HttpGet(Constants.LoginPath)]
@ -226,10 +230,18 @@ namespace Yavsc.Controllers
} }
// Sign in the user with this external login provider if the user already has a login. // Sign in the user with this external login provider if the user already has a login.
info.ProviderDisplayName = info.ExternalPrincipal.Claims.First(c=>c.Type == "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name")?.Value;
var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false); var result = await _signInManager.ExternalLoginSignInAsync(info.LoginProvider, info.ProviderKey, isPersistent: false);
if (result.Succeeded) if (result.Succeeded)
{ {
_logger.LogInformation(5, "User logged in with {Name} provider.", info.LoginProvider); _logger.LogInformation(5, $"User logged in with {info.LoginProvider} provider, as {info.ProviderDisplayName} ({info.ProviderKey})." );
var ninfo = _dbContext.UserLogins.First(l=>l.ProviderKey == info.ProviderKey && l.LoginProvider == info.LoginProvider);
ninfo.ProviderDisplayName = info.ProviderDisplayName;
_dbContext.Entry(ninfo).State = EntityState.Modified;
_dbContext.SaveChanges();
return Redirect(returnUrl); return Redirect(returnUrl);
} }