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

fixes, refacts

Browse source
This commit is contained in:
Paul Schneider 2018-08-05 04:16:21 +02:00
commit 13fde95882
19 changed files with 193 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Yavsc/Controllers/Accounting/AccountController.cs
View file

@ -225,7 +225,7 @@ namespace Yavsc.Controllers
{
if (ModelState.IsValid)
{
var user = new ApplicationUser { UserName = model.Email, Email = model.Email };
var user = new ApplicationUser { UserName = model.UserName, Email = model.Email };
var result = await _userManager.CreateAsync(user, model.Password);
if (result.Succeeded)
{
@ -240,7 +240,8 @@ namespace Yavsc.Controllers
var callbackUrl = Url.Action("ConfirmEmail", "Account", new { userId = user.Id, code = code }, protocol: HttpContext.Request.Scheme);
var emailSent = await _emailSender.SendEmailAsync(model.UserName, model.Email, _localizer["ConfirmYourAccountTitle"],
string.Format(_localizer["ConfirmYourAccountBody"], _siteSettings.Title, callbackUrl, _siteSettings.Slogan, _siteSettings.Audience));
await _signInManager.SignInAsync(user, isPersistent: false);
// No, wait for more than a login pass submission:
// do not await _signInManager.SignInAsync(user, isPersistent: false);
if (emailSent==null)
{
_logger.LogWarning("User created with error sending email confirmation request");
@ -249,7 +250,7 @@ namespace Yavsc.Controllers
_localizer["ErrorSendingEmailForConfirm"]
);
}
else
else
this.NotifyInfo(
"E-mail confirmation",
_localizer["EmailSentForConfirm"]

2
Yavsc/Views/Account/ConfirmEmail.cshtml
View file

@ -8,7 +8,7 @@
Merci d’avoir confirmé votre e-mail.
@if (User.GetUserId()==null) {
<text>S&rsquo;il vous plait,
<a asp-controller="Account" asp-action="Login">Cliquez ici pour vous connecter</a>.
<a asp-controller="Account" asp-action="SignIn">Cliquez ici pour vous connecter</a>.
</text>
}
</p>

1
Yavsc/project.json
View file

@ -24,6 +24,7 @@
},
"userSecretsId": "aspnet5-YavscWeb-a0dadd21-2ced-43d3-96f9-7e504345102f",
"exclude": [
"bin",
"wwwroot",
"node_modules",
"bower_components",