Refactor authentication system to use MongoDB
Some checks failed
Publish Container / publish (push) Has been cancelled
Some checks failed
Publish Container / publish (push) Has been cancelled
- Removed Entity Framework Core identity schema and related migrations. - Introduced MongoDB-based authentication service with user seeding functionality. - Updated Program.cs to configure authentication and authorization using cookies. - Created new Login.razor component for user login interface. - Added RedirectToLogin component for handling unauthorized access. - Updated Dockerfile and docker-compose files for development and production environments. - Removed SQLite connection strings and related configurations. - Added MongoDB connection settings in appsettings.json and Docker configurations. - Implemented IMongoAuthService interface and MongoAuthService class for user management. - Created MongoAuthUser model for MongoDB user representation.
This commit is contained in:
parent
7a919491d2
commit
7029e374cc
64 changed files with 338 additions and 3556 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -31,3 +31,5 @@ secrets.json
|
||||||
# OS files
|
# OS files
|
||||||
.DS_Store
|
.DS_Store
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
|
.vs/ProjectEvaluation/**
|
||||||
|
.vs/WorkTracker/**
|
||||||
|
|
@ -1,112 +0,0 @@
|
||||||
using System.Security.Claims;
|
|
||||||
using System.Text.Json;
|
|
||||||
using Microsoft.AspNetCore.Authentication;
|
|
||||||
using Microsoft.AspNetCore.Components.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Http.Extensions;
|
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
|
||||||
using Microsoft.Extensions.Primitives;
|
|
||||||
using WorkTracker.Components.Account.Pages;
|
|
||||||
using WorkTracker.Components.Account.Pages.Manage;
|
|
||||||
using WorkTracker.Data;
|
|
||||||
|
|
||||||
namespace Microsoft.AspNetCore.Routing;
|
|
||||||
|
|
||||||
internal static class IdentityComponentsEndpointRouteBuilderExtensions
|
|
||||||
{
|
|
||||||
// These endpoints are required by the Identity Razor components defined in the /Components/Account/Pages directory of this project.
|
|
||||||
public static IEndpointConventionBuilder MapAdditionalIdentityEndpoints(this IEndpointRouteBuilder endpoints)
|
|
||||||
{
|
|
||||||
ArgumentNullException.ThrowIfNull(endpoints);
|
|
||||||
|
|
||||||
var accountGroup = endpoints.MapGroup("/Account");
|
|
||||||
|
|
||||||
accountGroup.MapPost("/PerformExternalLogin", (
|
|
||||||
HttpContext context,
|
|
||||||
[FromServices] SignInManager<ApplicationUser> signInManager,
|
|
||||||
[FromForm] string provider,
|
|
||||||
[FromForm] string returnUrl) =>
|
|
||||||
{
|
|
||||||
IEnumerable<KeyValuePair<string, StringValues>> query = [
|
|
||||||
new("ReturnUrl", returnUrl),
|
|
||||||
new("Action", ExternalLogin.LoginCallbackAction)];
|
|
||||||
|
|
||||||
var redirectUrl = UriHelper.BuildRelative(
|
|
||||||
context.Request.PathBase,
|
|
||||||
"/Account/ExternalLogin",
|
|
||||||
QueryString.Create(query));
|
|
||||||
|
|
||||||
var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
|
|
||||||
return TypedResults.Challenge(properties, [provider]);
|
|
||||||
});
|
|
||||||
|
|
||||||
accountGroup.MapPost("/Logout", async (
|
|
||||||
ClaimsPrincipal user,
|
|
||||||
[FromServices] SignInManager<ApplicationUser> signInManager,
|
|
||||||
[FromForm] string returnUrl) =>
|
|
||||||
{
|
|
||||||
await signInManager.SignOutAsync();
|
|
||||||
return TypedResults.LocalRedirect($"~/{returnUrl}");
|
|
||||||
});
|
|
||||||
|
|
||||||
var manageGroup = accountGroup.MapGroup("/Manage").RequireAuthorization();
|
|
||||||
|
|
||||||
manageGroup.MapPost("/LinkExternalLogin", async (
|
|
||||||
HttpContext context,
|
|
||||||
[FromServices] SignInManager<ApplicationUser> signInManager,
|
|
||||||
[FromForm] string provider) =>
|
|
||||||
{
|
|
||||||
// Clear the existing external cookie to ensure a clean login process
|
|
||||||
await context.SignOutAsync(IdentityConstants.ExternalScheme);
|
|
||||||
|
|
||||||
var redirectUrl = UriHelper.BuildRelative(
|
|
||||||
context.Request.PathBase,
|
|
||||||
"/Account/Manage/ExternalLogins",
|
|
||||||
QueryString.Create("Action", ExternalLogins.LinkLoginCallbackAction));
|
|
||||||
|
|
||||||
var properties = signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl, signInManager.UserManager.GetUserId(context.User));
|
|
||||||
return TypedResults.Challenge(properties, [provider]);
|
|
||||||
});
|
|
||||||
|
|
||||||
var loggerFactory = endpoints.ServiceProvider.GetRequiredService<ILoggerFactory>();
|
|
||||||
var downloadLogger = loggerFactory.CreateLogger("DownloadPersonalData");
|
|
||||||
|
|
||||||
manageGroup.MapPost("/DownloadPersonalData", async (
|
|
||||||
HttpContext context,
|
|
||||||
[FromServices] UserManager<ApplicationUser> userManager,
|
|
||||||
[FromServices] AuthenticationStateProvider authenticationStateProvider) =>
|
|
||||||
{
|
|
||||||
var user = await userManager.GetUserAsync(context.User);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
return Results.NotFound($"Unable to load user with ID '{userManager.GetUserId(context.User)}'.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var userId = await userManager.GetUserIdAsync(user);
|
|
||||||
downloadLogger.LogInformation("User with ID '{UserId}' asked for their personal data.", userId);
|
|
||||||
|
|
||||||
// Only include personal data for download
|
|
||||||
var personalData = new Dictionary<string, string>();
|
|
||||||
var personalDataProps = typeof(ApplicationUser).GetProperties().Where(
|
|
||||||
prop => Attribute.IsDefined(prop, typeof(PersonalDataAttribute)));
|
|
||||||
foreach (var p in personalDataProps)
|
|
||||||
{
|
|
||||||
personalData.Add(p.Name, p.GetValue(user)?.ToString() ?? "null");
|
|
||||||
}
|
|
||||||
|
|
||||||
var logins = await userManager.GetLoginsAsync(user);
|
|
||||||
foreach (var l in logins)
|
|
||||||
{
|
|
||||||
personalData.Add($"{l.LoginProvider} external login provider key", l.ProviderKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
personalData.Add("Authenticator Key", (await userManager.GetAuthenticatorKeyAsync(user))!);
|
|
||||||
var fileBytes = JsonSerializer.SerializeToUtf8Bytes(personalData);
|
|
||||||
|
|
||||||
context.Response.Headers.TryAdd("Content-Disposition", "attachment; filename=PersonalData.json");
|
|
||||||
return TypedResults.File(fileBytes, contentType: "application/json", fileDownloadName: "PersonalData.json");
|
|
||||||
});
|
|
||||||
|
|
||||||
return accountGroup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.AspNetCore.Identity.UI.Services;
|
|
||||||
using WorkTracker.Data;
|
|
||||||
|
|
||||||
namespace WorkTracker.Components.Account;
|
|
||||||
|
|
||||||
// Remove the "else if (EmailSender is IdentityNoOpEmailSender)" block from RegisterConfirmation.razor after updating with a real implementation.
|
|
||||||
internal sealed class IdentityNoOpEmailSender : IEmailSender<ApplicationUser>
|
|
||||||
{
|
|
||||||
private readonly IEmailSender emailSender = new NoOpEmailSender();
|
|
||||||
|
|
||||||
public Task SendConfirmationLinkAsync(ApplicationUser user, string email, string confirmationLink) =>
|
|
||||||
emailSender.SendEmailAsync(email, "Confirm your email", $"Please confirm your account by <a href='{confirmationLink}'>clicking here</a>.");
|
|
||||||
|
|
||||||
public Task SendPasswordResetLinkAsync(ApplicationUser user, string email, string resetLink) =>
|
|
||||||
emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password by <a href='{resetLink}'>clicking here</a>.");
|
|
||||||
|
|
||||||
public Task SendPasswordResetCodeAsync(ApplicationUser user, string email, string resetCode) =>
|
|
||||||
emailSender.SendEmailAsync(email, "Reset your password", $"Please reset your password using the following code: {resetCode}");
|
|
||||||
}
|
|
||||||
|
|
@ -1,58 +0,0 @@
|
||||||
using System.Diagnostics.CodeAnalysis;
|
|
||||||
using Microsoft.AspNetCore.Components;
|
|
||||||
|
|
||||||
namespace WorkTracker.Components.Account;
|
|
||||||
|
|
||||||
internal sealed class IdentityRedirectManager(NavigationManager navigationManager)
|
|
||||||
{
|
|
||||||
public const string StatusCookieName = "Identity.StatusMessage";
|
|
||||||
|
|
||||||
private static readonly CookieBuilder StatusCookieBuilder = new()
|
|
||||||
{
|
|
||||||
SameSite = SameSiteMode.Strict,
|
|
||||||
HttpOnly = true,
|
|
||||||
IsEssential = true,
|
|
||||||
MaxAge = TimeSpan.FromSeconds(5),
|
|
||||||
};
|
|
||||||
|
|
||||||
[DoesNotReturn]
|
|
||||||
public void RedirectTo(string? uri)
|
|
||||||
{
|
|
||||||
uri ??= "";
|
|
||||||
|
|
||||||
// Prevent open redirects.
|
|
||||||
if (!Uri.IsWellFormedUriString(uri, UriKind.Relative))
|
|
||||||
{
|
|
||||||
uri = navigationManager.ToBaseRelativePath(uri);
|
|
||||||
}
|
|
||||||
|
|
||||||
// During static rendering, NavigateTo throws a NavigationException which is handled by the framework as a redirect.
|
|
||||||
// So as long as this is called from a statically rendered Identity component, the InvalidOperationException is never thrown.
|
|
||||||
navigationManager.NavigateTo(uri);
|
|
||||||
throw new InvalidOperationException($"{nameof(IdentityRedirectManager)} can only be used during static rendering.");
|
|
||||||
}
|
|
||||||
|
|
||||||
[DoesNotReturn]
|
|
||||||
public void RedirectTo(string uri, Dictionary<string, object?> queryParameters)
|
|
||||||
{
|
|
||||||
var uriWithoutQuery = navigationManager.ToAbsoluteUri(uri).GetLeftPart(UriPartial.Path);
|
|
||||||
var newUri = navigationManager.GetUriWithQueryParameters(uriWithoutQuery, queryParameters);
|
|
||||||
RedirectTo(newUri);
|
|
||||||
}
|
|
||||||
|
|
||||||
[DoesNotReturn]
|
|
||||||
public void RedirectToWithStatus(string uri, string message, HttpContext context)
|
|
||||||
{
|
|
||||||
context.Response.Cookies.Append(StatusCookieName, message, StatusCookieBuilder.Build(context));
|
|
||||||
RedirectTo(uri);
|
|
||||||
}
|
|
||||||
|
|
||||||
private string CurrentPath => navigationManager.ToAbsoluteUri(navigationManager.Uri).GetLeftPart(UriPartial.Path);
|
|
||||||
|
|
||||||
[DoesNotReturn]
|
|
||||||
public void RedirectToCurrentPage() => RedirectTo(CurrentPath);
|
|
||||||
|
|
||||||
[DoesNotReturn]
|
|
||||||
public void RedirectToCurrentPageWithStatus(string message, HttpContext context)
|
|
||||||
=> RedirectToWithStatus(CurrentPath, message, context);
|
|
||||||
}
|
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
using System.Security.Claims;
|
|
||||||
using Microsoft.AspNetCore.Components.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Components.Server;
|
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using WorkTracker.Data;
|
|
||||||
|
|
||||||
namespace WorkTracker.Components.Account;
|
|
||||||
|
|
||||||
// This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user
|
|
||||||
// every 30 minutes an interactive circuit is connected.
|
|
||||||
internal sealed class IdentityRevalidatingAuthenticationStateProvider(
|
|
||||||
ILoggerFactory loggerFactory,
|
|
||||||
IServiceScopeFactory scopeFactory,
|
|
||||||
IOptions<IdentityOptions> options)
|
|
||||||
: RevalidatingServerAuthenticationStateProvider(loggerFactory)
|
|
||||||
{
|
|
||||||
protected override TimeSpan RevalidationInterval => TimeSpan.FromMinutes(30);
|
|
||||||
|
|
||||||
protected override async Task<bool> ValidateAuthenticationStateAsync(
|
|
||||||
AuthenticationState authenticationState, CancellationToken cancellationToken)
|
|
||||||
{
|
|
||||||
// Get the user manager from a new scope to ensure it fetches fresh data
|
|
||||||
await using var scope = scopeFactory.CreateAsyncScope();
|
|
||||||
var userManager = scope.ServiceProvider.GetRequiredService<UserManager<ApplicationUser>>();
|
|
||||||
return await ValidateSecurityStampAsync(userManager, authenticationState.User);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task<bool> ValidateSecurityStampAsync(UserManager<ApplicationUser> userManager, ClaimsPrincipal principal)
|
|
||||||
{
|
|
||||||
var user = await userManager.GetUserAsync(principal);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
else if (!userManager.SupportsUserSecurityStamp)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var principalStamp = principal.FindFirstValue(options.Value.ClaimsIdentity.SecurityStampClaimType);
|
|
||||||
var userStamp = await userManager.GetSecurityStampAsync(user);
|
|
||||||
return principalStamp == userStamp;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using WorkTracker.Data;
|
|
||||||
|
|
||||||
namespace WorkTracker.Components.Account;
|
|
||||||
|
|
||||||
internal sealed class IdentityUserAccessor(UserManager<ApplicationUser> userManager, IdentityRedirectManager redirectManager)
|
|
||||||
{
|
|
||||||
public async Task<ApplicationUser> GetRequiredUserAsync(HttpContext context)
|
|
||||||
{
|
|
||||||
var user = await userManager.GetUserAsync(context.User);
|
|
||||||
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
redirectManager.RedirectToWithStatus("Account/InvalidUser", $"Error: Unable to load user with ID '{userManager.GetUserId(context.User)}'.", context);
|
|
||||||
}
|
|
||||||
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
@page "/Account/AccessDenied"
|
|
||||||
|
|
||||||
<PageTitle>Access denied</PageTitle>
|
|
||||||
|
|
||||||
<header>
|
|
||||||
<h1 class="text-danger">Access denied</h1>
|
|
||||||
<p class="text-danger">You do not have access to this resource.</p>
|
|
||||||
</header>
|
|
||||||
|
|
@ -1,48 +0,0 @@
|
||||||
@page "/Account/ConfirmEmail"
|
|
||||||
|
|
||||||
@using System.Text
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Confirm email</PageTitle>
|
|
||||||
|
|
||||||
<h1>Confirm email</h1>
|
|
||||||
<StatusMessage Message="@statusMessage" />
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? statusMessage;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? UserId { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Code { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
if (UserId is null || Code is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("");
|
|
||||||
}
|
|
||||||
|
|
||||||
var user = await UserManager.FindByIdAsync(UserId);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
HttpContext.Response.StatusCode = StatusCodes.Status404NotFound;
|
|
||||||
statusMessage = $"Error loading user with ID {UserId}";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
|
|
||||||
var result = await UserManager.ConfirmEmailAsync(user, code);
|
|
||||||
statusMessage = result.Succeeded ? "Thank you for confirming your email." : "Error confirming your email.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
@page "/Account/ConfirmEmailChange"
|
|
||||||
|
|
||||||
@using System.Text
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Confirm email change</PageTitle>
|
|
||||||
|
|
||||||
<h1>Confirm email change</h1>
|
|
||||||
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? UserId { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Email { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Code { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
if (UserId is null || Email is null || Code is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToWithStatus(
|
|
||||||
"Account/Login", "Error: Invalid email change confirmation link.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
var user = await UserManager.FindByIdAsync(UserId);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
message = "Unable to find user with Id '{userId}'";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
|
|
||||||
var result = await UserManager.ChangeEmailAsync(user, Email, code);
|
|
||||||
if (!result.Succeeded)
|
|
||||||
{
|
|
||||||
message = "Error changing email.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// In our UI email and user name are one and the same, so when we update the email
|
|
||||||
// we need to update the user name.
|
|
||||||
var setUserNameResult = await UserManager.SetUserNameAsync(user, Email);
|
|
||||||
if (!setUserNameResult.Succeeded)
|
|
||||||
{
|
|
||||||
message = "Error changing user name.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.RefreshSignInAsync(user);
|
|
||||||
message = "Thank you for confirming your email change.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,205 +0,0 @@
|
||||||
@page "/Account/ExternalLogin"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Security.Claims
|
|
||||||
@using System.Text
|
|
||||||
@using System.Text.Encodings.Web
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IUserStore<ApplicationUser> UserStore
|
|
||||||
@inject IEmailSender<ApplicationUser> EmailSender
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<ExternalLogin> Logger
|
|
||||||
|
|
||||||
<PageTitle>Register</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<h1>Register</h1>
|
|
||||||
<h2>Associate your @ProviderDisplayName account.</h2>
|
|
||||||
<hr />
|
|
||||||
|
|
||||||
<div class="alert alert-info">
|
|
||||||
You've successfully authenticated with <strong>@ProviderDisplayName</strong>.
|
|
||||||
Please enter an email address for this site below and click the Register button to finish
|
|
||||||
logging in.
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<EditForm Model="Input" OnValidSubmit="OnValidSubmitAsync" FormName="confirmation" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="email" placeholder="Please enter your email." />
|
|
||||||
<label for="Input.Email" class="form-label">Email</label>
|
|
||||||
<ValidationMessage For="() => Input.Email" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
public const string LoginCallbackAction = "LoginCallback";
|
|
||||||
|
|
||||||
private string? message;
|
|
||||||
private ExternalLoginInfo? externalLoginInfo;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? RemoteError { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Action { get; set; }
|
|
||||||
|
|
||||||
private string? ProviderDisplayName => externalLoginInfo?.ProviderDisplayName;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
if (RemoteError is not null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToWithStatus("Account/Login", $"Error from external provider: {RemoteError}", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
var info = await SignInManager.GetExternalLoginInfoAsync();
|
|
||||||
if (info is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
externalLoginInfo = info;
|
|
||||||
|
|
||||||
if (HttpMethods.IsGet(HttpContext.Request.Method))
|
|
||||||
{
|
|
||||||
if (Action == LoginCallbackAction)
|
|
||||||
{
|
|
||||||
await OnLoginCallbackAsync();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We should only reach this page via the login callback, so redirect back to
|
|
||||||
// the login page if we get here some other way.
|
|
||||||
RedirectManager.RedirectTo("Account/Login");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnLoginCallbackAsync()
|
|
||||||
{
|
|
||||||
if (externalLoginInfo is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sign in the user with this external login provider if the user already has a login.
|
|
||||||
var result = await SignInManager.ExternalLoginSignInAsync(
|
|
||||||
externalLoginInfo.LoginProvider,
|
|
||||||
externalLoginInfo.ProviderKey,
|
|
||||||
isPersistent: false,
|
|
||||||
bypassTwoFactor: true);
|
|
||||||
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
Logger.LogInformation(
|
|
||||||
"{Name} logged in with {LoginProvider} provider.",
|
|
||||||
externalLoginInfo.Principal.Identity?.Name,
|
|
||||||
externalLoginInfo.LoginProvider);
|
|
||||||
RedirectManager.RedirectTo(ReturnUrl);
|
|
||||||
}
|
|
||||||
else if (result.IsLockedOut)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("Account/Lockout");
|
|
||||||
}
|
|
||||||
|
|
||||||
// If the user does not have an account, then ask the user to create an account.
|
|
||||||
if (externalLoginInfo.Principal.HasClaim(c => c.Type == ClaimTypes.Email))
|
|
||||||
{
|
|
||||||
Input.Email = externalLoginInfo.Principal.FindFirstValue(ClaimTypes.Email) ?? "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
if (externalLoginInfo is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToWithStatus("Account/Login", "Error loading external login information during confirmation.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
var emailStore = GetEmailStore();
|
|
||||||
var user = CreateUser();
|
|
||||||
|
|
||||||
await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
|
|
||||||
await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
|
|
||||||
|
|
||||||
var result = await UserManager.CreateAsync(user);
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
result = await UserManager.AddLoginAsync(user, externalLoginInfo);
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
Logger.LogInformation("User created an account using {Name} provider.", externalLoginInfo.LoginProvider);
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
|
|
||||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
|
|
||||||
await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
|
||||||
|
|
||||||
// If account confirmation is required, we need to show the link if we don't have a real email sender
|
|
||||||
if (UserManager.Options.SignIn.RequireConfirmedAccount)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("Account/RegisterConfirmation", new() { ["email"] = Input.Email });
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.SignInAsync(user, isPersistent: false, externalLoginInfo.LoginProvider);
|
|
||||||
RedirectManager.RedirectTo(ReturnUrl);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
message = $"Error: {string.Join(",", result.Errors.Select(error => error.Description))}";
|
|
||||||
}
|
|
||||||
|
|
||||||
private ApplicationUser CreateUser()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return Activator.CreateInstance<ApplicationUser>();
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException($"Can't create an instance of '{nameof(ApplicationUser)}'. " +
|
|
||||||
$"Ensure that '{nameof(ApplicationUser)}' is not an abstract class and has a parameterless constructor");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private IUserEmailStore<ApplicationUser> GetEmailStore()
|
|
||||||
{
|
|
||||||
if (!UserManager.SupportsUserEmail)
|
|
||||||
{
|
|
||||||
throw new NotSupportedException("The default UI requires a user store with email support.");
|
|
||||||
}
|
|
||||||
return (IUserEmailStore<ApplicationUser>)UserStore;
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
public string Email { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
@page "/Account/ForgotPassword"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Text
|
|
||||||
@using System.Text.Encodings.Web
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IEmailSender<ApplicationUser> EmailSender
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Forgot your password?</PageTitle>
|
|
||||||
|
|
||||||
<h1>Forgot your password?</h1>
|
|
||||||
<h2>Enter your email.</h2>
|
|
||||||
<hr />
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<EditForm Model="Input" FormName="forgot-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
|
||||||
<label for="Input.Email" class="form-label">Email</label>
|
|
||||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Reset password</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var user = await UserManager.FindByEmailAsync(Input.Email);
|
|
||||||
if (user is null || !(await UserManager.IsEmailConfirmedAsync(user)))
|
|
||||||
{
|
|
||||||
// Don't reveal that the user does not exist or is not confirmed
|
|
||||||
RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
|
|
||||||
}
|
|
||||||
|
|
||||||
// For more information on how to enable account confirmation and password reset please
|
|
||||||
// visit https://go.microsoft.com/fwlink/?LinkID=532713
|
|
||||||
var code = await UserManager.GeneratePasswordResetTokenAsync(user);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ResetPassword").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["code"] = code });
|
|
||||||
|
|
||||||
await EmailSender.SendPasswordResetLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
|
||||||
|
|
||||||
RedirectManager.RedirectTo("Account/ForgotPasswordConfirmation");
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
public string Email { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
@page "/Account/ForgotPasswordConfirmation"
|
|
||||||
|
|
||||||
<PageTitle>Forgot password confirmation</PageTitle>
|
|
||||||
|
|
||||||
<h1>Forgot password confirmation</h1>
|
|
||||||
<p role="alert">
|
|
||||||
Please check your email to reset your password.
|
|
||||||
</p>
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
@page "/Account/InvalidPasswordReset"
|
|
||||||
|
|
||||||
<PageTitle>Invalid password reset</PageTitle>
|
|
||||||
|
|
||||||
<h1>Invalid password reset</h1>
|
|
||||||
<p role="alert">
|
|
||||||
The password reset link is invalid.
|
|
||||||
</p>
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
@page "/Account/InvalidUser"
|
|
||||||
|
|
||||||
<PageTitle>Invalid user</PageTitle>
|
|
||||||
|
|
||||||
<h3>Invalid user</h3>
|
|
||||||
|
|
||||||
<StatusMessage />
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
@page "/Account/Lockout"
|
|
||||||
|
|
||||||
<PageTitle>Locked out</PageTitle>
|
|
||||||
|
|
||||||
<header>
|
|
||||||
<h1 class="text-danger">Locked out</h1>
|
|
||||||
<p class="text-danger" role="alert">This account has been locked out, please try again later.</p>
|
|
||||||
</header>
|
|
||||||
|
|
@ -1,128 +0,0 @@
|
||||||
@page "/Account/Login"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Authentication
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject ILogger<Login> Logger
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Log in</PageTitle>
|
|
||||||
|
|
||||||
<h1>Log in</h1>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-lg-6">
|
|
||||||
<section>
|
|
||||||
<StatusMessage Message="@errorMessage" />
|
|
||||||
<EditForm Model="Input" method="post" OnValidSubmit="LoginUser" FormName="login">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<h2>Use a local account to log in.</h2>
|
|
||||||
<hr />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
|
||||||
<label for="Input.Email" class="form-label">Email</label>
|
|
||||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="password" />
|
|
||||||
<label for="Input.Password" class="form-label">Password</label>
|
|
||||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="checkbox mb-3">
|
|
||||||
<label class="form-label">
|
|
||||||
<InputCheckbox @bind-Value="Input.RememberMe" class="darker-border-checkbox form-check-input" />
|
|
||||||
Remember me
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
<a href="Account/ForgotPassword">Forgot your password?</a>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<a href="@(NavigationManager.GetUriWithQueryParameters("Account/Register", new Dictionary<string, object?> { ["ReturnUrl"] = ReturnUrl }))">Register as a new user</a>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
<a href="Account/ResendEmailConfirmation">Resend email confirmation</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</EditForm>
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
<div class="col-lg-4 col-lg-offset-2">
|
|
||||||
<section>
|
|
||||||
<h3>Use another service to log in.</h3>
|
|
||||||
<hr />
|
|
||||||
<ExternalLoginPicker />
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? errorMessage;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
if (HttpMethods.IsGet(HttpContext.Request.Method))
|
|
||||||
{
|
|
||||||
// Clear the existing external cookie to ensure a clean login process
|
|
||||||
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task LoginUser()
|
|
||||||
{
|
|
||||||
// This doesn't count login failures towards account lockout
|
|
||||||
// To enable password failures to trigger account lockout, set lockoutOnFailure: true
|
|
||||||
var result = await SignInManager.PasswordSignInAsync(Input.Email, Input.Password, Input.RememberMe, lockoutOnFailure: false);
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
Logger.LogInformation("User logged in.");
|
|
||||||
RedirectManager.RedirectTo(ReturnUrl);
|
|
||||||
}
|
|
||||||
else if (result.RequiresTwoFactor)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo(
|
|
||||||
"Account/LoginWith2fa",
|
|
||||||
new() { ["returnUrl"] = ReturnUrl, ["rememberMe"] = Input.RememberMe });
|
|
||||||
}
|
|
||||||
else if (result.IsLockedOut)
|
|
||||||
{
|
|
||||||
Logger.LogWarning("User account locked out.");
|
|
||||||
RedirectManager.RedirectTo("Account/Lockout");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
errorMessage = "Error: Invalid login attempt.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
public string Email { get; set; } = "";
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
public string Password { get; set; } = "";
|
|
||||||
|
|
||||||
[Display(Name = "Remember me?")]
|
|
||||||
public bool RememberMe { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
@page "/Account/LoginWith2fa"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<LoginWith2fa> Logger
|
|
||||||
|
|
||||||
<PageTitle>Two-factor authentication</PageTitle>
|
|
||||||
|
|
||||||
<h1>Two-factor authentication</h1>
|
|
||||||
<hr />
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<p>Your login is protected with an authenticator app. Enter your authenticator code below.</p>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<EditForm Model="Input" FormName="login-with-2fa" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<input type="hidden" name="ReturnUrl" value="@ReturnUrl" />
|
|
||||||
<input type="hidden" name="RememberMe" value="@RememberMe" />
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.TwoFactorCode" id="Input.TwoFactorCode" class="form-control" autocomplete="off" />
|
|
||||||
<label for="Input.TwoFactorCode" class="form-label">Authenticator code</label>
|
|
||||||
<ValidationMessage For="() => Input.TwoFactorCode" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="checkbox mb-3">
|
|
||||||
<label for="remember-machine" class="form-label">
|
|
||||||
<InputCheckbox @bind-Value="Input.RememberMachine" />
|
|
||||||
Remember this machine
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
|
||||||
</div>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<p>
|
|
||||||
Don't have access to your authenticator device? You can
|
|
||||||
<a href="Account/LoginWithRecoveryCode?ReturnUrl=@ReturnUrl">log in with a recovery code</a>.
|
|
||||||
</p>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private bool RememberMe { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
// Ensure the user has gone through the username & password screen first
|
|
||||||
user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
|
|
||||||
throw new InvalidOperationException("Unable to load two-factor authentication user.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var authenticatorCode = Input.TwoFactorCode!.Replace(" ", string.Empty).Replace("-", string.Empty);
|
|
||||||
var result = await SignInManager.TwoFactorAuthenticatorSignInAsync(authenticatorCode, RememberMe, Input.RememberMachine);
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' logged in with 2fa.", userId);
|
|
||||||
RedirectManager.RedirectTo(ReturnUrl);
|
|
||||||
}
|
|
||||||
else if (result.IsLockedOut)
|
|
||||||
{
|
|
||||||
Logger.LogWarning("User with ID '{UserId}' account locked out.", userId);
|
|
||||||
RedirectManager.RedirectTo("Account/Lockout");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Logger.LogWarning("Invalid authenticator code entered for user with ID '{UserId}'.", userId);
|
|
||||||
message = "Error: Invalid authenticator code.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
|
||||||
[DataType(DataType.Text)]
|
|
||||||
[Display(Name = "Authenticator code")]
|
|
||||||
public string? TwoFactorCode { get; set; }
|
|
||||||
|
|
||||||
[Display(Name = "Remember this machine")]
|
|
||||||
public bool RememberMachine { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,85 +0,0 @@
|
||||||
@page "/Account/LoginWithRecoveryCode"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<LoginWithRecoveryCode> Logger
|
|
||||||
|
|
||||||
<PageTitle>Recovery code verification</PageTitle>
|
|
||||||
|
|
||||||
<h1>Recovery code verification</h1>
|
|
||||||
<hr />
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<p>
|
|
||||||
You have requested to log in with a recovery code. This login will not be remembered until you provide
|
|
||||||
an authenticator app code at log in or disable 2FA and log in again.
|
|
||||||
</p>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<EditForm Model="Input" FormName="login-with-recovery-code" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.RecoveryCode" id="Input.RecoveryCode" class="form-control" autocomplete="off" placeholder="RecoveryCode" />
|
|
||||||
<label for="Input.RecoveryCode" class="form-label">Recovery Code</label>
|
|
||||||
<ValidationMessage For="() => Input.RecoveryCode" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
// Ensure the user has gone through the username & password screen first
|
|
||||||
user = await SignInManager.GetTwoFactorAuthenticationUserAsync() ??
|
|
||||||
throw new InvalidOperationException("Unable to load two-factor authentication user.");
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var recoveryCode = Input.RecoveryCode.Replace(" ", string.Empty);
|
|
||||||
|
|
||||||
var result = await SignInManager.TwoFactorRecoveryCodeSignInAsync(recoveryCode);
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' logged in with a recovery code.", userId);
|
|
||||||
RedirectManager.RedirectTo(ReturnUrl);
|
|
||||||
}
|
|
||||||
else if (result.IsLockedOut)
|
|
||||||
{
|
|
||||||
Logger.LogWarning("User account locked out.");
|
|
||||||
RedirectManager.RedirectTo("Account/Lockout");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Logger.LogWarning("Invalid recovery code entered for user with ID '{UserId}' ", userId);
|
|
||||||
message = "Error: Invalid recovery code entered.";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[DataType(DataType.Text)]
|
|
||||||
[Display(Name = "Recovery Code")]
|
|
||||||
public string RecoveryCode { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,96 +0,0 @@
|
||||||
@page "/Account/Manage/ChangePassword"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<ChangePassword> Logger
|
|
||||||
|
|
||||||
<PageTitle>Change password</PageTitle>
|
|
||||||
|
|
||||||
<h3>Change password</h3>
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xl-6">
|
|
||||||
<EditForm Model="Input" FormName="change-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.OldPassword" id="Input.OldPassword" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Enter the old password" />
|
|
||||||
<label for="Input.OldPassword" class="form-label">Old password</label>
|
|
||||||
<ValidationMessage For="() => Input.OldPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
|
|
||||||
<label for="Input.NewPassword" class="form-label">New password</label>
|
|
||||||
<ValidationMessage For="() => Input.NewPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Enter the new password" />
|
|
||||||
<label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
|
|
||||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Update password</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private bool hasPassword;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
hasPassword = await UserManager.HasPasswordAsync(user);
|
|
||||||
if (!hasPassword)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("Account/Manage/SetPassword");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var changePasswordResult = await UserManager.ChangePasswordAsync(user, Input.OldPassword, Input.NewPassword);
|
|
||||||
if (!changePasswordResult.Succeeded)
|
|
||||||
{
|
|
||||||
message = $"Error: {string.Join(",", changePasswordResult.Errors.Select(error => error.Description))}";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.RefreshSignInAsync(user);
|
|
||||||
Logger.LogInformation("User changed their password successfully.");
|
|
||||||
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Your password has been changed", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "Current password")]
|
|
||||||
public string OldPassword { get; set; } = "";
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "New password")]
|
|
||||||
public string NewPassword { get; set; } = "";
|
|
||||||
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "Confirm new password")]
|
|
||||||
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
|
|
||||||
public string ConfirmPassword { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,86 +0,0 @@
|
||||||
@page "/Account/Manage/DeletePersonalData"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<DeletePersonalData> Logger
|
|
||||||
|
|
||||||
<PageTitle>Delete Personal Data</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
|
|
||||||
<h3>Delete Personal Data</h3>
|
|
||||||
|
|
||||||
<div class="alert alert-warning" role="alert">
|
|
||||||
<p>
|
|
||||||
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<EditForm Model="Input" FormName="delete-user" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
@if (requirePassword)
|
|
||||||
{
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" placeholder="Please enter your password." />
|
|
||||||
<label for="Input.Password" class="form-label">Password</label>
|
|
||||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
<button class="w-100 btn btn-lg btn-danger" type="submit">Delete data and close my account</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private bool requirePassword;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
Input ??= new();
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
requirePassword = await UserManager.HasPasswordAsync(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
if (requirePassword && !await UserManager.CheckPasswordAsync(user, Input.Password))
|
|
||||||
{
|
|
||||||
message = "Error: Incorrect password.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = await UserManager.DeleteAsync(user);
|
|
||||||
if (!result.Succeeded)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("Unexpected error occurred deleting user.");
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.SignOutAsync();
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' deleted themselves.", userId);
|
|
||||||
|
|
||||||
RedirectManager.RedirectToCurrentPage();
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
public string Password { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,64 +0,0 @@
|
||||||
@page "/Account/Manage/Disable2fa"
|
|
||||||
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<Disable2fa> Logger
|
|
||||||
|
|
||||||
<PageTitle>Disable two-factor authentication (2FA)</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage />
|
|
||||||
<h3>Disable two-factor authentication (2FA)</h3>
|
|
||||||
|
|
||||||
<div class="alert alert-warning" role="alert">
|
|
||||||
<p>
|
|
||||||
<strong>This action only disables 2FA.</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Disabling 2FA does not change the keys used in authenticator apps. If you wish to change the key
|
|
||||||
used in an authenticator app you should <a href="Account/Manage/ResetAuthenticator">reset your authenticator keys.</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<form @formname="disable-2fa" @onsubmit="OnSubmitAsync" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<button class="btn btn-danger" type="submit">Disable 2FA</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
|
|
||||||
if (HttpMethods.IsGet(HttpContext.Request.Method) && !await UserManager.GetTwoFactorEnabledAsync(user))
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("Cannot disable 2FA for user as it's not currently enabled.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnSubmitAsync()
|
|
||||||
{
|
|
||||||
var disable2faResult = await UserManager.SetTwoFactorEnabledAsync(user, false);
|
|
||||||
if (!disable2faResult.Succeeded)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("Unexpected error occurred disabling 2FA.");
|
|
||||||
}
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' has disabled 2fa.", userId);
|
|
||||||
RedirectManager.RedirectToWithStatus(
|
|
||||||
"Account/Manage/TwoFactorAuthentication",
|
|
||||||
"2fa has been disabled. You can reenable 2fa when you setup an authenticator app",
|
|
||||||
HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,123 +0,0 @@
|
||||||
@page "/Account/Manage/Email"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Text
|
|
||||||
@using System.Text.Encodings.Web
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IEmailSender<ApplicationUser> EmailSender
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
|
|
||||||
<PageTitle>Manage email</PageTitle>
|
|
||||||
|
|
||||||
<h3>Manage email</h3>
|
|
||||||
|
|
||||||
<StatusMessage Message="@message"/>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xl-6">
|
|
||||||
<form @onsubmit="OnSendEmailVerificationAsync" @formname="send-verification" id="send-verification-form" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
</form>
|
|
||||||
<EditForm Model="Input" FormName="change-email" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
@if (isEmailConfirmed)
|
|
||||||
{
|
|
||||||
<div class="form-floating mb-3 input-group">
|
|
||||||
<input type="text" value="@email" id="email" class="form-control" placeholder="Enter your email" disabled />
|
|
||||||
<div class="input-group-append">
|
|
||||||
<span class="h-100 input-group-text text-success font-weight-bold">✓</span>
|
|
||||||
</div>
|
|
||||||
<label for="email" class="form-label">Email</label>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<input type="text" value="@email" id="email" class="form-control" placeholder="Enter your email" disabled />
|
|
||||||
<label for="email" class="form-label">Email</label>
|
|
||||||
<button type="submit" class="btn btn-link" form="send-verification-form">Send verification email</button>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.NewEmail" id="Input.NewEmail" class="form-control" autocomplete="email" aria-required="true" placeholder="Enter a new email" />
|
|
||||||
<label for="Input.NewEmail" class="form-label">New email</label>
|
|
||||||
<ValidationMessage For="() => Input.NewEmail" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Change email</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private string? email;
|
|
||||||
private bool isEmailConfirmed;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm(FormName = "change-email")]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
email = await UserManager.GetEmailAsync(user);
|
|
||||||
isEmailConfirmed = await UserManager.IsEmailConfirmedAsync(user);
|
|
||||||
|
|
||||||
Input.NewEmail ??= email;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
if (Input.NewEmail is null || Input.NewEmail == email)
|
|
||||||
{
|
|
||||||
message = "Your email is unchanged.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var code = await UserManager.GenerateChangeEmailTokenAsync(user, Input.NewEmail);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmailChange").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["userId"] = userId, ["email"] = Input.NewEmail, ["code"] = code });
|
|
||||||
|
|
||||||
await EmailSender.SendConfirmationLinkAsync(user, Input.NewEmail, HtmlEncoder.Default.Encode(callbackUrl));
|
|
||||||
|
|
||||||
message = "Confirmation link to change email sent. Please check your email.";
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnSendEmailVerificationAsync()
|
|
||||||
{
|
|
||||||
if (email is null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
|
|
||||||
|
|
||||||
await EmailSender.SendConfirmationLinkAsync(user, email, HtmlEncoder.Default.Encode(callbackUrl));
|
|
||||||
|
|
||||||
message = "Verification email sent. Please check your email.";
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
[Display(Name = "New email")]
|
|
||||||
public string? NewEmail { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,172 +0,0 @@
|
||||||
@page "/Account/Manage/EnableAuthenticator"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Globalization
|
|
||||||
@using System.Text
|
|
||||||
@using System.Text.Encodings.Web
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject UrlEncoder UrlEncoder
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<EnableAuthenticator> Logger
|
|
||||||
|
|
||||||
<PageTitle>Configure authenticator app</PageTitle>
|
|
||||||
|
|
||||||
@if (recoveryCodes is not null)
|
|
||||||
{
|
|
||||||
<ShowRecoveryCodes RecoveryCodes="recoveryCodes.ToArray()" StatusMessage="@message" />
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<h3>Configure authenticator app</h3>
|
|
||||||
<div>
|
|
||||||
<p>To use an authenticator app go through the following steps:</p>
|
|
||||||
<ol class="list">
|
|
||||||
<li>
|
|
||||||
<p>
|
|
||||||
Download a two-factor authenticator app like Microsoft Authenticator for
|
|
||||||
<a href="https://go.microsoft.com/fwlink/?Linkid=825072">Android</a> and
|
|
||||||
<a href="https://go.microsoft.com/fwlink/?Linkid=825073">iOS</a> or
|
|
||||||
Google Authenticator for
|
|
||||||
<a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en">Android</a> and
|
|
||||||
<a href="https://itunes.apple.com/us/app/google-authenticator/id388497605?mt=8">iOS</a>.
|
|
||||||
</p>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<p>Scan the QR Code or enter this key <kbd>@sharedKey</kbd> into your two factor authenticator app. Spaces and casing do not matter.</p>
|
|
||||||
<div class="alert alert-info">Learn how to <a href="https://go.microsoft.com/fwlink/?Linkid=852423">enable QR code generation</a>.</div>
|
|
||||||
<div></div>
|
|
||||||
<div data-url="@authenticatorUri"></div>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<p>
|
|
||||||
Once you have scanned the QR code or input the key above, your two factor authentication app will provide you
|
|
||||||
with a unique code. Enter the code in the confirmation box below.
|
|
||||||
</p>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xl-6">
|
|
||||||
<EditForm Model="Input" FormName="send-code" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Code" id="Input.Code" class="form-control" autocomplete="off" placeholder="Enter the code" />
|
|
||||||
<label for="Input.Code" class="control-label form-label">Verification Code</label>
|
|
||||||
<ValidationMessage For="() => Input.Code" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Verify</button>
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</li>
|
|
||||||
</ol>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private const string AuthenticatorUriFormat = "otpauth://totp/{0}:{1}?secret={2}&issuer={0}&digits=6";
|
|
||||||
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private string? sharedKey;
|
|
||||||
private string? authenticatorUri;
|
|
||||||
private IEnumerable<string>? recoveryCodes;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
|
|
||||||
await LoadSharedKeyAndQrCodeUriAsync(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
// Strip spaces and hyphens
|
|
||||||
var verificationCode = Input.Code.Replace(" ", string.Empty).Replace("-", string.Empty);
|
|
||||||
|
|
||||||
var is2faTokenValid = await UserManager.VerifyTwoFactorTokenAsync(
|
|
||||||
user, UserManager.Options.Tokens.AuthenticatorTokenProvider, verificationCode);
|
|
||||||
|
|
||||||
if (!is2faTokenValid)
|
|
||||||
{
|
|
||||||
message = "Error: Verification code is invalid.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await UserManager.SetTwoFactorEnabledAsync(user, true);
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' has enabled 2FA with an authenticator app.", userId);
|
|
||||||
|
|
||||||
message = "Your authenticator app has been verified.";
|
|
||||||
|
|
||||||
if (await UserManager.CountRecoveryCodesAsync(user) == 0)
|
|
||||||
{
|
|
||||||
recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToWithStatus("Account/Manage/TwoFactorAuthentication", message, HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async ValueTask LoadSharedKeyAndQrCodeUriAsync(ApplicationUser user)
|
|
||||||
{
|
|
||||||
// Load the authenticator key & QR code URI to display on the form
|
|
||||||
var unformattedKey = await UserManager.GetAuthenticatorKeyAsync(user);
|
|
||||||
if (string.IsNullOrEmpty(unformattedKey))
|
|
||||||
{
|
|
||||||
await UserManager.ResetAuthenticatorKeyAsync(user);
|
|
||||||
unformattedKey = await UserManager.GetAuthenticatorKeyAsync(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
sharedKey = FormatKey(unformattedKey!);
|
|
||||||
|
|
||||||
var email = await UserManager.GetEmailAsync(user);
|
|
||||||
authenticatorUri = GenerateQrCodeUri(email!, unformattedKey!);
|
|
||||||
}
|
|
||||||
|
|
||||||
private string FormatKey(string unformattedKey)
|
|
||||||
{
|
|
||||||
var result = new StringBuilder();
|
|
||||||
int currentPosition = 0;
|
|
||||||
while (currentPosition + 4 < unformattedKey.Length)
|
|
||||||
{
|
|
||||||
result.Append(unformattedKey.AsSpan(currentPosition, 4)).Append(' ');
|
|
||||||
currentPosition += 4;
|
|
||||||
}
|
|
||||||
if (currentPosition < unformattedKey.Length)
|
|
||||||
{
|
|
||||||
result.Append(unformattedKey.AsSpan(currentPosition));
|
|
||||||
}
|
|
||||||
|
|
||||||
return result.ToString().ToLowerInvariant();
|
|
||||||
}
|
|
||||||
|
|
||||||
private string GenerateQrCodeUri(string email, string unformattedKey)
|
|
||||||
{
|
|
||||||
return string.Format(
|
|
||||||
CultureInfo.InvariantCulture,
|
|
||||||
AuthenticatorUriFormat,
|
|
||||||
UrlEncoder.Encode("Microsoft.AspNetCore.Identity.UI"),
|
|
||||||
UrlEncoder.Encode(email),
|
|
||||||
unformattedKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[StringLength(7, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
|
||||||
[DataType(DataType.Text)]
|
|
||||||
[Display(Name = "Verification Code")]
|
|
||||||
public string Code { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,140 +0,0 @@
|
||||||
@page "/Account/Manage/ExternalLogins"
|
|
||||||
|
|
||||||
@using Microsoft.AspNetCore.Authentication
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IUserStore<ApplicationUser> UserStore
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Manage your external logins</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage />
|
|
||||||
@if (currentLogins?.Count > 0)
|
|
||||||
{
|
|
||||||
<h3>Registered Logins</h3>
|
|
||||||
<table class="table">
|
|
||||||
<tbody>
|
|
||||||
@foreach (var login in currentLogins)
|
|
||||||
{
|
|
||||||
<tr>
|
|
||||||
<td>@login.ProviderDisplayName</td>
|
|
||||||
<td>
|
|
||||||
@if (showRemoveButton)
|
|
||||||
{
|
|
||||||
<form @formname="@($"remove-login-{login.LoginProvider}")" @onsubmit="OnSubmitAsync" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<div>
|
|
||||||
<input type="hidden" name="@nameof(LoginProvider)" value="@login.LoginProvider" />
|
|
||||||
<input type="hidden" name="@nameof(ProviderKey)" value="@login.ProviderKey" />
|
|
||||||
<button type="submit" class="btn btn-primary" title="Remove this @login.ProviderDisplayName login from your account">Remove</button>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
@:
|
|
||||||
}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
}
|
|
||||||
@if (otherLogins?.Count > 0)
|
|
||||||
{
|
|
||||||
<h4>Add another service to log in.</h4>
|
|
||||||
<hr />
|
|
||||||
<form class="form-horizontal" action="Account/Manage/LinkExternalLogin" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
@foreach (var provider in otherLogins)
|
|
||||||
{
|
|
||||||
<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>
|
|
||||||
</form>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
public const string LinkLoginCallbackAction = "LinkLoginCallback";
|
|
||||||
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private IList<UserLoginInfo>? currentLogins;
|
|
||||||
private IList<AuthenticationScheme>? otherLogins;
|
|
||||||
private bool showRemoveButton;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private string? LoginProvider { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private string? ProviderKey { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Action { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
currentLogins = await UserManager.GetLoginsAsync(user);
|
|
||||||
otherLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync())
|
|
||||||
.Where(auth => currentLogins.All(ul => auth.Name != ul.LoginProvider))
|
|
||||||
.ToList();
|
|
||||||
|
|
||||||
string? passwordHash = null;
|
|
||||||
if (UserStore is IUserPasswordStore<ApplicationUser> userPasswordStore)
|
|
||||||
{
|
|
||||||
passwordHash = await userPasswordStore.GetPasswordHashAsync(user, HttpContext.RequestAborted);
|
|
||||||
}
|
|
||||||
|
|
||||||
showRemoveButton = passwordHash is not null || currentLogins.Count > 1;
|
|
||||||
|
|
||||||
if (HttpMethods.IsGet(HttpContext.Request.Method) && Action == LinkLoginCallbackAction)
|
|
||||||
{
|
|
||||||
await OnGetLinkLoginCallbackAsync();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnSubmitAsync()
|
|
||||||
{
|
|
||||||
var result = await UserManager.RemoveLoginAsync(user, LoginProvider!, ProviderKey!);
|
|
||||||
if (!result.Succeeded)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not removed.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.RefreshSignInAsync(user);
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("The external login was removed.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnGetLinkLoginCallbackAsync()
|
|
||||||
{
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var info = await SignInManager.GetExternalLoginInfoAsync(userId);
|
|
||||||
if (info is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: Could not load external login info.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = await UserManager.AddLoginAsync(user, info);
|
|
||||||
if (!result.Succeeded)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: The external login was not added. External logins can only be associated with one account.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clear the existing external cookie to ensure a clean login process
|
|
||||||
await HttpContext.SignOutAsync(IdentityConstants.ExternalScheme);
|
|
||||||
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("The external login was added.", HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
@page "/Account/Manage/GenerateRecoveryCodes"
|
|
||||||
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<GenerateRecoveryCodes> Logger
|
|
||||||
|
|
||||||
<PageTitle>Generate two-factor authentication (2FA) recovery codes</PageTitle>
|
|
||||||
|
|
||||||
@if (recoveryCodes is not null)
|
|
||||||
{
|
|
||||||
<ShowRecoveryCodes RecoveryCodes="recoveryCodes.ToArray()" StatusMessage="@message" />
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<h3>Generate two-factor authentication (2FA) recovery codes</h3>
|
|
||||||
<div class="alert alert-warning" role="alert">
|
|
||||||
<p>
|
|
||||||
<span class="glyphicon glyphicon-warning-sign"></span>
|
|
||||||
<strong>Put these codes in a safe place.</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
If you lose your device and don't have the recovery codes you will lose access to your account.
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
Generating new recovery codes does not change the keys used in authenticator apps. If you wish to change the key
|
|
||||||
used in an authenticator app you should <a href="Account/Manage/ResetAuthenticator">reset your authenticator keys.</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<form @formname="generate-recovery-codes" @onsubmit="OnSubmitAsync" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<button class="btn btn-danger" type="submit">Generate Recovery Codes</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private IEnumerable<string>? recoveryCodes;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
|
|
||||||
var isTwoFactorEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
|
|
||||||
if (!isTwoFactorEnabled)
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException("Cannot generate recovery codes for user because they do not have 2FA enabled.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnSubmitAsync()
|
|
||||||
{
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
recoveryCodes = await UserManager.GenerateNewTwoFactorRecoveryCodesAsync(user, 10);
|
|
||||||
message = "You have generated new recovery codes.";
|
|
||||||
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' has generated new 2FA recovery codes.", userId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,77 +0,0 @@
|
||||||
@page "/Account/Manage"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Profile</PageTitle>
|
|
||||||
|
|
||||||
<h3>Profile</h3>
|
|
||||||
<StatusMessage />
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-xl-6">
|
|
||||||
<EditForm Model="Input" FormName="profile" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<input type="text" value="@username" id="username" class="form-control" placeholder="Choose your username." disabled />
|
|
||||||
<label for="username" class="form-label">Username</label>
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.PhoneNumber" id="Input.PhoneNumber" class="form-control" placeholder="Enter your phone number" />
|
|
||||||
<label for="Input.PhoneNumber" class="form-label">Phone number</label>
|
|
||||||
<ValidationMessage For="() => Input.PhoneNumber" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Save</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
private string? username;
|
|
||||||
private string? phoneNumber;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
username = await UserManager.GetUserNameAsync(user);
|
|
||||||
phoneNumber = await UserManager.GetPhoneNumberAsync(user);
|
|
||||||
|
|
||||||
Input.PhoneNumber ??= phoneNumber;
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
if (Input.PhoneNumber != phoneNumber)
|
|
||||||
{
|
|
||||||
var setPhoneResult = await UserManager.SetPhoneNumberAsync(user, Input.PhoneNumber);
|
|
||||||
if (!setPhoneResult.Succeeded)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Error: Failed to set phone number.", HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.RefreshSignInAsync(user);
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Your profile has been updated", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Phone]
|
|
||||||
[Display(Name = "Phone number")]
|
|
||||||
public string? PhoneNumber { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
@page "/Account/Manage/PersonalData"
|
|
||||||
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
|
|
||||||
<PageTitle>Personal Data</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage />
|
|
||||||
<h3>Personal Data</h3>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-6">
|
|
||||||
<p>Your account contains personal data that you have given us. This page allows you to download or delete that data.</p>
|
|
||||||
<p>
|
|
||||||
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
|
|
||||||
</p>
|
|
||||||
<form action="Account/Manage/DownloadPersonalData" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<button class="btn btn-primary" type="submit">Download</button>
|
|
||||||
</form>
|
|
||||||
<p>
|
|
||||||
<a href="Account/Manage/DeletePersonalData" class="btn btn-danger">Delete</a>
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
_ = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
@page "/Account/Manage/ResetAuthenticator"
|
|
||||||
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject ILogger<ResetAuthenticator> Logger
|
|
||||||
|
|
||||||
<PageTitle>Reset authenticator key</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage />
|
|
||||||
<h3>Reset authenticator key</h3>
|
|
||||||
<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>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
This process disables 2FA until you verify your authenticator app.
|
|
||||||
If you do not complete your authenticator app configuration you may lose access to your account.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<form @formname="reset-authenticator" @onsubmit="OnSubmitAsync" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<button class="btn btn-danger" type="submit">Reset authenticator key</button>
|
|
||||||
</form>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
private async Task OnSubmitAsync()
|
|
||||||
{
|
|
||||||
var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
await UserManager.SetTwoFactorEnabledAsync(user, false);
|
|
||||||
await UserManager.ResetAuthenticatorKeyAsync(user);
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
Logger.LogInformation("User with ID '{UserId}' has reset their authentication app key.", userId);
|
|
||||||
|
|
||||||
await SignInManager.RefreshSignInAsync(user);
|
|
||||||
|
|
||||||
RedirectManager.RedirectToWithStatus(
|
|
||||||
"Account/Manage/EnableAuthenticator",
|
|
||||||
"Your authenticator app key has been reset, you will need to configure your authenticator app using the new key.",
|
|
||||||
HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,87 +0,0 @@
|
||||||
@page "/Account/Manage/SetPassword"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Set password</PageTitle>
|
|
||||||
|
|
||||||
<h3>Set your password</h3>
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<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-xl-6">
|
|
||||||
<EditForm Model="Input" FormName="set-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.NewPassword" id="Input.NewPassword" class="form-control" autocomplete="new-password" placeholder="Enter the new password" />
|
|
||||||
<label for="Input.NewPassword" class="form-label">New password</label>
|
|
||||||
<ValidationMessage For="() => Input.NewPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" placeholder="Enter the new password" />
|
|
||||||
<label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
|
|
||||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Set password</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
private ApplicationUser user = default!;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
|
|
||||||
var hasPassword = await UserManager.HasPasswordAsync(user);
|
|
||||||
if (hasPassword)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("Account/Manage/ChangePassword");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var addPasswordResult = await UserManager.AddPasswordAsync(user, Input.NewPassword!);
|
|
||||||
if (!addPasswordResult.Succeeded)
|
|
||||||
{
|
|
||||||
message = $"Error: {string.Join(",", addPasswordResult.Errors.Select(error => error.Description))}";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.RefreshSignInAsync(user);
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus("Your password has been set.", HttpContext);
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "New password")]
|
|
||||||
public string? NewPassword { get; set; }
|
|
||||||
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "Confirm new password")]
|
|
||||||
[Compare("NewPassword", ErrorMessage = "The new password and confirmation password do not match.")]
|
|
||||||
public string? ConfirmPassword { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,101 +0,0 @@
|
||||||
@page "/Account/Manage/TwoFactorAuthentication"
|
|
||||||
|
|
||||||
@using Microsoft.AspNetCore.Http.Features
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityUserAccessor UserAccessor
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Two-factor authentication (2FA)</PageTitle>
|
|
||||||
|
|
||||||
<StatusMessage />
|
|
||||||
<h3>Two-factor authentication (2FA)</h3>
|
|
||||||
@if (canTrack)
|
|
||||||
{
|
|
||||||
if (is2faEnabled)
|
|
||||||
{
|
|
||||||
if (recoveryCodesLeft == 0)
|
|
||||||
{
|
|
||||||
<div class="alert alert-danger">
|
|
||||||
<strong>You have no recovery codes left.</strong>
|
|
||||||
<p>You must <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a> before you can log in with a recovery code.</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else if (recoveryCodesLeft == 1)
|
|
||||||
{
|
|
||||||
<div class="alert alert-danger">
|
|
||||||
<strong>You have 1 recovery code left.</strong>
|
|
||||||
<p>You can <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else if (recoveryCodesLeft <= 3)
|
|
||||||
{
|
|
||||||
<div class="alert alert-warning">
|
|
||||||
<strong>You have @recoveryCodesLeft recovery codes left.</strong>
|
|
||||||
<p>You should <a href="Account/Manage/GenerateRecoveryCodes">generate a new set of recovery codes</a>.</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
if (isMachineRemembered)
|
|
||||||
{
|
|
||||||
<form style="display: inline-block" @formname="forget-browser" @onsubmit="OnSubmitForgetBrowserAsync" method="post">
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<button type="submit" class="btn btn-primary">Forget this browser</button>
|
|
||||||
</form>
|
|
||||||
}
|
|
||||||
|
|
||||||
<a href="Account/Manage/Disable2fa" class="btn btn-primary">Disable 2FA</a>
|
|
||||||
<a href="Account/Manage/GenerateRecoveryCodes" class="btn btn-primary">Reset recovery codes</a>
|
|
||||||
}
|
|
||||||
|
|
||||||
<h4>Authenticator app</h4>
|
|
||||||
@if (!hasAuthenticator)
|
|
||||||
{
|
|
||||||
<a href="Account/Manage/EnableAuthenticator" class="btn btn-primary">Add authenticator app</a>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<a href="Account/Manage/EnableAuthenticator" class="btn btn-primary">Set up authenticator app</a>
|
|
||||||
<a href="Account/Manage/ResetAuthenticator" class="btn btn-primary">Reset authenticator app</a>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<div class="alert alert-danger">
|
|
||||||
<strong>Privacy and cookie policy have not been accepted.</strong>
|
|
||||||
<p>You must accept the policy before you can enable two factor authentication.</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private bool canTrack;
|
|
||||||
private bool hasAuthenticator;
|
|
||||||
private int recoveryCodesLeft;
|
|
||||||
private bool is2faEnabled;
|
|
||||||
private bool isMachineRemembered;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
var user = await UserAccessor.GetRequiredUserAsync(HttpContext);
|
|
||||||
canTrack = HttpContext.Features.Get<ITrackingConsentFeature>()?.CanTrack ?? true;
|
|
||||||
hasAuthenticator = await UserManager.GetAuthenticatorKeyAsync(user) is not null;
|
|
||||||
is2faEnabled = await UserManager.GetTwoFactorEnabledAsync(user);
|
|
||||||
isMachineRemembered = await SignInManager.IsTwoFactorClientRememberedAsync(user);
|
|
||||||
recoveryCodesLeft = await UserManager.CountRecoveryCodesAsync(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnSubmitForgetBrowserAsync()
|
|
||||||
{
|
|
||||||
await SignInManager.ForgetTwoFactorClientAsync();
|
|
||||||
|
|
||||||
RedirectManager.RedirectToCurrentPageWithStatus(
|
|
||||||
"The current browser has been forgotten. When you login again from this browser you will be prompted for your 2fa code.",
|
|
||||||
HttpContext);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
@layout ManageLayout
|
|
||||||
@attribute [Microsoft.AspNetCore.Authorization.Authorize]
|
|
||||||
|
|
@ -1,145 +0,0 @@
|
||||||
@page "/Account/Register"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Text
|
|
||||||
@using System.Text.Encodings.Web
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IUserStore<ApplicationUser> UserStore
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IEmailSender<ApplicationUser> EmailSender
|
|
||||||
@inject ILogger<Register> Logger
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Register</PageTitle>
|
|
||||||
|
|
||||||
<h1>Register</h1>
|
|
||||||
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-lg-6">
|
|
||||||
<StatusMessage Message="@Message" />
|
|
||||||
<EditForm Model="Input" asp-route-returnUrl="@ReturnUrl" method="post" OnValidSubmit="RegisterUser" FormName="register">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<h2>Create a new account.</h2>
|
|
||||||
<hr />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
|
||||||
<label for="Input.Email">Email</label>
|
|
||||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
|
|
||||||
<label for="Input.Password">Password</label>
|
|
||||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="password" />
|
|
||||||
<label for="Input.ConfirmPassword">Confirm Password</label>
|
|
||||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Register</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
<div class="col-lg-4 col-lg-offset-2">
|
|
||||||
<section>
|
|
||||||
<h3>Use another service to register.</h3>
|
|
||||||
<hr />
|
|
||||||
<ExternalLoginPicker />
|
|
||||||
</section>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private IEnumerable<IdentityError>? identityErrors;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
private string? Message => identityErrors is null ? null : $"Error: {string.Join(", ", identityErrors.Select(error => error.Description))}";
|
|
||||||
|
|
||||||
public async Task RegisterUser(EditContext editContext)
|
|
||||||
{
|
|
||||||
var user = CreateUser();
|
|
||||||
|
|
||||||
await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None);
|
|
||||||
var emailStore = GetEmailStore();
|
|
||||||
await emailStore.SetEmailAsync(user, Input.Email, CancellationToken.None);
|
|
||||||
var result = await UserManager.CreateAsync(user, Input.Password);
|
|
||||||
|
|
||||||
if (!result.Succeeded)
|
|
||||||
{
|
|
||||||
identityErrors = result.Errors;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
Logger.LogInformation("User created a new account with password.");
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
|
|
||||||
|
|
||||||
await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
|
||||||
|
|
||||||
if (UserManager.Options.SignIn.RequireConfirmedAccount)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo(
|
|
||||||
"Account/RegisterConfirmation",
|
|
||||||
new() { ["email"] = Input.Email, ["returnUrl"] = ReturnUrl });
|
|
||||||
}
|
|
||||||
|
|
||||||
await SignInManager.SignInAsync(user, isPersistent: false);
|
|
||||||
RedirectManager.RedirectTo(ReturnUrl);
|
|
||||||
}
|
|
||||||
|
|
||||||
private ApplicationUser CreateUser()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
return Activator.CreateInstance<ApplicationUser>();
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
throw new InvalidOperationException($"Can't create an instance of '{nameof(ApplicationUser)}'. " +
|
|
||||||
$"Ensure that '{nameof(ApplicationUser)}' is not an abstract class and has a parameterless constructor.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private IUserEmailStore<ApplicationUser> GetEmailStore()
|
|
||||||
{
|
|
||||||
if (!UserManager.SupportsUserEmail)
|
|
||||||
{
|
|
||||||
throw new NotSupportedException("The default UI requires a user store with email support.");
|
|
||||||
}
|
|
||||||
return (IUserEmailStore<ApplicationUser>)UserStore;
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
[Display(Name = "Email")]
|
|
||||||
public string Email { get; set; } = "";
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "Password")]
|
|
||||||
public string Password { get; set; } = "";
|
|
||||||
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "Confirm password")]
|
|
||||||
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
|
|
||||||
public string ConfirmPassword { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
@page "/Account/RegisterConfirmation"
|
|
||||||
|
|
||||||
@using System.Text
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IEmailSender<ApplicationUser> EmailSender
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Register confirmation</PageTitle>
|
|
||||||
|
|
||||||
<h1>Register confirmation</h1>
|
|
||||||
|
|
||||||
<StatusMessage Message="@statusMessage" />
|
|
||||||
|
|
||||||
@if (emailConfirmationLink is not null)
|
|
||||||
{
|
|
||||||
<p>
|
|
||||||
This app does not currently have a real email sender registered, see <a href="https://aka.ms/aspaccountconf">these docs</a> for how to configure a real email sender.
|
|
||||||
Normally this would be emailed: <a href="@emailConfirmationLink">Click here to confirm your account</a>
|
|
||||||
</p>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<p role="alert">Please check your email to confirm your account.</p>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? emailConfirmationLink;
|
|
||||||
private string? statusMessage;
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Email { get; set; }
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
if (Email is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("");
|
|
||||||
}
|
|
||||||
|
|
||||||
var user = await UserManager.FindByEmailAsync(Email);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
HttpContext.Response.StatusCode = StatusCodes.Status404NotFound;
|
|
||||||
statusMessage = "Error finding user for unspecified email";
|
|
||||||
}
|
|
||||||
else if (EmailSender is IdentityNoOpEmailSender)
|
|
||||||
{
|
|
||||||
// Once you add a real email sender, you should remove this code that lets you confirm the account
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
emailConfirmationLink = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code, ["returnUrl"] = ReturnUrl });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,68 +0,0 @@
|
||||||
@page "/Account/ResendEmailConfirmation"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Text
|
|
||||||
@using System.Text.Encodings.Web
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
@inject IEmailSender<ApplicationUser> EmailSender
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
<PageTitle>Resend email confirmation</PageTitle>
|
|
||||||
|
|
||||||
<h1>Resend email confirmation</h1>
|
|
||||||
<h2>Enter your email.</h2>
|
|
||||||
<hr />
|
|
||||||
<StatusMessage Message="@message" />
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<EditForm Model="Input" FormName="resend-email-confirmation" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" aria-required="true" placeholder="name@example.com" />
|
|
||||||
<label for="Input.Email" class="form-label">Email</label>
|
|
||||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Resend</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? message;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var user = await UserManager.FindByEmailAsync(Input.Email!);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
message = "Verification email sent. Please check your email.";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var userId = await UserManager.GetUserIdAsync(user);
|
|
||||||
var code = await UserManager.GenerateEmailConfirmationTokenAsync(user);
|
|
||||||
code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code));
|
|
||||||
var callbackUrl = NavigationManager.GetUriWithQueryParameters(
|
|
||||||
NavigationManager.ToAbsoluteUri("Account/ConfirmEmail").AbsoluteUri,
|
|
||||||
new Dictionary<string, object?> { ["userId"] = userId, ["code"] = code });
|
|
||||||
await EmailSender.SendConfirmationLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl));
|
|
||||||
|
|
||||||
message = "Verification email sent. Please check your email.";
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
public string Email { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,103 +0,0 @@
|
||||||
@page "/Account/ResetPassword"
|
|
||||||
|
|
||||||
@using System.ComponentModel.DataAnnotations
|
|
||||||
@using System.Text
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using Microsoft.AspNetCore.WebUtilities
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
@inject UserManager<ApplicationUser> UserManager
|
|
||||||
|
|
||||||
<PageTitle>Reset password</PageTitle>
|
|
||||||
|
|
||||||
<h1>Reset password</h1>
|
|
||||||
<h2>Reset your password.</h2>
|
|
||||||
<hr />
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-4">
|
|
||||||
<StatusMessage Message="@Message" />
|
|
||||||
<EditForm Model="Input" FormName="reset-password" OnValidSubmit="OnValidSubmitAsync" method="post">
|
|
||||||
<DataAnnotationsValidator />
|
|
||||||
<ValidationSummary class="text-danger" role="alert" />
|
|
||||||
|
|
||||||
<input type="hidden" name="Input.Code" value="@Input.Code" />
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText @bind-Value="Input.Email" id="Input.Email" class="form-control" autocomplete="username" aria-required="true" placeholder="name@example.com" />
|
|
||||||
<label for="Input.Email" class="form-label">Email</label>
|
|
||||||
<ValidationMessage For="() => Input.Email" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.Password" id="Input.Password" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please enter your password." />
|
|
||||||
<label for="Input.Password" class="form-label">Password</label>
|
|
||||||
<ValidationMessage For="() => Input.Password" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<div class="form-floating mb-3">
|
|
||||||
<InputText type="password" @bind-Value="Input.ConfirmPassword" id="Input.ConfirmPassword" class="form-control" autocomplete="new-password" aria-required="true" placeholder="Please confirm your password." />
|
|
||||||
<label for="Input.ConfirmPassword" class="form-label">Confirm password</label>
|
|
||||||
<ValidationMessage For="() => Input.ConfirmPassword" class="text-danger" />
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="w-100 btn btn-lg btn-primary">Reset</button>
|
|
||||||
</EditForm>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private IEnumerable<IdentityError>? identityErrors;
|
|
||||||
|
|
||||||
[SupplyParameterFromForm]
|
|
||||||
private InputModel Input { get; set; } = new();
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? Code { get; set; }
|
|
||||||
|
|
||||||
private string? Message => identityErrors is null ? null : $"Error: {string.Join(", ", identityErrors.Select(error => error.Description))}";
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
if (Code is null)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("Account/InvalidPasswordReset");
|
|
||||||
}
|
|
||||||
|
|
||||||
Input.Code = Encoding.UTF8.GetString(WebEncoders.Base64UrlDecode(Code));
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task OnValidSubmitAsync()
|
|
||||||
{
|
|
||||||
var user = await UserManager.FindByEmailAsync(Input.Email);
|
|
||||||
if (user is null)
|
|
||||||
{
|
|
||||||
// Don't reveal that the user does not exist
|
|
||||||
RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
|
|
||||||
}
|
|
||||||
|
|
||||||
var result = await UserManager.ResetPasswordAsync(user, Input.Code, Input.Password);
|
|
||||||
if (result.Succeeded)
|
|
||||||
{
|
|
||||||
RedirectManager.RedirectTo("Account/ResetPasswordConfirmation");
|
|
||||||
}
|
|
||||||
|
|
||||||
identityErrors = result.Errors;
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class InputModel
|
|
||||||
{
|
|
||||||
[Required]
|
|
||||||
[EmailAddress]
|
|
||||||
public string Email { get; set; } = "";
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
[StringLength(100, ErrorMessage = "The {0} must be at least {2} and at max {1} characters long.", MinimumLength = 6)]
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
public string Password { get; set; } = "";
|
|
||||||
|
|
||||||
[DataType(DataType.Password)]
|
|
||||||
[Display(Name = "Confirm password")]
|
|
||||||
[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")]
|
|
||||||
public string ConfirmPassword { get; set; } = "";
|
|
||||||
|
|
||||||
[Required]
|
|
||||||
public string Code { get; set; } = "";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
@page "/Account/ResetPasswordConfirmation"
|
|
||||||
<PageTitle>Reset password confirmation</PageTitle>
|
|
||||||
|
|
||||||
<h1>Reset password confirmation</h1>
|
|
||||||
<p role="alert">
|
|
||||||
Your password has been reset. Please <a href="Account/Login">click here to log in</a>.
|
|
||||||
</p>
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
@using WorkTracker.Components.Account.Shared
|
|
||||||
@attribute [ExcludeFromInteractiveRouting]
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
@using Microsoft.AspNetCore.Authentication
|
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
@inject IdentityRedirectManager RedirectManager
|
|
||||||
|
|
||||||
@if (externalLogins.Length == 0)
|
|
||||||
{
|
|
||||||
<div>
|
|
||||||
<p>
|
|
||||||
There are no external authentication services configured. See this <a href="https://go.microsoft.com/fwlink/?LinkID=532715">article
|
|
||||||
about setting up this ASP.NET application to support logging in via external services</a>.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<form class="form-horizontal" action="Account/PerformExternalLogin" method="post">
|
|
||||||
<div>
|
|
||||||
<AntiforgeryToken />
|
|
||||||
<input type="hidden" name="ReturnUrl" value="@ReturnUrl" />
|
|
||||||
<p>
|
|
||||||
@foreach (var provider in externalLogins)
|
|
||||||
{
|
|
||||||
<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>
|
|
||||||
</form>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private AuthenticationScheme[] externalLogins = [];
|
|
||||||
|
|
||||||
[SupplyParameterFromQuery]
|
|
||||||
private string? ReturnUrl { get; set; }
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
externalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).ToArray();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
@inherits LayoutComponentBase
|
|
||||||
@layout WorkTracker.Components.Layout.MainLayout
|
|
||||||
|
|
||||||
<h1>Manage your account</h1>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<h2>Change your account settings</h2>
|
|
||||||
<hr />
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-lg-3">
|
|
||||||
<ManageNavMenu />
|
|
||||||
</div>
|
|
||||||
<div class="col-lg-9">
|
|
||||||
@Body
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
@using Microsoft.AspNetCore.Identity
|
|
||||||
@using WorkTracker.Data
|
|
||||||
|
|
||||||
@inject SignInManager<ApplicationUser> SignInManager
|
|
||||||
|
|
||||||
<ul class="nav nav-pills flex-column">
|
|
||||||
<li class="nav-item">
|
|
||||||
<NavLink class="nav-link" href="Account/Manage" Match="NavLinkMatch.All">Profile</NavLink>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item">
|
|
||||||
<NavLink class="nav-link" href="Account/Manage/Email">Email</NavLink>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item">
|
|
||||||
<NavLink class="nav-link" href="Account/Manage/ChangePassword">Password</NavLink>
|
|
||||||
</li>
|
|
||||||
@if (hasExternalLogins)
|
|
||||||
{
|
|
||||||
<li class="nav-item">
|
|
||||||
<NavLink class="nav-link" href="Account/Manage/ExternalLogins">External logins</NavLink>
|
|
||||||
</li>
|
|
||||||
}
|
|
||||||
<li class="nav-item">
|
|
||||||
<NavLink class="nav-link" href="Account/Manage/TwoFactorAuthentication">Two-factor authentication</NavLink>
|
|
||||||
</li>
|
|
||||||
<li class="nav-item">
|
|
||||||
<NavLink class="nav-link" href="Account/Manage/PersonalData">Personal data</NavLink>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private bool hasExternalLogins;
|
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
hasExternalLogins = (await SignInManager.GetExternalAuthenticationSchemesAsync()).Any();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
|
|
||||||
@code {
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
NavigationManager.NavigateTo($"Account/Login?returnUrl={Uri.EscapeDataString(NavigationManager.Uri)}", forceLoad: true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,28 +0,0 @@
|
||||||
<StatusMessage Message="@StatusMessage" />
|
|
||||||
<h3>Recovery codes</h3>
|
|
||||||
<div class="alert alert-warning" role="alert">
|
|
||||||
<p>
|
|
||||||
<strong>Put these codes in a safe place.</strong>
|
|
||||||
</p>
|
|
||||||
<p>
|
|
||||||
If you lose your device and don't have the recovery codes you will lose access to your account.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div class="row">
|
|
||||||
<div class="col-md-12">
|
|
||||||
@foreach (var recoveryCode in RecoveryCodes)
|
|
||||||
{
|
|
||||||
<div>
|
|
||||||
<code class="recovery-code">@recoveryCode</code>
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@code {
|
|
||||||
[Parameter]
|
|
||||||
public string[] RecoveryCodes { get; set; } = [];
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public string? StatusMessage { get; set; }
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
@if (!string.IsNullOrEmpty(DisplayMessage))
|
|
||||||
{
|
|
||||||
var statusMessageClass = DisplayMessage.StartsWith("Error") ? "danger" : "success";
|
|
||||||
<div class="alert alert-@statusMessageClass" role="alert">
|
|
||||||
@DisplayMessage
|
|
||||||
</div>
|
|
||||||
}
|
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? messageFromCookie;
|
|
||||||
|
|
||||||
[Parameter]
|
|
||||||
public string? Message { get; set; }
|
|
||||||
|
|
||||||
[CascadingParameter]
|
|
||||||
private HttpContext HttpContext { get; set; } = default!;
|
|
||||||
|
|
||||||
private string? DisplayMessage => Message ?? messageFromCookie;
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
messageFromCookie = HttpContext.Request.Cookies[IdentityRedirectManager.StatusCookieName];
|
|
||||||
|
|
||||||
if (messageFromCookie is not null)
|
|
||||||
{
|
|
||||||
HttpContext.Response.Cookies.Delete(IdentityRedirectManager.StatusCookieName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,8 +1,4 @@
|
||||||
@implements IDisposable
|
<div class="top-row ps-3 navbar navbar-dark">
|
||||||
|
|
||||||
@inject NavigationManager NavigationManager
|
|
||||||
|
|
||||||
<div class="top-row ps-3 navbar navbar-dark">
|
|
||||||
<div class="container-fluid">
|
<div class="container-fluid">
|
||||||
<a class="navbar-brand" href="">WorkTracker</a>
|
<a class="navbar-brand" href="">WorkTracker</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -27,14 +23,12 @@
|
||||||
<AuthorizeView>
|
<AuthorizeView>
|
||||||
<Authorized>
|
<Authorized>
|
||||||
<div class="nav-item px-3">
|
<div class="nav-item px-3">
|
||||||
<NavLink class="nav-link" href="Account/Manage">
|
<NavLink class="nav-link" href="auth">
|
||||||
<span class="bi bi-person-fill-nav-menu" aria-hidden="true"></span> @context.User.Identity?.Name
|
<span class="bi bi-person-fill-nav-menu" aria-hidden="true"></span> @context.User.Identity?.Name
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
<div class="nav-item px-3">
|
<div class="nav-item px-3">
|
||||||
<form action="Account/Logout" method="post">
|
<form action="/logout" method="post">
|
||||||
<AntiforgeryToken />
|
|
||||||
<input type="hidden" name="ReturnUrl" value="@currentUrl" />
|
|
||||||
<button type="submit" class="nav-link">
|
<button type="submit" class="nav-link">
|
||||||
<span class="bi bi-arrow-bar-left-nav-menu" aria-hidden="true"></span> Logout
|
<span class="bi bi-arrow-bar-left-nav-menu" aria-hidden="true"></span> Logout
|
||||||
</button>
|
</button>
|
||||||
|
|
@ -43,7 +37,7 @@
|
||||||
</Authorized>
|
</Authorized>
|
||||||
<NotAuthorized>
|
<NotAuthorized>
|
||||||
<div class="nav-item px-3">
|
<div class="nav-item px-3">
|
||||||
<NavLink class="nav-link" href="Account/Login">
|
<NavLink class="nav-link" href="login">
|
||||||
<span class="bi bi-person-badge-nav-menu" aria-hidden="true"></span> Login
|
<span class="bi bi-person-badge-nav-menu" aria-hidden="true"></span> Login
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -52,24 +46,4 @@
|
||||||
</nav>
|
</nav>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@code {
|
|
||||||
private string? currentUrl;
|
|
||||||
|
|
||||||
protected override void OnInitialized()
|
|
||||||
{
|
|
||||||
currentUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
|
|
||||||
NavigationManager.LocationChanged += OnLocationChanged;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
|
|
||||||
{
|
|
||||||
currentUrl = NavigationManager.ToBaseRelativePath(e.Location);
|
|
||||||
StateHasChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose()
|
|
||||||
{
|
|
||||||
NavigationManager.LocationChanged -= OnLocationChanged;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
||||||
46
Components/Pages/Login.razor
Normal file
46
Components/Pages/Login.razor
Normal file
|
|
@ -0,0 +1,46 @@
|
||||||
|
@page "/login"
|
||||||
|
@attribute [AllowAnonymous]
|
||||||
|
|
||||||
|
@using Microsoft.AspNetCore.Authorization
|
||||||
|
@using Microsoft.AspNetCore.Components
|
||||||
|
|
||||||
|
<PageTitle>Login</PageTitle>
|
||||||
|
|
||||||
|
<h1>Login</h1>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrWhiteSpace(Error))
|
||||||
|
{
|
||||||
|
<div class="alert alert-danger" role="alert">@Error</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<form method="post" action="/login" class="d-flex flex-column gap-3" style="max-width: 420px;">
|
||||||
|
<div>
|
||||||
|
<label for="email" class="form-label">Email</label>
|
||||||
|
<input id="email" name="email" value="@Email" autocomplete="username" class="form-control" required />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<label for="password" class="form-label">Password</label>
|
||||||
|
<input id="password" name="password" type="password" autocomplete="current-password" class="form-control" required />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<input type="hidden" name="returnUrl" value="@SafeReturnUrl" />
|
||||||
|
|
||||||
|
<button type="submit" class="btn btn-primary">Sign in</button>
|
||||||
|
</form>
|
||||||
|
|
||||||
|
@code {
|
||||||
|
[SupplyParameterFromQuery]
|
||||||
|
public string? ReturnUrl { get; set; }
|
||||||
|
|
||||||
|
[SupplyParameterFromQuery]
|
||||||
|
public string? Error { get; set; }
|
||||||
|
|
||||||
|
[SupplyParameterFromQuery]
|
||||||
|
public string? Email { get; set; }
|
||||||
|
|
||||||
|
private string SafeReturnUrl =>
|
||||||
|
string.IsNullOrWhiteSpace(ReturnUrl) || !Uri.IsWellFormedUriString(ReturnUrl, UriKind.Relative)
|
||||||
|
? "/"
|
||||||
|
: ReturnUrl;
|
||||||
|
}
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
@using WorkTracker.Components.Account.Shared
|
@using WorkTracker.Components.Shared
|
||||||
<Router AppAssembly="typeof(Program).Assembly">
|
<Router AppAssembly="typeof(Program).Assembly">
|
||||||
<Found Context="routeData">
|
<Found Context="routeData">
|
||||||
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
|
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.MainLayout)">
|
||||||
|
|
|
||||||
10
Components/Shared/RedirectToLogin.razor
Normal file
10
Components/Shared/RedirectToLogin.razor
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
@inject NavigationManager NavigationManager
|
||||||
|
|
||||||
|
@code {
|
||||||
|
protected override void OnInitialized()
|
||||||
|
{
|
||||||
|
var relativeReturnUrl = NavigationManager.ToBaseRelativePath(NavigationManager.Uri);
|
||||||
|
var loginUrl = $"/login?returnUrl={Uri.EscapeDataString("/" + relativeReturnUrl)}";
|
||||||
|
NavigationManager.NavigateTo(loginUrl, forceLoad: true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
|
|
||||||
namespace WorkTracker.Data;
|
|
||||||
|
|
||||||
public class ApplicationDbContext(DbContextOptions<ApplicationDbContext> options) : IdentityDbContext<ApplicationUser>(options)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
|
|
||||||
namespace WorkTracker.Data;
|
|
||||||
|
|
||||||
// Add profile data for application users by adding properties to the ApplicationUser class
|
|
||||||
public class ApplicationUser : IdentityUser
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,268 +0,0 @@
|
||||||
// <auto-generated />
|
|
||||||
using System;
|
|
||||||
using WorkTracker.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace WorkTracker.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(ApplicationDbContext))]
|
|
||||||
[Migration("00000000000000_CreateIdentitySchema")]
|
|
||||||
partial class CreateIdentitySchema
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
|
|
||||||
|
|
||||||
modelBuilder.Entity("WorkTracker.Data.ApplicationUser", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("Id")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<int>("AccessFailedCount")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("ConcurrencyStamp")
|
|
||||||
.IsConcurrencyToken()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Email")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<bool>("EmailConfirmed")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<bool>("LockoutEnabled")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<DateTimeOffset?>("LockoutEnd")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("NormalizedEmail")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("NormalizedUserName")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("PasswordHash")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("PhoneNumber")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<bool>("PhoneNumberConfirmed")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("SecurityStamp")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<bool>("TwoFactorEnabled")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("UserName")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("NormalizedEmail")
|
|
||||||
.HasDatabaseName("EmailIndex");
|
|
||||||
|
|
||||||
b.HasIndex("NormalizedUserName")
|
|
||||||
.IsUnique()
|
|
||||||
.HasDatabaseName("UserNameIndex");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUsers", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("Id")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ConcurrencyStamp")
|
|
||||||
.IsConcurrencyToken()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("NormalizedName")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("NormalizedName")
|
|
||||||
.IsUnique()
|
|
||||||
.HasDatabaseName("RoleNameIndex");
|
|
||||||
|
|
||||||
b.ToTable("AspNetRoles", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimType")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimValue")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("RoleId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("RoleId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetRoleClaims", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimType")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimValue")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("UserId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserClaims", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("LoginProvider")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ProviderKey")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ProviderDisplayName")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("LoginProvider", "ProviderKey");
|
|
||||||
|
|
||||||
b.HasIndex("UserId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserLogins", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("RoleId")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("UserId", "RoleId");
|
|
||||||
|
|
||||||
b.HasIndex("RoleId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserRoles", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("LoginProvider")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Value")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("UserId", "LoginProvider", "Name");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserTokens", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("RoleId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("RoleId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,222 +0,0 @@
|
||||||
using System;
|
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace WorkTracker.Migrations
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
public partial class CreateIdentitySchema : Migration
|
|
||||||
{
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Up(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetRoles",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
Name = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
|
|
||||||
NormalizedName = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
|
|
||||||
ConcurrencyStamp = table.Column<string>(type: "TEXT", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetRoles", x => x.Id);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetUsers",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
UserName = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
|
|
||||||
NormalizedUserName = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
|
|
||||||
Email = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
|
|
||||||
NormalizedEmail = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
|
|
||||||
EmailConfirmed = table.Column<bool>(type: "INTEGER", nullable: false),
|
|
||||||
PasswordHash = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
SecurityStamp = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
ConcurrencyStamp = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
PhoneNumber = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
PhoneNumberConfirmed = table.Column<bool>(type: "INTEGER", nullable: false),
|
|
||||||
TwoFactorEnabled = table.Column<bool>(type: "INTEGER", nullable: false),
|
|
||||||
LockoutEnd = table.Column<DateTimeOffset>(type: "TEXT", nullable: true),
|
|
||||||
LockoutEnabled = table.Column<bool>(type: "INTEGER", nullable: false),
|
|
||||||
AccessFailedCount = table.Column<int>(type: "INTEGER", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetUsers", x => x.Id);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetRoleClaims",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "INTEGER", nullable: false)
|
|
||||||
.Annotation("Sqlite:Autoincrement", true),
|
|
||||||
RoleId = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
ClaimType = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
ClaimValue = table.Column<string>(type: "TEXT", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
|
|
||||||
column: x => x.RoleId,
|
|
||||||
principalTable: "AspNetRoles",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetUserClaims",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
Id = table.Column<int>(type: "INTEGER", nullable: false)
|
|
||||||
.Annotation("Sqlite:Autoincrement", true),
|
|
||||||
UserId = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
ClaimType = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
ClaimValue = table.Column<string>(type: "TEXT", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_AspNetUserClaims_AspNetUsers_UserId",
|
|
||||||
column: x => x.UserId,
|
|
||||||
principalTable: "AspNetUsers",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetUserLogins",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
LoginProvider = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
ProviderKey = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
ProviderDisplayName = table.Column<string>(type: "TEXT", nullable: true),
|
|
||||||
UserId = table.Column<string>(type: "TEXT", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_AspNetUserLogins_AspNetUsers_UserId",
|
|
||||||
column: x => x.UserId,
|
|
||||||
principalTable: "AspNetUsers",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetUserRoles",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
UserId = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
RoleId = table.Column<string>(type: "TEXT", nullable: false)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
|
|
||||||
column: x => x.RoleId,
|
|
||||||
principalTable: "AspNetRoles",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_AspNetUserRoles_AspNetUsers_UserId",
|
|
||||||
column: x => x.UserId,
|
|
||||||
principalTable: "AspNetUsers",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
|
||||||
name: "AspNetUserTokens",
|
|
||||||
columns: table => new
|
|
||||||
{
|
|
||||||
UserId = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
LoginProvider = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
Name = table.Column<string>(type: "TEXT", nullable: false),
|
|
||||||
Value = table.Column<string>(type: "TEXT", nullable: true)
|
|
||||||
},
|
|
||||||
constraints: table =>
|
|
||||||
{
|
|
||||||
table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
|
|
||||||
table.ForeignKey(
|
|
||||||
name: "FK_AspNetUserTokens_AspNetUsers_UserId",
|
|
||||||
column: x => x.UserId,
|
|
||||||
principalTable: "AspNetUsers",
|
|
||||||
principalColumn: "Id",
|
|
||||||
onDelete: ReferentialAction.Cascade);
|
|
||||||
});
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_AspNetRoleClaims_RoleId",
|
|
||||||
table: "AspNetRoleClaims",
|
|
||||||
column: "RoleId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "RoleNameIndex",
|
|
||||||
table: "AspNetRoles",
|
|
||||||
column: "NormalizedName",
|
|
||||||
unique: true);
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_AspNetUserClaims_UserId",
|
|
||||||
table: "AspNetUserClaims",
|
|
||||||
column: "UserId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_AspNetUserLogins_UserId",
|
|
||||||
table: "AspNetUserLogins",
|
|
||||||
column: "UserId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "IX_AspNetUserRoles_RoleId",
|
|
||||||
table: "AspNetUserRoles",
|
|
||||||
column: "RoleId");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "EmailIndex",
|
|
||||||
table: "AspNetUsers",
|
|
||||||
column: "NormalizedEmail");
|
|
||||||
|
|
||||||
migrationBuilder.CreateIndex(
|
|
||||||
name: "UserNameIndex",
|
|
||||||
table: "AspNetUsers",
|
|
||||||
column: "NormalizedUserName",
|
|
||||||
unique: true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <inheritdoc />
|
|
||||||
protected override void Down(MigrationBuilder migrationBuilder)
|
|
||||||
{
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetRoleClaims");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetUserClaims");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetUserLogins");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetUserRoles");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetUserTokens");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetRoles");
|
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
|
||||||
name: "AspNetUsers");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,265 +0,0 @@
|
||||||
// <auto-generated />
|
|
||||||
using System;
|
|
||||||
using WorkTracker.Data;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
|
||||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
namespace WorkTracker.Migrations
|
|
||||||
{
|
|
||||||
[DbContext(typeof(ApplicationDbContext))]
|
|
||||||
partial class ApplicationDbContextModelSnapshot : ModelSnapshot
|
|
||||||
{
|
|
||||||
protected override void BuildModel(ModelBuilder modelBuilder)
|
|
||||||
{
|
|
||||||
#pragma warning disable 612, 618
|
|
||||||
modelBuilder.HasAnnotation("ProductVersion", "8.0.0");
|
|
||||||
|
|
||||||
modelBuilder.Entity("WorkTracker.Data.ApplicationUser", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("Id")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<int>("AccessFailedCount")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("ConcurrencyStamp")
|
|
||||||
.IsConcurrencyToken()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Email")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<bool>("EmailConfirmed")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<bool>("LockoutEnabled")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<DateTimeOffset?>("LockoutEnd")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("NormalizedEmail")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("NormalizedUserName")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("PasswordHash")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("PhoneNumber")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<bool>("PhoneNumberConfirmed")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("SecurityStamp")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<bool>("TwoFactorEnabled")
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("UserName")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("NormalizedEmail")
|
|
||||||
.HasDatabaseName("EmailIndex");
|
|
||||||
|
|
||||||
b.HasIndex("NormalizedUserName")
|
|
||||||
.IsUnique()
|
|
||||||
.HasDatabaseName("UserNameIndex");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUsers", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("Id")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ConcurrencyStamp")
|
|
||||||
.IsConcurrencyToken()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("NormalizedName")
|
|
||||||
.HasMaxLength(256)
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("NormalizedName")
|
|
||||||
.IsUnique()
|
|
||||||
.HasDatabaseName("RoleNameIndex");
|
|
||||||
|
|
||||||
b.ToTable("AspNetRoles", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimType")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimValue")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("RoleId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("RoleId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetRoleClaims", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<int>("Id")
|
|
||||||
.ValueGeneratedOnAdd()
|
|
||||||
.HasColumnType("INTEGER");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimType")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ClaimValue")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("Id");
|
|
||||||
|
|
||||||
b.HasIndex("UserId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserClaims", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("LoginProvider")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ProviderKey")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("ProviderDisplayName")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.IsRequired()
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("LoginProvider", "ProviderKey");
|
|
||||||
|
|
||||||
b.HasIndex("UserId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserLogins", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("RoleId")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("UserId", "RoleId");
|
|
||||||
|
|
||||||
b.HasIndex("RoleId");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserRoles", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
|
|
||||||
{
|
|
||||||
b.Property<string>("UserId")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("LoginProvider")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Name")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.Property<string>("Value")
|
|
||||||
.HasColumnType("TEXT");
|
|
||||||
|
|
||||||
b.HasKey("UserId", "LoginProvider", "Name");
|
|
||||||
|
|
||||||
b.ToTable("AspNetUserTokens", (string)null);
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("RoleId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("RoleId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
|
|
||||||
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
|
|
||||||
{
|
|
||||||
b.HasOne("WorkTracker.Data.ApplicationUser", null)
|
|
||||||
.WithMany()
|
|
||||||
.HasForeignKey("UserId")
|
|
||||||
.OnDelete(DeleteBehavior.Cascade)
|
|
||||||
.IsRequired();
|
|
||||||
});
|
|
||||||
#pragma warning restore 612, 618
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
16
Dockerfile
16
Dockerfile
|
|
@ -1,4 +1,16 @@
|
||||||
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
|
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS dev
|
||||||
|
WORKDIR /workspace
|
||||||
|
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends curl procps unzip wget \
|
||||||
|
&& rm -rf /var/lib/apt/lists/* \
|
||||||
|
&& curl -fsSL https://aka.ms/getvsdbgsh | bash /dev/stdin -v latest -l /vsdbg
|
||||||
|
|
||||||
|
ENV ASPNETCORE_URLS=http://+:8080
|
||||||
|
|
||||||
|
EXPOSE 8080
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble AS build
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|
||||||
COPY ["WorkTracker.csproj", "./"]
|
COPY ["WorkTracker.csproj", "./"]
|
||||||
|
|
@ -7,7 +19,7 @@ RUN dotnet restore "WorkTracker.csproj"
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN dotnet publish "WorkTracker.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
RUN dotnet publish "WorkTracker.csproj" -c Release -o /app/publish /p:UseAppHost=false
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS final
|
FROM mcr.microsoft.com/dotnet/aspnet:10.0-noble AS final
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
|
|
|
||||||
88
Program.cs
88
Program.cs
|
|
@ -1,14 +1,13 @@
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Security.Claims;
|
||||||
|
using Microsoft.AspNetCore.Authentication;
|
||||||
|
using Microsoft.AspNetCore.Authentication.Cookies;
|
||||||
using Microsoft.AspNetCore.Components.Authorization;
|
using Microsoft.AspNetCore.Components.Authorization;
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.AspNetCore.Localization;
|
using Microsoft.AspNetCore.Localization;
|
||||||
using Microsoft.EntityFrameworkCore;
|
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using WorkTracker.Components;
|
using WorkTracker.Components;
|
||||||
using WorkTracker.Components.Account;
|
|
||||||
using WorkTracker.Configuration;
|
using WorkTracker.Configuration;
|
||||||
using WorkTracker.Data;
|
|
||||||
using WorkTracker.Services.Auth;
|
using WorkTracker.Services.Auth;
|
||||||
using WorkTracker.Services.Festivities;
|
using WorkTracker.Services.Festivities;
|
||||||
using WorkTracker.Services.Settings;
|
using WorkTracker.Services.Settings;
|
||||||
|
|
@ -20,28 +19,18 @@ builder.Services.AddRazorComponents()
|
||||||
.AddInteractiveServerComponents();
|
.AddInteractiveServerComponents();
|
||||||
|
|
||||||
builder.Services.AddCascadingAuthenticationState();
|
builder.Services.AddCascadingAuthenticationState();
|
||||||
builder.Services.AddScoped<IdentityUserAccessor>();
|
builder.Services.AddAuthorization();
|
||||||
builder.Services.AddScoped<IdentityRedirectManager>();
|
|
||||||
builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
|
|
||||||
|
|
||||||
builder.Services.AddAuthentication(options =>
|
builder.Services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme)
|
||||||
|
.AddCookie(options =>
|
||||||
{
|
{
|
||||||
options.DefaultScheme = IdentityConstants.ApplicationScheme;
|
options.LoginPath = "/login";
|
||||||
options.DefaultSignInScheme = IdentityConstants.ExternalScheme;
|
options.LogoutPath = "/logout";
|
||||||
})
|
options.AccessDeniedPath = "/login";
|
||||||
.AddIdentityCookies();
|
options.SlidingExpiration = true;
|
||||||
|
options.ExpireTimeSpan = TimeSpan.FromDays(14);
|
||||||
|
});
|
||||||
|
|
||||||
var connectionString = builder.Configuration.GetConnectionString("DefaultConnection") ?? throw new InvalidOperationException("Connection string 'DefaultConnection' not found.");
|
|
||||||
builder.Services.AddDbContext<ApplicationDbContext>(options =>
|
|
||||||
options.UseSqlite(connectionString));
|
|
||||||
builder.Services.AddDatabaseDeveloperPageExceptionFilter();
|
|
||||||
|
|
||||||
builder.Services.AddIdentityCore<ApplicationUser>(options => options.SignIn.RequireConfirmedAccount = false)
|
|
||||||
.AddEntityFrameworkStores<ApplicationDbContext>()
|
|
||||||
.AddSignInManager()
|
|
||||||
.AddDefaultTokenProviders();
|
|
||||||
|
|
||||||
builder.Services.AddSingleton<IEmailSender<ApplicationUser>, IdentityNoOpEmailSender>();
|
|
||||||
builder.Services.AddLocalization();
|
builder.Services.AddLocalization();
|
||||||
|
|
||||||
builder.Services.Configure<MongoDbOptions>(builder.Configuration.GetSection(MongoDbOptions.SectionName));
|
builder.Services.Configure<MongoDbOptions>(builder.Configuration.GetSection(MongoDbOptions.SectionName));
|
||||||
|
|
@ -61,6 +50,7 @@ builder.Services.AddSingleton(sp =>
|
||||||
});
|
});
|
||||||
|
|
||||||
builder.Services.AddScoped<IAppSettingsService, MongoAppSettingsService>();
|
builder.Services.AddScoped<IAppSettingsService, MongoAppSettingsService>();
|
||||||
|
builder.Services.AddSingleton<IMongoAuthService, MongoAuthService>();
|
||||||
builder.Services.AddSingleton<IItalianFestivitySource, ItalianFestivitySource>();
|
builder.Services.AddSingleton<IItalianFestivitySource, ItalianFestivitySource>();
|
||||||
builder.Services.AddHostedService<SingleUserSeedService>();
|
builder.Services.AddHostedService<SingleUserSeedService>();
|
||||||
|
|
||||||
|
|
@ -78,11 +68,7 @@ var localizationOptions = new RequestLocalizationOptions
|
||||||
};
|
};
|
||||||
|
|
||||||
// Configure the HTTP request pipeline.
|
// Configure the HTTP request pipeline.
|
||||||
if (app.Environment.IsDevelopment())
|
if (!app.Environment.IsDevelopment())
|
||||||
{
|
|
||||||
app.UseMigrationsEndPoint();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
app.UseExceptionHandler("/Error", createScopeForErrors: true);
|
app.UseExceptionHandler("/Error", createScopeForErrors: true);
|
||||||
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
|
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
|
||||||
|
|
@ -97,13 +83,53 @@ if (useHttpsRedirection)
|
||||||
|
|
||||||
app.UseRequestLocalization(localizationOptions);
|
app.UseRequestLocalization(localizationOptions);
|
||||||
|
|
||||||
|
app.UseAuthentication();
|
||||||
|
app.UseAuthorization();
|
||||||
|
|
||||||
app.UseAntiforgery();
|
app.UseAntiforgery();
|
||||||
|
|
||||||
|
app.MapPost("/login", async (HttpContext context, IMongoAuthService authService) =>
|
||||||
|
{
|
||||||
|
var form = await context.Request.ReadFormAsync();
|
||||||
|
var email = form["email"].ToString();
|
||||||
|
var password = form["password"].ToString();
|
||||||
|
var returnUrl = form["returnUrl"].ToString();
|
||||||
|
|
||||||
|
if (string.IsNullOrWhiteSpace(email) || string.IsNullOrWhiteSpace(password))
|
||||||
|
{
|
||||||
|
return TypedResults.LocalRedirect($"/login?error=Missing%20credentials&returnUrl={Uri.EscapeDataString(returnUrl)}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = await authService.ValidateCredentialsAsync(email, password, context.RequestAborted);
|
||||||
|
if (user is null)
|
||||||
|
{
|
||||||
|
return TypedResults.LocalRedirect($"/login?error=Invalid%20credentials&returnUrl={Uri.EscapeDataString(returnUrl)}");
|
||||||
|
}
|
||||||
|
|
||||||
|
var claims = new List<Claim>
|
||||||
|
{
|
||||||
|
new(ClaimTypes.NameIdentifier, user.Id),
|
||||||
|
new(ClaimTypes.Name, user.Email)
|
||||||
|
};
|
||||||
|
|
||||||
|
var principal = new ClaimsPrincipal(new ClaimsIdentity(claims, CookieAuthenticationDefaults.AuthenticationScheme));
|
||||||
|
await context.SignInAsync(CookieAuthenticationDefaults.AuthenticationScheme, principal);
|
||||||
|
|
||||||
|
var safeReturnUrl = string.IsNullOrWhiteSpace(returnUrl) || !Uri.IsWellFormedUriString(returnUrl, UriKind.Relative)
|
||||||
|
? "/"
|
||||||
|
: returnUrl;
|
||||||
|
|
||||||
|
return TypedResults.LocalRedirect(safeReturnUrl);
|
||||||
|
}).DisableAntiforgery();
|
||||||
|
|
||||||
|
app.MapPost("/logout", async (HttpContext context) =>
|
||||||
|
{
|
||||||
|
await context.SignOutAsync(CookieAuthenticationDefaults.AuthenticationScheme);
|
||||||
|
return TypedResults.LocalRedirect("/login");
|
||||||
|
}).DisableAntiforgery();
|
||||||
|
|
||||||
app.MapStaticAssets();
|
app.MapStaticAssets();
|
||||||
app.MapRazorComponents<App>()
|
app.MapRazorComponents<App>()
|
||||||
.AddInteractiveServerRenderMode();
|
.AddInteractiveServerRenderMode();
|
||||||
|
|
||||||
// Add additional endpoints required by the Identity /Account Razor components.
|
|
||||||
app.MapAdditionalIdentityEndpoints();
|
|
||||||
|
|
||||||
app.Run();
|
app.Run();
|
||||||
|
|
|
||||||
|
|
@ -1,23 +1,33 @@
|
||||||
{
|
{
|
||||||
"$schema": "https://json.schemastore.org/launchsettings.json",
|
"profiles": {
|
||||||
"profiles": {
|
"http": {
|
||||||
"http": {
|
"commandName": "Project",
|
||||||
"commandName": "Project",
|
"launchBrowser": true,
|
||||||
"dotnetRunMessages": true,
|
"environmentVariables": {
|
||||||
"launchBrowser": true,
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
"applicationUrl": "http://localhost:5159",
|
|
||||||
"environmentVariables": {
|
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
|
||||||
}
|
|
||||||
},
|
},
|
||||||
"https": {
|
"dotnetRunMessages": true,
|
||||||
"commandName": "Project",
|
"applicationUrl": "http://localhost:5159"
|
||||||
"dotnetRunMessages": true,
|
},
|
||||||
"launchBrowser": true,
|
"https": {
|
||||||
"applicationUrl": "https://localhost:7021;http://localhost:5159",
|
"commandName": "Project",
|
||||||
"environmentVariables": {
|
"launchBrowser": true,
|
||||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
"environmentVariables": {
|
||||||
}
|
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||||
}
|
},
|
||||||
|
"dotnetRunMessages": true,
|
||||||
|
"applicationUrl": "https://localhost:7021;http://localhost:5159"
|
||||||
|
},
|
||||||
|
"WSL": {
|
||||||
|
"commandName": "WSL2",
|
||||||
|
"launchBrowser": true,
|
||||||
|
"launchUrl": "https://localhost:7021",
|
||||||
|
"environmentVariables": {
|
||||||
|
"ASPNETCORE_ENVIRONMENT": "Development",
|
||||||
|
"ASPNETCORE_URLS": "https://localhost:7021;http://localhost:5159"
|
||||||
|
},
|
||||||
|
"distributionName": ""
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
|
"$schema": "https://json.schemastore.org/launchsettings.json"
|
||||||
|
}
|
||||||
35
README.Docker.md
Normal file
35
README.Docker.md
Normal file
|
|
@ -0,0 +1,35 @@
|
||||||
|
Running and debugging with Docker (includes MongoDB)
|
||||||
|
|
||||||
|
Quick run (Docker Engine required):
|
||||||
|
|
||||||
|
1. Build and start services:
|
||||||
|
|
||||||
|
docker compose up --build
|
||||||
|
|
||||||
|
2. App will be available on host port 8002 -> container 8080 (http://localhost:8002).
|
||||||
|
|
||||||
|
Development in VS Code (F5):
|
||||||
|
|
||||||
|
- The repository uses `docker-compose.yml` plus `docker-compose.override.yml` as the single development stack.
|
||||||
|
- The override file switches the app container to the SDK-based `dev` image, mounts the workspace into `/workspace`, installs `vsdbg`, and runs `dotnet watch`.
|
||||||
|
- Press F5 in VS Code with the `Docker: Attach .NET in Compose - F5` configuration selected.
|
||||||
|
- VS Code starts Docker Compose, waits for `http://localhost:8002`, opens the browser, and attaches the debugger to the `worktracker-dev` container.
|
||||||
|
|
||||||
|
Manual development start:
|
||||||
|
|
||||||
|
- `docker compose up --build`
|
||||||
|
|
||||||
|
Manual shutdown:
|
||||||
|
|
||||||
|
- `docker compose down`
|
||||||
|
|
||||||
|
MongoDB:
|
||||||
|
|
||||||
|
- The compose stack includes a `mongo` service and a named volume `mongo_data` for persistence.
|
||||||
|
- The app uses `MongoDb__ConnectionString: mongodb://mongo:27017` inside the compose network.
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
|
||||||
|
- The base compose file remains production-oriented; the override file is the development/debug layer that VS Code uses automatically.
|
||||||
|
- The first container build takes longer because the dev image installs the .NET debugger.
|
||||||
|
- The Dockerfile pins the .NET 10 images to the `*-noble` tags because the generic `10.0` SDK tag does not provide a usable SDK in this environment.
|
||||||
10
Services/Auth/IMongoAuthService.cs
Normal file
10
Services/Auth/IMongoAuthService.cs
Normal file
|
|
@ -0,0 +1,10 @@
|
||||||
|
using System.Threading;
|
||||||
|
|
||||||
|
namespace WorkTracker.Services.Auth;
|
||||||
|
|
||||||
|
public interface IMongoAuthService
|
||||||
|
{
|
||||||
|
Task EnsureSeedUserAsync(CancellationToken cancellationToken);
|
||||||
|
|
||||||
|
Task<MongoAuthUser?> ValidateCredentialsAsync(string email, string password, CancellationToken cancellationToken);
|
||||||
|
}
|
||||||
77
Services/Auth/MongoAuthService.cs
Normal file
77
Services/Auth/MongoAuthService.cs
Normal file
|
|
@ -0,0 +1,77 @@
|
||||||
|
using Microsoft.AspNetCore.Identity;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using MongoDB.Driver;
|
||||||
|
using WorkTracker.Configuration;
|
||||||
|
|
||||||
|
namespace WorkTracker.Services.Auth;
|
||||||
|
|
||||||
|
public sealed class MongoAuthService : IMongoAuthService
|
||||||
|
{
|
||||||
|
private const string UsersCollectionName = "users";
|
||||||
|
|
||||||
|
private readonly IMongoCollection<MongoAuthUser> users;
|
||||||
|
private readonly PasswordHasher<MongoAuthUser> passwordHasher = new();
|
||||||
|
private readonly IOptions<SingleUserOptions> options;
|
||||||
|
private readonly ILogger<MongoAuthService> logger;
|
||||||
|
|
||||||
|
public MongoAuthService(
|
||||||
|
IMongoDatabase database,
|
||||||
|
IOptions<SingleUserOptions> options,
|
||||||
|
ILogger<MongoAuthService> logger)
|
||||||
|
{
|
||||||
|
users = database.GetCollection<MongoAuthUser>(UsersCollectionName);
|
||||||
|
this.options = options;
|
||||||
|
this.logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task EnsureSeedUserAsync(CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var email = options.Value.Email.Trim();
|
||||||
|
var normalizedEmail = NormalizeEmail(email);
|
||||||
|
|
||||||
|
var existingUser = await users
|
||||||
|
.Find(x => x.EmailNormalized == normalizedEmail)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (existingUser is not null)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var user = new MongoAuthUser
|
||||||
|
{
|
||||||
|
Email = email,
|
||||||
|
EmailNormalized = normalizedEmail,
|
||||||
|
PasswordHash = string.Empty
|
||||||
|
};
|
||||||
|
|
||||||
|
var passwordHash = passwordHasher.HashPassword(user, options.Value.Password);
|
||||||
|
var userToCreate = new MongoAuthUser
|
||||||
|
{
|
||||||
|
Email = email,
|
||||||
|
EmailNormalized = normalizedEmail,
|
||||||
|
PasswordHash = passwordHash
|
||||||
|
};
|
||||||
|
|
||||||
|
await users.InsertOneAsync(userToCreate, cancellationToken: cancellationToken);
|
||||||
|
logger.LogInformation("Seeded single user account {Email} in MongoDB", email);
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<MongoAuthUser?> ValidateCredentialsAsync(string email, string password, CancellationToken cancellationToken)
|
||||||
|
{
|
||||||
|
var normalizedEmail = NormalizeEmail(email);
|
||||||
|
var user = await users
|
||||||
|
.Find(x => x.EmailNormalized == normalizedEmail)
|
||||||
|
.FirstOrDefaultAsync(cancellationToken);
|
||||||
|
|
||||||
|
if (user is null)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var result = passwordHasher.VerifyHashedPassword(user, user.PasswordHash, password);
|
||||||
|
return result == PasswordVerificationResult.Failed ? null : user;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string NormalizeEmail(string email) => email.Trim().ToUpperInvariant();
|
||||||
|
}
|
||||||
20
Services/Auth/MongoAuthUser.cs
Normal file
20
Services/Auth/MongoAuthUser.cs
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
using MongoDB.Bson;
|
||||||
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
|
|
||||||
|
namespace WorkTracker.Services.Auth;
|
||||||
|
|
||||||
|
public sealed class MongoAuthUser
|
||||||
|
{
|
||||||
|
[BsonId]
|
||||||
|
[BsonRepresentation(BsonType.ObjectId)]
|
||||||
|
public string Id { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
[BsonElement("email")]
|
||||||
|
public string Email { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
[BsonElement("emailNormalized")]
|
||||||
|
public string EmailNormalized { get; init; } = string.Empty;
|
||||||
|
|
||||||
|
[BsonElement("passwordHash")]
|
||||||
|
public string PasswordHash { get; init; } = string.Empty;
|
||||||
|
}
|
||||||
|
|
@ -1,22 +1,20 @@
|
||||||
using Microsoft.AspNetCore.Identity;
|
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using WorkTracker.Configuration;
|
using WorkTracker.Configuration;
|
||||||
using WorkTracker.Data;
|
|
||||||
|
|
||||||
namespace WorkTracker.Services.Auth;
|
namespace WorkTracker.Services.Auth;
|
||||||
|
|
||||||
public sealed class SingleUserSeedService : IHostedService
|
public sealed class SingleUserSeedService : IHostedService
|
||||||
{
|
{
|
||||||
private readonly IServiceProvider serviceProvider;
|
private readonly IMongoAuthService authService;
|
||||||
private readonly IOptions<SingleUserOptions> options;
|
private readonly IOptions<SingleUserOptions> options;
|
||||||
private readonly ILogger<SingleUserSeedService> logger;
|
private readonly ILogger<SingleUserSeedService> logger;
|
||||||
|
|
||||||
public SingleUserSeedService(
|
public SingleUserSeedService(
|
||||||
IServiceProvider serviceProvider,
|
IMongoAuthService authService,
|
||||||
IOptions<SingleUserOptions> options,
|
IOptions<SingleUserOptions> options,
|
||||||
ILogger<SingleUserSeedService> logger)
|
ILogger<SingleUserSeedService> logger)
|
||||||
{
|
{
|
||||||
this.serviceProvider = serviceProvider;
|
this.authService = authService;
|
||||||
this.options = options;
|
this.options = options;
|
||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
}
|
}
|
||||||
|
|
@ -28,33 +26,14 @@ public sealed class SingleUserSeedService : IHostedService
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
using var scope = serviceProvider.CreateScope();
|
try
|
||||||
var userManager = scope.ServiceProvider.GetRequiredService<UserManager<ApplicationUser>>();
|
|
||||||
|
|
||||||
var configuredEmail = options.Value.Email;
|
|
||||||
var existingUser = await userManager.FindByEmailAsync(configuredEmail);
|
|
||||||
|
|
||||||
if (existingUser is not null)
|
|
||||||
{
|
{
|
||||||
return;
|
await authService.EnsureSeedUserAsync(cancellationToken);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
var user = new ApplicationUser
|
|
||||||
{
|
{
|
||||||
UserName = configuredEmail,
|
logger.LogError(ex, "Unable to seed MongoDB single user account {Email}", options.Value.Email);
|
||||||
Email = configuredEmail,
|
|
||||||
EmailConfirmed = true
|
|
||||||
};
|
|
||||||
|
|
||||||
var result = await userManager.CreateAsync(user, options.Value.Password);
|
|
||||||
if (!result.Succeeded)
|
|
||||||
{
|
|
||||||
var errors = string.Join("; ", result.Errors.Select(x => x.Description));
|
|
||||||
logger.LogError("Unable to seed single user account {Email}. Errors: {Errors}", configuredEmail, errors);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.LogInformation("Seeded single user account {Email}", configuredEmail);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask;
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,13 @@
|
||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net9.0</TargetFramework>
|
<TargetFramework>net10.0</TargetFramework>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<UserSecretsId>aspnet-WorkTracker-28f934c3-03b2-413d-afbf-a5edbadc5530</UserSecretsId>
|
<UserSecretsId>aspnet-WorkTracker-28f934c3-03b2-413d-afbf-a5edbadc5530</UserSecretsId>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Update="Data\app.db" CopyToOutputDirectory="PreserveNewest" ExcludeFromSingleFile="true" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="9.0.13" />
|
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.13" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.13" />
|
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.13" />
|
|
||||||
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
|
<PackageReference Include="MongoDB.Driver" Version="3.5.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,4 @@
|
||||||
{
|
{
|
||||||
"ConnectionStrings": {
|
|
||||||
"DefaultConnection": "Data Source=Data/app.db;Cache=Shared"
|
|
||||||
},
|
|
||||||
"MongoDb": {
|
"MongoDb": {
|
||||||
"ConnectionString": "mongodb://localhost:27017",
|
"ConnectionString": "mongodb://localhost:27017",
|
||||||
"DatabaseName": "worktracker"
|
"DatabaseName": "worktracker"
|
||||||
|
|
|
||||||
23
docker-compose.override.yml
Normal file
23
docker-compose.override.yml
Normal file
|
|
@ -0,0 +1,23 @@
|
||||||
|
services:
|
||||||
|
worktracker:
|
||||||
|
image: worktracker-dev:latest
|
||||||
|
build:
|
||||||
|
context: .
|
||||||
|
dockerfile: Dockerfile
|
||||||
|
target: dev
|
||||||
|
container_name: worktracker-dev
|
||||||
|
environment:
|
||||||
|
ASPNETCORE_ENVIRONMENT: Development
|
||||||
|
ASPNETCORE_URLS: http://+:8080
|
||||||
|
MongoDb__ConnectionString: mongodb://mongo:27017
|
||||||
|
UseHttpsRedirection: "false"
|
||||||
|
DOTNET_USE_POLLING_FILE_WATCHER: "1"
|
||||||
|
volumes:
|
||||||
|
- ./:/workspace:cached
|
||||||
|
working_dir: /workspace
|
||||||
|
entrypoint: ["dotnet"]
|
||||||
|
command: ["watch", "run", "--no-launch-profile", "--project", "WorkTracker.csproj", "--urls", "http://+:8080"]
|
||||||
|
ports:
|
||||||
|
- "8002:8080"
|
||||||
|
depends_on:
|
||||||
|
- mongo
|
||||||
|
|
@ -7,14 +7,11 @@ services:
|
||||||
environment:
|
environment:
|
||||||
ASPNETCORE_ENVIRONMENT: Production
|
ASPNETCORE_ENVIRONMENT: Production
|
||||||
UseHttpsRedirection: "false"
|
UseHttpsRedirection: "false"
|
||||||
ConnectionStrings__DefaultConnection: Data Source=/app/Data/app.db;Cache=Shared
|
|
||||||
MongoDb__ConnectionString: mongodb://mongo:27017
|
MongoDb__ConnectionString: mongodb://mongo:27017
|
||||||
ports:
|
ports:
|
||||||
- "8002:8080"
|
- "8002:8080"
|
||||||
depends_on:
|
depends_on:
|
||||||
- mongo
|
- mongo
|
||||||
volumes:
|
|
||||||
- worktracker_data:/app/Data
|
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/ >/dev/null 2>&1 || exit 1"]
|
test: ["CMD-SHELL", "wget -qO- http://127.0.0.1:8080/ >/dev/null 2>&1 || exit 1"]
|
||||||
|
|
@ -29,5 +26,4 @@ services:
|
||||||
- mongo_data:/data/db
|
- mongo_data:/data/db
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
worktracker_data:
|
|
||||||
mongo_data:
|
mongo_data:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue