claunia/marechai
1
0
Fork 0
mirror of https://github.com/claunia/marechai.git synced 2025-12-16 19:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Redo .NET Identity as it was not working.

Browse Source
This commit is contained in:
Natalia Portillo
2019-05-18 01:43:09 +01:00
parent b9eacd73d5
commit aada3f5e86
64 changed files with 597 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cicm_web/Areas/Identity/IdentityHostingStartup.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -28,8 +28,12 @@
// Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/
using Cicm.Database.Models;
using cicm_web.Areas.Identity;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
[assembly: HostingStartup(typeof(IdentityHostingStartup))]
@@ -39,7 +43,15 @@ namespace cicm_web.Areas.Identity
{
public void Configure(IWebHostBuilder builder)
{
builder.ConfigureServices((context, services) => { });
builder.ConfigureServices((context, services) =>
{
services.AddDbContext<cicmContext>(options => options
.UseLazyLoadingProxies()
.UseMySql("server=localhost;port=3306;user=cicm;password=cicmpass;database=cicm"));
services.AddDefaultIdentity<IdentityUser>().AddRoles<IdentityRole>()
.AddEntityFrameworkStores<cicmContext>();
});
}
}
}

2
cicm_web/Areas/Identity/Pages/Account/AccessDenied.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

2
cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml
View File

@@ -35,7 +35,7 @@
ViewData["Title"] = "Confirm email";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<div>
<p>
Thank you for confirming your email.

2
cicm_web/Areas/Identity/Pages/Account/ConfirmEmail.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

23
cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml
View File

@@ -35,7 +35,7 @@
ViewData["Title"] = "Register";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<h4>Associate your @Model.LoginProvider account.</h4>
<hr />
@@ -47,14 +47,24 @@
<div class="row">
<div class="col-md-4">
<form asp-page-handler="Confirmation" asp-route-returnUrl="@Model.ReturnUrl" method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<form asp-page-handler="Confirmation"
asp-route-returnUrl="@Model.ReturnUrl"
method="post">
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.Email"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
<input asp-for="Input.Email"
class="form-control" />
<span asp-validation-for="Input.Email"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Register</button>
<button class="btn btn-primary"
type="submit">
Register
</button>
</form>
</div>
</div>
@@ -62,4 +72,3 @@
@section Scripts {
<partial name="_ValidationScriptsPartial" />
}

2
cicm_web/Areas/Identity/Pages/Account/ExternalLogin.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

18
cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml
View File

@@ -35,19 +35,27 @@
ViewData["Title"] = "Forgot your password?";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<h4>Enter your email.</h4>
<hr />
<div class="row">
<div class="col-md-4">
<form method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.Email"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
<input asp-for="Input.Email"
class="form-control" />
<span asp-validation-for="Input.Email"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Submit</button>
<button class="btn btn-primary"
type="submit">
Submit
</button>
</form>
</div>
</div>

30
cicm_web/Areas/Identity/Pages/Account/ForgotPassword.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -56,24 +56,22 @@ namespace cicm_web.Areas.Identity.Pages.Account
public async Task<IActionResult> OnPostAsync()
{
if(ModelState.IsValid)
{
IdentityUser user = await _userManager.FindByEmailAsync(Input.Email);
if(user == null || !await _userManager.IsEmailConfirmedAsync(user))
return RedirectToPage("./ForgotPasswordConfirmation");
// For more information on how to enable account confirmation and password reset please
// visit https://go.microsoft.com/fwlink/?LinkID=532713
string code = await _userManager.GeneratePasswordResetTokenAsync(user);
string callbackUrl = Url.Page("/Account/ResetPassword", null, new {code}, Request.Scheme);
await _emailSender.SendEmailAsync(Input.Email, "Reset Password",
$"Please reset your password by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
if(!ModelState.IsValid) return Page();
IdentityUser user = await _userManager.FindByEmailAsync(Input.Email);
if(user == null || !await _userManager.IsEmailConfirmedAsync(user))
// Don't reveal that the user does not exist or is not confirmed
return RedirectToPage("./ForgotPasswordConfirmation");
}
return Page();
// For more information on how to enable account confirmation and password reset please
// visit https://go.microsoft.com/fwlink/?LinkID=532713
string code = await _userManager.GeneratePasswordResetTokenAsync(user);
string callbackUrl = Url.Page("/Account/ResetPassword", null, new {code}, Request.Scheme);
await _emailSender.SendEmailAsync(Input.Email, "Reset Password",
$"Please reset your password by <a href='{HtmlEncoder.Default.Encode(callbackUrl)}'>clicking here</a>.");
return RedirectToPage("./ForgotPasswordConfirmation");
}
public class InputModel

3
cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml
View File

@@ -35,8 +35,7 @@
ViewData["Title"] = "Forgot password confirmation";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<p>
Please check your email to reset your password.
</p>

2
cicm_web/Areas/Identity/Pages/Account/ForgotPasswordConfirmation.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

2
cicm_web/Areas/Identity/Pages/Account/Lockout.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

56
cicm_web/Areas/Identity/Pages/Account/Login.cshtml
View File

@@ -30,29 +30,39 @@
*******************************************************************************/
}
@page
@using Microsoft.AspNetCore.Authentication
@model LoginModel
@{
ViewData["Title"] = "Log in";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<div class="row">
<div class="col-md-4">
<section>
<form method="post">
<form id="account"
method="post">
<h4>Use a local account to log in.</h4>
<hr />
<div asp-validation-summary="All" class="text-danger"></div>
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.Email"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
<input asp-for="Input.Email"
class="form-control" />
<span asp-validation-for="Input.Email"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
<input asp-for="Input.Password"
class="form-control" />
<span asp-validation-for="Input.Password"
class="text-danger">
</span>
</div>
<div class="form-group">
<div class="checkbox">
@@ -63,14 +73,23 @@
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-default">Log in</button>
<button class="btn btn-primary"
type="submit">
Log in
</button>
</div>
<div class="form-group">
<p>
<a asp-page="./ForgotPassword">Forgot your password?</a>
<a asp-page="./ForgotPassword"
id="forgot-password">
Forgot your password?
</a>
</p>
<p>
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
<a asp-page="./Register"
asp-route-returnUrl="@Model.ReturnUrl">
Register as a new user
</a>
</p>
</div>
</form>
@@ -81,7 +100,7 @@
<h4>Use another service to log in.</h4>
<hr />
@{
if ((Model.ExternalLogins?.Count ?? 0) == 0)
if((Model.ExternalLogins?.Count ?? 0) == 0)
{
<div>
<p>
@@ -92,12 +111,21 @@
}
else
{
<form asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
<form id="external-account"
asp-page="./ExternalLogin"
asp-route-returnUrl="@Model.ReturnUrl"
method="post"
class="form-horizontal">
<div>
<p>
@foreach (var provider in Model.ExternalLogins)
@foreach(AuthenticationScheme provider in Model.ExternalLogins)
{
<button type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
<button type="submit"
class="btn btn-primary"
name="provider"
value="@provider.Name"
title="Log in using your @provider.DisplayName account">
@provider.DisplayName</button>
}
</p>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Login.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

31
cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml
View File

@@ -35,18 +35,26 @@
ViewData["Title"] = "Two-factor authentication";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<hr />
<p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
<div class="row">
<div class="col-md-4">
<form method="post" asp-route-returnUrl="@Model.ReturnUrl">
<input asp-for="RememberMe" type="hidden" />
<div asp-validation-summary="All" class="text-danger"></div>
<form method="post"
asp-route-returnUrl="@Model.ReturnUrl">
<input asp-for="RememberMe"
type="hidden" />
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.TwoFactorCode"></label>
<input asp-for="Input.TwoFactorCode" class="form-control" autocomplete="off" />
<span asp-validation-for="Input.TwoFactorCode" class="text-danger"></span>
<input asp-for="Input.TwoFactorCode"
class="form-control"
autocomplete="off" />
<span asp-validation-for="Input.TwoFactorCode"
class="text-danger">
</span>
</div>
<div class="form-group">
<div class="checkbox">
@@ -57,14 +65,21 @@
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-default">Log in</button>
<button class="btn btn-primary"
type="submit">
Log in
</button>
</div>
</form>
</div>
</div>
<p>
Don't have access to your authenticator device? You can
<a asp-page="./LoginWithRecoveryCode" asp-route-returnUrl="@Model.ReturnUrl">log in with a recovery code</a>.
<a id="recovery-code-login"
asp-page="./LoginWithRecoveryCode"
asp-route-returnUrl="@Model.ReturnUrl">
log in with a recovery code
</a>.
</p>
@section Scripts {

6
cicm_web/Areas/Identity/Pages/Account/LoginWith2fa.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -64,7 +64,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
// Ensure the user has gone through the username & password screen first
IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
ReturnUrl = returnUrl;
RememberMe = rememberMe;
@@ -79,7 +79,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
returnUrl = returnUrl ?? Url.Content("~/");
IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
string authenticatorCode = Input.TwoFactorCode.Replace(" ", string.Empty).Replace("-", string.Empty);

21
cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml
View File

@@ -35,7 +35,7 @@
ViewData["Title"] = "Recovery code verification";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<hr />
<p>
You have requested to log in with a recovery code. This login will not be remembered until you provide
@@ -44,17 +44,26 @@
<div class="row">
<div class="col-md-4">
<form method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.RecoveryCode"></label>
<input asp-for="Input.RecoveryCode" class="form-control" autocomplete="off" />
<span asp-validation-for="Input.RecoveryCode" class="text-danger"></span>
<input asp-for="Input.RecoveryCode"
class="form-control"
autocomplete="off" />
<span asp-validation-for="Input.RecoveryCode"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Log in</button>
<button class="btn btn-primary"
type="submit">
Log in
</button>
</form>
</div>
</div>
@section Scripts {
@section Scripts {
<partial name="_ValidationScriptsPartial" />
}

6
cicm_web/Areas/Identity/Pages/Account/LoginWithRecoveryCode.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -62,7 +62,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
{
// Ensure the user has gone through the username & password screen first
IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
ReturnUrl = returnUrl;
@@ -74,7 +74,7 @@ namespace cicm_web.Areas.Identity.Pages.Account
if(!ModelState.IsValid) return Page();
IdentityUser user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
if(user == null) throw new InvalidOperationException($"Unable to load two-factor authentication user.");
if(user == null) throw new InvalidOperationException("Unable to load two-factor authentication user.");
string recoveryCode = Input.RecoveryCode.Replace(" ", string.Empty);

2
cicm_web/Areas/Identity/Pages/Account/Logout.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

37
cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml
View File

@@ -33,30 +33,47 @@
@model ChangePasswordModel
@{
ViewData["Title"] = "Change password";
ViewData["ActivePage"] = ManageNavPages.ChangePassword;
}
<h4>@ViewData["Title"]</h4>
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<div class="row">
<div class="col-md-6">
<form id="change-password-form" method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<form id="change-password-form"
method="post">
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.OldPassword"></label>
<input asp-for="Input.OldPassword" class="form-control" />
<span asp-validation-for="Input.OldPassword" class="text-danger"></span>
<input asp-for="Input.OldPassword"
class="form-control" />
<span asp-validation-for="Input.OldPassword"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.NewPassword"></label>
<input asp-for="Input.NewPassword" class="form-control" />
<span asp-validation-for="Input.NewPassword" class="text-danger"></span>
<input asp-for="Input.NewPassword"
class="form-control" />
<span asp-validation-for="Input.NewPassword"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<input asp-for="Input.ConfirmPassword" class="form-control" />
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
<input asp-for="Input.ConfirmPassword"
class="form-control" />
<span asp-validation-for="Input.ConfirmPassword"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Update password</button>
<button class="btn btn-primary"
type="submit">
Update password
</button>
</form>
</div>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Manage/ChangePassword.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

35
cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml
View File

@@ -33,12 +33,13 @@
@model DeletePersonalDataModel
@{
ViewData["Title"] = "Delete Personal Data";
ViewData["ActivePage"] = ManageNavPages.DeletePersonalData;
ViewData["ActivePage"] = ManageNavPages.PersonalData;
}
<h4>@ViewData["Title"]</h4>
<div class="alert alert-warning" role="alert">
<div class="alert alert-warning"
role="alert">
<p>
<span class="glyphicon glyphicon-warning-sign"></span>
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
@@ -46,20 +47,30 @@
</div>
<div>
<form id="delete-user" method="post" class="form-group">
<div asp-validation-summary="All" class="text-danger"></div>
@if (Model.RequirePassword)
{
<div class="form-group">
<label asp-for="Input.Password"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
<form class="form-group"
id="delete-user"
method="post">
<div asp-validation-summary="All"
class="text-danger">
</div>
@if(Model.RequirePassword)
{
<div class="form-group">
<label asp-for="Input.Password"></label>
<input asp-for="Input.Password"
class="form-control" />
<span asp-validation-for="Input.Password"
class="text-danger">
</span>
</div>
}
<button class="btn btn-danger" type="submit">Delete data and close my account</button>
<button class="btn btn-danger"
type="submit">
Delete data and close my account
</button>
</form>
</div>
@section Scripts {
<partial name="_ValidationScriptsPartial" />
<partial name="_ValidationScriptsPartial" />
}

2
cicm_web/Areas/Identity/Pages/Account/Manage/DeletePersonalData.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

16
cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml
View File

@@ -36,10 +36,12 @@
ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
}
@Html.Partial("_StatusMessage", Model.StatusMessage)
<h2>@ViewData["Title"]</h2>
<partial for="StatusMessage"
name="_StatusMessage" />
<h1>@ViewData["Title"]</h1>
<div class="alert alert-warning" role="alert">
<div class="alert alert-warning"
role="alert">
<p>
<span class="glyphicon glyphicon-warning-sign"></span>
<strong>This action only disables 2FA.</strong>
@@ -51,7 +53,11 @@
</div>
<div>
<form method="post" class="form-group">
<button class="btn btn-danger" type="submit">Disable 2FA</button>
<form class="form-group"
method="post">
<button class="btn btn-danger"
type="submit">
Disable 2FA
</button>
</form>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Manage/Disable2fa.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

2
cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml
View File

@@ -33,7 +33,7 @@
@model DownloadPersonalDataModel
@{
ViewData["Title"] = "Download Your Data";
ViewData["ActivePage"] = ManageNavPages.DownloadPersonalData;
ViewData["ActivePage"] = ManageNavPages.PersonalData;
}
<h4>@ViewData["Title"]</h4>

2
cicm_web/Areas/Identity/Pages/Account/Manage/DownloadPersonalData.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

32
cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml
View File

@@ -36,7 +36,8 @@
ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
}
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<h4>@ViewData["Title"]</h4>
<div>
<p>To use an authenticator app go through the following steps:</p>
@@ -56,7 +57,9 @@
<p>Scan the QR Code or enter this key <kbd>@Model.SharedKey</kbd> into your two factor authenticator app. Spaces and casing do not matter.</p>
<div class="alert alert-info">To enable QR code generation please read our <a href="https://go.microsoft.com/fwlink/?Linkid=852423">documentation</a>.</div>
<div id="qrCode"></div>
<div id="qrCodeData" data-url="@Html.Raw(Model.AuthenticatorUri)"></div>
<div id="qrCodeData"
data-url="@Html.Raw(Model.AuthenticatorUri)">
</div>
</li>
<li>
<p>
@@ -65,14 +68,27 @@
</p>
<div class="row">
<div class="col-md-6">
<form method="post">
<form id="send-code"
method="post">
<div class="form-group">
<label asp-for="Input.Code" class="control-label">Verification Code</label>
<input asp-for="Input.Code" class="form-control" autocomplete="off" />
<span asp-validation-for="Input.Code" class="text-danger"></span>
<label asp-for="Input.Code"
class="control-label">
Verification Code
</label>
<input asp-for="Input.Code"
class="form-control"
autocomplete="off" />
<span asp-validation-for="Input.Code"
class="text-danger">
</span>
</div>
<button class="btn btn-primary"
type="submit">
Verify
</button>
<div asp-validation-summary="ModelOnly"
class="text-danger">
</div>
<button type="submit" class="btn btn-default">Verify</button>
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
</form>
</div>
</div>

10
cicm_web/Areas/Identity/Pages/Account/Manage/EnableAuthenticator.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -153,11 +153,9 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
return result.ToString().ToLowerInvariant();
}
string GenerateQrCodeUri(string email, string unformattedKey)
{
return string.Format(AuthenticatorUriFormat, _urlEncoder.Encode("cicm_web"), _urlEncoder.Encode(email),
unformattedKey);
}
string GenerateQrCodeUri(string email, string unformattedKey) =>
string.Format(AuthenticatorUriFormat, _urlEncoder.Encode("cicm_web"), _urlEncoder.Encode(email),
unformattedKey);
public class InputModel
{

70
cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml
View File

@@ -30,52 +30,74 @@
*******************************************************************************/
}
@page
@using Microsoft.AspNetCore.Authentication
@model ExternalLoginsModel
@{
ViewData["Title"] = "Manage your external logins";
ViewData["ActivePage"] = ManageNavPages.ExternalLogins;
}
@Html.Partial("_StatusMessage", Model.StatusMessage)
@if (Model.CurrentLogins?.Count > 0)
<partial for="StatusMessage"
name="_StatusMessage" />
@if(Model.CurrentLogins?.Count > 0)
{
<h4>Registered Logins</h4>
<table class="table">
<tbody>
@foreach (var login in Model.CurrentLogins)
{
<tr>
<td>@login.LoginProvider</td>
<td>
@if (Model.ShowRemoveButton)
{
<form id="remove-login" asp-page-handler="RemoveLogin" method="post">
@foreach(UserLoginInfo login in Model.CurrentLogins)
{
<tr>
<td>@login.ProviderDisplayName</td>
<td>
@if(Model.ShowRemoveButton)
{
<form asp-page-handler="RemoveLogin"
id="remove-login"
method="post">
<div>
<input asp-for="@login.LoginProvider" name="LoginProvider" type="hidden" />
<input asp-for="@login.ProviderKey" name="ProviderKey" type="hidden" />
<button type="submit" class="btn btn-default" title="Remove this @login.LoginProvider login from your account">Remove</button>
<input asp-for="@login.LoginProvider"
name="LoginProvider"
type="hidden" />
<input asp-for="@login.ProviderKey"
name="ProviderKey"
type="hidden" />
<button type="submit"
class="btn btn-primary"
title="Remove this @login.ProviderDisplayName login from your account">
Remove
</button>
</div>
</form>
}
else
{
}
else
{
@: &nbsp;
}
</td>
</tr>
}
}
</td>
</tr>
}
</tbody>
</table>
}
@if (Model.OtherLogins?.Count > 0)
@if(Model.OtherLogins?.Count > 0)
{
<h4>Add another service to log in.</h4>
<hr />
<form id="link-login-form" asp-page-handler="LinkLogin" method="post" class="form-horizontal">
<form asp-page-handler="LinkLogin"
class="form-horizontal"
id="link-login-form"
method="post">
<div id="socialLoginList">
<p>
@foreach (var provider in Model.OtherLogins)
@foreach(AuthenticationScheme provider in Model.OtherLogins)
{
<button id="link-login-button" type="submit" class="btn btn-default" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
<button id="link-login-button"
type="submit"
class="btn btn-primary"
name="provider"
value="@provider.Name"
title="Log in using your @provider.DisplayName account">
@provider.DisplayName</button>
}
</p>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Manage/ExternalLogins.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

14
cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml
View File

@@ -36,9 +36,11 @@
ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
}
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<h4>@ViewData["Title"]</h4>
<div class="alert alert-warning" role="alert">
<div class="alert alert-warning"
role="alert">
<p>
<span class="glyphicon glyphicon-warning-sign"></span>
<strong>Put these codes in a safe place.</strong>
@@ -52,7 +54,11 @@
</p>
</div>
<div>
<form method="post" class="form-group">
<button class="btn btn-danger" type="submit">Generate Recovery Codes</button>
<form class="form-group"
method="post">
<button class="btn btn-danger"
type="submit">
Generate Recovery Codes
</button>
</form>
</div>

13
cicm_web/Areas/Identity/Pages/Account/Manage/GenerateRecoveryCodes.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -63,14 +63,11 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
if(user == null) return NotFound($"Unable to load user with ID '{_userManager.GetUserId(User)}'.");
bool isTwoFactorEnabled = await _userManager.GetTwoFactorEnabledAsync(user);
if(!isTwoFactorEnabled)
{
string userId = await _userManager.GetUserIdAsync(user);
throw new
InvalidOperationException($"Cannot generate recovery codes for user with ID '{userId}' because they do not have 2FA enabled.");
}
if(isTwoFactorEnabled) return Page();
return Page();
string userId = await _userManager.GetUserIdAsync(user);
throw new
InvalidOperationException($"Cannot generate recovery codes for user with ID '{userId}' because they do not have 2FA enabled.");
}
public async Task<IActionResult> OnPostAsync()

52
cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml
View File

@@ -33,40 +33,66 @@
@model IndexModel
@{
ViewData["Title"] = "Profile";
ViewData["ActivePage"] = ManageNavPages.Index;
}
<h4>@ViewData["Title"]</h4>
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<div class="row">
<div class="col-md-6">
<form id="profile-form" method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<form id="profile-form"
method="post">
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Username"></label>
<input asp-for="Username" class="form-control" disabled />
<input asp-for="Username"
class="form-control"
disabled />
</div>
<div class="form-group">
<label asp-for="Input.Email"></label>
@if (Model.IsEmailConfirmed)
@if(Model.IsEmailConfirmed)
{
<div class="input-group">
<input asp-for="Input.Email" class="form-control" />
<span class="input-group-addon" aria-hidden="true"><span class="glyphicon glyphicon-ok text-success"></span></span>
<input asp-for="Input.Email"
class="form-control" />
<span aria-hidden="true"
class="input-group-addon">
<span class="glyphicon glyphicon-ok text-success"></span>
</span>
</div>
}
else
{
<input asp-for="Input.Email" class="form-control" />
<button id="email-verification" type="submit" asp-page-handler="SendVerificationEmail" class="btn btn-link">Send verification email</button>
<input asp-for="Input.Email"
class="form-control" />
<button asp-page-handler="SendVerificationEmail"
class="btn btn-link"
id="email-verification"
type="submit">
Send verification email
</button>
}
<span asp-validation-for="Input.Email" class="text-danger"></span>
<span asp-validation-for="Input.Email"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.PhoneNumber"></label>
<input asp-for="Input.PhoneNumber" class="form-control" />
<span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
<input asp-for="Input.PhoneNumber"
class="form-control" />
<span asp-validation-for="Input.PhoneNumber"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Save</button>
<button class="btn btn-primary"
id="update-profile-button"
type="submit">
Save
</button>
</form>
</div>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Manage/Index.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

14
cicm_web/Areas/Identity/Pages/Account/Manage/ManageNavPages.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -40,10 +40,6 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
public static string ChangePassword => "ChangePassword";
public static string DownloadPersonalData => "DownloadPersonalData";
public static string DeletePersonalData => "DeletePersonalData";
public static string ExternalLogins => "ExternalLogins";
public static string PersonalData => "PersonalData";
@@ -55,12 +51,6 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
public static string ChangePasswordNavClass(ViewContext viewContext) =>
PageNavClass(viewContext, ChangePassword);
public static string DownloadPersonalDataNavClass(ViewContext viewContext) =>
PageNavClass(viewContext, DownloadPersonalData);
public static string DeletePersonalDataNavClass(ViewContext viewContext) =>
PageNavClass(viewContext, DeletePersonalData);
public static string ExternalLoginsNavClass(ViewContext viewContext) =>
PageNavClass(viewContext, ExternalLogins);
@@ -69,7 +59,7 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
public static string TwoFactorAuthenticationNavClass(ViewContext viewContext) =>
PageNavClass(viewContext, TwoFactorAuthentication);
public static string PageNavClass(ViewContext viewContext, string page)
static string PageNavClass(ViewContext viewContext, string page)
{
string activePage = viewContext.ViewData["ActivePage"] as string ??
Path.GetFileNameWithoutExtension(viewContext.ActionDescriptor.DisplayName);

16
cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml
View File

@@ -44,11 +44,21 @@
<p>
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
</p>
<form asp-page="DownloadPersonalData" method="post" class="form-group">
<button class="btn btn-default" type="submit">Download</button>
<form asp-page="DownloadPersonalData"
class="form-group"
id="download-data"
method="post">
<button class="btn btn-primary"
type="submit">
Download
</button>
</form>
<p>
<a asp-page="DeletePersonalData" class="btn btn-default">Delete</a>
<a asp-page="DeletePersonalData"
class="btn btn-primary"
id="delete">
Delete
</a>
</p>
</div>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Manage/PersonalData.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

16
cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml
View File

@@ -36,9 +36,11 @@
ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
}
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<h4>@ViewData["Title"]</h4>
<div class="alert alert-warning" role="alert">
<div class="alert alert-warning"
role="alert">
<p>
<span class="glyphicon glyphicon-warning-sign"></span>
<strong>If you reset your authenticator key your authenticator app will not work until you reconfigure it.</strong>
@@ -49,7 +51,13 @@
</p>
</div>
<div>
<form id="reset-authenticator-form" method="post" class="form-group">
<button id="reset-authenticator-button" class="btn btn-danger" type="submit">Reset authenticator key</button>
<form class="form-group"
id="reset-authenticator-form"
method="post">
<button class="btn btn-danger"
id="reset-authenticator-button"
type="submit">
Reset authenticator key
</button>
</form>
</div>

8
cicm_web/Areas/Identity/Pages/Account/Manage/ResetAuthenticator.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -38,9 +38,9 @@ namespace cicm_web.Areas.Identity.Pages.Account.Manage
{
public class ResetAuthenticatorModel : PageModel
{
readonly SignInManager<IdentityUser> _signInManager;
ILogger<ResetAuthenticatorModel> _logger;
UserManager<IdentityUser> _userManager;
readonly SignInManager<IdentityUser> _signInManager;
readonly ILogger<ResetAuthenticatorModel> _logger;
readonly UserManager<IdentityUser> _userManager;
public ResetAuthenticatorModel(UserManager<IdentityUser> userManager,
SignInManager<IdentityUser> signInManager,

29
cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml
View File

@@ -37,26 +37,39 @@
}
<h4>Set your password</h4>
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<p class="text-info">
You do not have a local username/password for this site. Add a local
account so you can log in without an external login.
</p>
<div class="row">
<div class="col-md-6">
<form id="set-password-form" method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<form id="set-password-form"
method="post">
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.NewPassword"></label>
<input asp-for="Input.NewPassword" class="form-control" />
<span asp-validation-for="Input.NewPassword" class="text-danger"></span>
<input asp-for="Input.NewPassword"
class="form-control" />
<span asp-validation-for="Input.NewPassword"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<input asp-for="Input.ConfirmPassword" class="form-control" />
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
<input asp-for="Input.ConfirmPassword"
class="form-control" />
<span asp-validation-for="Input.ConfirmPassword"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Set password</button>
<button class="btn btn-primary"
type="submit">
Set password
</button>
</form>
</div>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Manage/SetPassword.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

52
cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml
View File

@@ -33,27 +33,29 @@
@model TwoFactorAuthenticationModel
@{
ViewData["Title"] = "Two-factor authentication (2FA)";
ViewData["ActivePage"] = ManageNavPages.TwoFactorAuthentication;
}
@Html.Partial("_StatusMessage", Model.StatusMessage)
<partial for="StatusMessage"
name="_StatusMessage" />
<h4>@ViewData["Title"]</h4>
@if (Model.Is2faEnabled)
@if(Model.Is2faEnabled)
{
if (Model.RecoveryCodesLeft == 0)
if(Model.RecoveryCodesLeft == 0)
{
<div class="alert alert-danger">
<strong>You have no recovery codes left.</strong>
<p>You must <a asp-page="./GenerateRecoveryCodes">generate a new set of recovery codes</a> before you can log in with a recovery code.</p>
</div>
}
else if (Model.RecoveryCodesLeft == 1)
else if(Model.RecoveryCodesLeft == 1)
{
<div class="alert alert-danger">
<strong>You have 1 recovery code left.</strong>
<p>You can <a asp-page="./GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
</div>
}
else if (Model.RecoveryCodesLeft <= 3)
else if(Model.RecoveryCodesLeft <= 3)
{
<div class="alert alert-warning">
<strong>You have @Model.RecoveryCodesLeft recovery codes left.</strong>
@@ -61,25 +63,47 @@
</div>
}
if (Model.IsMachineRemembered)
if(Model.IsMachineRemembered)
{
<form method="post" style="display: inline-block">
<button type="submit" class="btn btn-default">Forget this browser</button>
<form method="post"
style="display: inline-block">
<button class="btn btn-primary"
type="submit">
Forget this browser
</button>
</form>
}
<a asp-page="./Disable2fa" class="btn btn-default">Disable 2FA</a>
<a asp-page="./GenerateRecoveryCodes" class="btn btn-default">Reset recovery codes</a>
<a asp-page="./Disable2fa"
class="btn btn-primary">
Disable 2FA
</a>
<a asp-page="./GenerateRecoveryCodes"
class="btn btn-primary">
Reset recovery codes
</a>
}
<h5>Authenticator app</h5>
@if (!Model.HasAuthenticator)
@if(!Model.HasAuthenticator)
{
<a id="enable-authenticator" asp-page="./EnableAuthenticator" class="btn btn-default">Add authenticator app</a>
<a asp-page="./EnableAuthenticator"
class="btn btn-primary"
id="enable-authenticator">
Add authenticator app
</a>
}
else
{
<a id="enable-authenticator" asp-page="./EnableAuthenticator" class="btn btn-default">Setup authenticator app</a>
<a id="reset-authenticator" asp-page="./ResetAuthenticator" class="btn btn-default">Reset authenticator app</a>
<a asp-page="./EnableAuthenticator"
class="btn btn-primary"
id="enable-authenticator">
Setup authenticator app
</a>
<a asp-page="./ResetAuthenticator"
class="btn btn-primary"
id="reset-authenticator">
Reset authenticator app
</a>
}
@section Scripts {

2
cicm_web/Areas/Identity/Pages/Account/Manage/TwoFactorAuthentication.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

6
cicm_web/Areas/Identity/Pages/Account/Manage/_Layout.cshtml
View File

@@ -30,10 +30,10 @@
*******************************************************************************/
}
@{
Layout = "/Areas/Identity/Pages/_Layout.cshtml";
Layout = "/Views/Shared/_Layout.cshtml";
}
<h2>Manage your account</h2>
<h1>Manage your account</h1>
<div>
<h4>Change your account settings</h4>
@@ -49,5 +49,5 @@
</div>
@section Scripts {
@RenderSection("Scripts", required: false)
@RenderSection("Scripts", false)
}

49
cicm_web/Areas/Identity/Pages/Account/Manage/_ManageNav.cshtml
View File

@@ -1,4 +1,4 @@
@{
@{
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
@@ -31,15 +31,46 @@
}
@inject SignInManager<IdentityUser> SignInManager
@{
var hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
bool hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
}
<ul class="nav nav-pills nav-stacked">
<li class="@ManageNavPages.IndexNavClass(ViewContext)"><a asp-page="./Index">Profile</a></li>
<li class="@ManageNavPages.ChangePasswordNavClass(ViewContext)"><a id="change-password" asp-page="./ChangePassword">Password</a></li>
@if (hasExternalLogins)
<ul class="flex-column nav nav-pills">
<li class="nav-item">
<a class="nav-link @ManageNavPages.IndexNavClass(ViewContext)"
id="profile"
asp-page="./Index">
Profile
</a>
</li>
<li class="nav-item">
<a class="nav-link @ManageNavPages.ChangePasswordNavClass(ViewContext)"
id="change-password"
asp-page="./ChangePassword">
Password
</a>
</li>
@if(hasExternalLogins)
{
<li class="@ManageNavPages.ExternalLoginsNavClass(ViewContext)"><a id="external-login" asp-page="./ExternalLogins">External logins</a></li>
<li class="nav-item"
id="external-logins">
<a id="external-login"
class="nav-link @ManageNavPages.ExternalLoginsNavClass(ViewContext)"
asp-page="./ExternalLogins">
External logins
</a>
</li>
}
<li class="@ManageNavPages.TwoFactorAuthenticationNavClass(ViewContext)"><a asp-page="./TwoFactorAuthentication">Two-factor authentication</a></li>
<li class="@ManageNavPages.PersonalDataNavClass(ViewContext)"><a asp-page="./PersonalData">Personal data</a></li>
<li class="nav-item">
<a class="nav-link @ManageNavPages.TwoFactorAuthenticationNavClass(ViewContext)"
id="two-factor"
asp-page="./TwoFactorAuthentication">
Two-factor authentication
</a>
</li>
<li class="nav-item">
<a class="nav-link @ManageNavPages.PersonalDataNavClass(ViewContext)"
id="personal-data"
asp-page="./PersonalData">
Personal data
</a>
</li>
</ul>

14
cicm_web/Areas/Identity/Pages/Account/Manage/_StatusMessage.cshtml
View File

@@ -31,11 +31,17 @@
}
@model string
@if (!String.IsNullOrEmpty(Model))
@if(!string.IsNullOrEmpty(Model))
{
var statusMessageClass = Model.StartsWith("Error") ? "danger" : "success";
<div class="alert alert-@statusMessageClass alert-dismissible" role="alert">
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
string statusMessageClass = Model.StartsWith("Error") ? "danger" : "success";
<div class="alert alert-@statusMessageClass alert-dismissible"
role="alert">
<button aria-label="Close"
class="close"
data-dismiss="alert"
type="button">
<span aria-hidden="true">&times;</span>
</button>
@Model
</div>
}

2
cicm_web/Areas/Identity/Pages/Account/Manage/_ViewImports.cshtml
View File

@@ -1,4 +1,4 @@
@{
@{
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------

35
cicm_web/Areas/Identity/Pages/Account/Register.cshtml
View File

@@ -35,30 +35,45 @@
ViewData["Title"] = "Register";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<div class="row">
<div class="col-md-4">
<form asp-route-returnUrl="@Model.ReturnUrl" method="post">
<form asp-route-returnUrl="@Model.ReturnUrl"
method="post">
<h4>Create a new account.</h4>
<hr />
<div asp-validation-summary="All" class="text-danger"></div>
<div asp-validation-summary="All"
class="text-danger">
</div>
<div class="form-group">
<label asp-for="Input.Email"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
<input asp-for="Input.Email"
class="form-control" />
<span asp-validation-for="Input.Email"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
<input asp-for="Input.Password"
class="form-control" />
<span asp-validation-for="Input.Password"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<input asp-for="Input.ConfirmPassword" class="form-control" />
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
<input asp-for="Input.ConfirmPassword"
class="form-control" />
<span asp-validation-for="Input.ConfirmPassword"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Register</button>
<button class="btn btn-primary"
type="submit">
Register
</button>
</form>
</div>
</div>

2
cicm_web/Areas/Identity/Pages/Account/Register.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

35
cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml
View File

@@ -35,30 +35,45 @@
ViewData["Title"] = "Reset password";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<h4>Reset your password.</h4>
<hr />
<div class="row">
<div class="col-md-4">
<form method="post">
<div asp-validation-summary="All" class="text-danger"></div>
<input asp-for="Input.Code" type="hidden" />
<div asp-validation-summary="All"
class="text-danger">
</div>
<input asp-for="Input.Code"
type="hidden" />
<div class="form-group">
<label asp-for="Input.Email"></label>
<input asp-for="Input.Email" class="form-control" />
<span asp-validation-for="Input.Email" class="text-danger"></span>
<input asp-for="Input.Email"
class="form-control" />
<span asp-validation-for="Input.Email"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.Password"></label>
<input asp-for="Input.Password" class="form-control" />
<span asp-validation-for="Input.Password" class="text-danger"></span>
<input asp-for="Input.Password"
class="form-control" />
<span asp-validation-for="Input.Password"
class="text-danger">
</span>
</div>
<div class="form-group">
<label asp-for="Input.ConfirmPassword"></label>
<input asp-for="Input.ConfirmPassword" class="form-control" />
<span asp-validation-for="Input.ConfirmPassword" class="text-danger"></span>
<input asp-for="Input.ConfirmPassword"
class="form-control" />
<span asp-validation-for="Input.ConfirmPassword"
class="text-danger">
</span>
</div>
<button type="submit" class="btn btn-default">Reset</button>
<button class="btn btn-primary"
type="submit">
Reset
</button>
</form>
</div>
</div>

8
cicm_web/Areas/Identity/Pages/Account/ResetPassword.cshtml.cs
View File

@@ -1,8 +1,8 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
// Filename : ResetPassword.cshtml.cs
// Filename : ResetPasswordConfirmation.cshtml.cs
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ Description ] ----------------------------------------------------------
@@ -63,7 +63,9 @@ namespace cicm_web.Areas.Identity.Pages.Account
if(!ModelState.IsValid) return Page();
IdentityUser user = await _userManager.FindByEmailAsync(Input.Email);
if(user == null) return RedirectToPage("./ResetPasswordConfirmation");
if(user == null)
// Don't reveal that the user does not exist
return RedirectToPage("./ResetPasswordConfirmation");
IdentityResult result = await _userManager.ResetPasswordAsync(user, Input.Code, Input.Password);
if(result.Succeeded) return RedirectToPage("./ResetPasswordConfirmation");

2
cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml
View File

@@ -35,7 +35,7 @@
ViewData["Title"] = "Reset password confirmation";
}
<h2>@ViewData["Title"]</h2>
<h1>@ViewData["Title"]</h1>
<p>
Your password has been reset. Please <a asp-page="./Login">click here to log in</a>.
</p>

2
cicm_web/Areas/Identity/Pages/Account/ResetPasswordConfirmation.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//

31
cicm_web/Areas/Identity/Pages/Account/_ViewImports.cshtml
View File

@@ -1,32 +1 @@
@{
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
// Filename : _ViewImports.cshtml
// Author(s) : Natalia Portillo <claunia@claunia.com>
//
// --[ Description ] ----------------------------------------------------------
//
// ASP.NET Identify management
//
// --[ License ] --------------------------------------------------------------
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as
// published by the Free Software Foundation, either version 3 of the
// License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
//
// ----------------------------------------------------------------------------
// Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/
}
@using cicm_web.Areas.Identity.Pages.Account

2
cicm_web/Areas/Identity/Pages/Error.cshtml
View File

@@ -38,7 +38,7 @@
<h1 class="text-danger">Error.</h1>
<h2 class="text-danger">An error occurred while processing your request.</h2>
@if (Model.ShowRequestId)
@if(Model.ShowRequestId)
{
<p>
<strong>Request ID:</strong> <code>@Model.RequestId</code>

4
cicm_web/Areas/Identity/Pages/Error.cshtml.cs
View File

@@ -1,4 +1,4 @@
/******************************************************************************
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
//
@@ -36,13 +36,13 @@ using Microsoft.AspNetCore.Mvc.RazorPages;
namespace cicm_web.Areas.Identity.Pages
{
[AllowAnonymous]
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public class ErrorModel : PageModel
{
public string RequestId { get; set; }
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
public void OnGet()
{
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;

18
cicm_web/Areas/Identity/Pages/_ValidationScriptsPartial.cshtml
View File

@@ -1,4 +1,4 @@
@{
@{
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
@@ -30,20 +30,20 @@
*******************************************************************************/
}
<environment include="Development">
<script src="~/Identity/lib/jquery-validation/dist/jquery.validate.js"></script>
<script src="~/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
<script src="~/lib/jquery-validation/dist/jquery.validate.js"></script>
<script src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.js"></script>
</environment>
<environment exclude="Development">
<script src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.17.0/jquery.validate.min.js"
asp-fallback-src="~/Identity/lib/jquery-validation/dist/jquery.validate.min.js"
<script asp-fallback-src="~/Identity/lib/jquery-validation/dist/jquery.validate.min.js"
asp-fallback-test="window.jQuery && window.jQuery.validator"
crossorigin="anonymous"
integrity="sha384-rZfj/ogBloos6wzLGpPkkOr/gpkBNLZ6b6yLy4o+ok+t/SAKlL5mvXLr0OXNi1Hp">
integrity="sha384-rZfj/ogBloos6wzLGpPkkOr/gpkBNLZ6b6yLy4o+ok+t/SAKlL5mvXLr0OXNi1Hp"
src="https://ajax.aspnetcdn.com/ajax/jquery.validate/1.17.0/jquery.validate.min.js">
</script>
<script src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js"
asp-fallback-src="~/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
<script asp-fallback-src="~/Identity/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"
asp-fallback-test="window.jQuery && window.jQuery.validator && window.jQuery.validator.unobtrusive"
crossorigin="anonymous"
integrity="sha384-ifv0TYDWxBHzvAk2Z0n8R434FL1Rlv/Av18DXE43N/1rvHyOG4izKst0f2iSLdds">
integrity="sha384-ifv0TYDWxBHzvAk2Z0n8R434FL1Rlv/Av18DXE43N/1rvHyOG4izKst0f2iSLdds"
src="https://ajax.aspnetcdn.com/ajax/jquery.validation.unobtrusive/3.2.9/jquery.validate.unobtrusive.min.js">
</script>
</environment>

2
cicm_web/Areas/Identity/Pages/_ViewImports.cshtml
View File

@@ -1,4 +1,4 @@
@{
@{
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------

3
cicm_web/Areas/Identity/Pages/_ViewStart.cshtml
View File

@@ -1,4 +1,4 @@
@{
@{
/******************************************************************************
// Canary Islands Computer Museum Website
// ----------------------------------------------------------------------------
@@ -29,7 +29,6 @@
// Copyright © 2003-2018 Natalia Portillo
*******************************************************************************/
}
@{
Layout = "/Views/Shared/_Layout.cshtml";
}

2
cicm_web/Startup.cs
View File

@@ -62,8 +62,6 @@ namespace cicm_web
services.AddDbContext<cicmContext>(options => options
.UseLazyLoadingProxies()
.UseMySql("server=localhost;port=3306;user=cicm;password=cicmpass;database=cicm"));
services.AddDefaultIdentity<IdentityUser>()
.AddEntityFrameworkStores<cicmContext>();
services.AddMvc();
}

2
cicm_web/appsettings.json
View File

@@ -1,4 +1,4 @@
{
{
"Logging": {
"IncludeScopes": false,
"LogLevel": {

2
cicm_web/cicm_web.csproj
View File

@@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<Version>3.0.99.358</Version>
<Version>3.0.99.371</Version>
<Company>Canary Islands Computer Museum</Company>
<Copyright>Copyright © 2003-2018 Natalia Portillo</Copyright>
<Product>Canary Islands Computer Museum Website</Product>