diff --git a/src/AliasVault.Admin2/Account/Pages/ForgotPassword.razor b/src/AliasVault.Admin2/Account/Pages/ForgotPassword.razor deleted file mode 100644 index d98ad2dc0..000000000 --- a/src/AliasVault.Admin2/Account/Pages/ForgotPassword.razor +++ /dev/null @@ -1,65 +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 - -@inject UserManager UserManager -@inject IEmailSender EmailSender -@inject NavigationManager NavigationManager -@inject IdentityRedirectManager RedirectManager - -Forgot your password? - -

Forgot your password?

-

Enter your email.

-
-
-
- - - - -
- - - -
- - -
-
- -@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 { ["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; } = ""; - } - -} diff --git a/src/AliasVault.Admin2/Account/Pages/ForgotPasswordConfirmation.razor b/src/AliasVault.Admin2/Account/Pages/ForgotPasswordConfirmation.razor deleted file mode 100644 index 836d3fe77..000000000 --- a/src/AliasVault.Admin2/Account/Pages/ForgotPasswordConfirmation.razor +++ /dev/null @@ -1,8 +0,0 @@ -@page "/Account/ForgotPasswordConfirmation" - -Forgot password confirmation - -

Forgot password confirmation

-

- Please check your email to reset your password. -

diff --git a/src/AliasVault.Admin2/Account/Pages/Login.razor b/src/AliasVault.Admin2/Account/Pages/Login.razor deleted file mode 100644 index 4aef5cb22..000000000 --- a/src/AliasVault.Admin2/Account/Pages/Login.razor +++ /dev/null @@ -1,114 +0,0 @@ -@page "/user/login" - -@using System.ComponentModel.DataAnnotations -@using Microsoft.AspNetCore.Authentication -@using Microsoft.AspNetCore.Identity - -@inject SignInManager SignInManager -@inject ILogger Logger -@inject NavigationManager NavigationManager -@inject IdentityRedirectManager RedirectManager - -Log in - -

Log in

-
-
-
- - - -
- -
- - - -
-
- - - -
-
- -
-
- -
- - -
-
-
- -@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( - "user/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; } - } - -} diff --git a/src/AliasVault.Admin2/Account/Pages/LoginWith2fa.razor b/src/AliasVault.Admin2/Account/Pages/LoginWith2fa.razor deleted file mode 100644 index e49e5115b..000000000 --- a/src/AliasVault.Admin2/Account/Pages/LoginWith2fa.razor +++ /dev/null @@ -1,98 +0,0 @@ -@page "/user/loginWith2fa" - -@using System.ComponentModel.DataAnnotations -@using Microsoft.AspNetCore.Identity - -@inject SignInManager SignInManager -@inject UserManager UserManager -@inject IdentityRedirectManager RedirectManager -@inject ILogger Logger - -Two-factor authentication - -

Two-factor authentication

-
- -

Your login is protected with an authenticator app. Enter your authenticator code below.

-
-
- - - - - -
- - - -
-
- -
-
- -
- -
-
-

- Don't have access to your authenticator device? You can - log in with a recovery code. -

- -@code { - private string? message; - private AdminUser 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; } - } - -} diff --git a/src/AliasVault.Admin2/Account/Pages/Logout.razor b/src/AliasVault.Admin2/Account/Pages/Logout.razor deleted file mode 100644 index e68953a46..000000000 --- a/src/AliasVault.Admin2/Account/Pages/Logout.razor +++ /dev/null @@ -1,20 +0,0 @@ -@page "/user/logout" -@using AliasVault.Admin2.Services -@using Microsoft.AspNetCore.Identity -@inject SignInManager SignInManager -@inject NavigationManager NavigationManager -@inject GlobalNotificationService GlobalNotificationService - -@code { - protected override async Task OnInitializedAsync() - { - await base.OnInitializedAsync(); - - // Sign out the user - await SignInManager.SignOutAsync(); - GlobalNotificationService.ClearMessages(); - - // Redirect to the home page with hard refresh. - NavigationManager.NavigateTo("/", true); - } -} diff --git a/src/AliasVault.Admin2/Account/Pages/_Imports.razor b/src/AliasVault.Admin2/Account/Pages/_Imports.razor deleted file mode 100644 index 10ff27984..000000000 --- a/src/AliasVault.Admin2/Account/Pages/_Imports.razor +++ /dev/null @@ -1,3 +0,0 @@ -@using AliasVault.Admin2.Account.Shared -@using AliasVault.Admin2.Main.Layout -@layout AuthLayout diff --git a/src/AliasVault.Admin2/Account/Shared/AuthLayout.razor b/src/AliasVault.Admin2/Account/Shared/AuthLayout.razor deleted file mode 100644 index 35859a387..000000000 --- a/src/AliasVault.Admin2/Account/Shared/AuthLayout.razor +++ /dev/null @@ -1,51 +0,0 @@ -@inherits LayoutComponentBase -@implements IDisposable -@inject NavigationManager NavigationManager - -
-
-
-
- - Register - -
-
- - Login - -
-
- -
- @Body -
-
-
- -
- An unhandled error has occurred. - Reload - 🗙 -
- -@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; - } -} diff --git a/src/AliasVault.Admin2/Account/Shared/ShowRecoveryCodes.razor b/src/AliasVault.Admin2/Account/Shared/ShowRecoveryCodes.razor deleted file mode 100644 index fabbe65fe..000000000 --- a/src/AliasVault.Admin2/Account/Shared/ShowRecoveryCodes.razor +++ /dev/null @@ -1,26 +0,0 @@ - -

Recovery codes

- -
-
- @foreach (var recoveryCode in RecoveryCodes) - { -
- @recoveryCode -
- } -
-
- -@code { - [Parameter] public string[] RecoveryCodes { get; set; } = []; - - [Parameter] public string? StatusMessage { get; set; } -} diff --git a/src/AliasVault.Admin2/Account/Shared/StatusMessage.razor b/src/AliasVault.Admin2/Account/Shared/StatusMessage.razor deleted file mode 100644 index 0a2cac0ac..000000000 --- a/src/AliasVault.Admin2/Account/Shared/StatusMessage.razor +++ /dev/null @@ -1,28 +0,0 @@ -@if (!string.IsNullOrEmpty(DisplayMessage)) -{ - var statusMessageClass = DisplayMessage.StartsWith("Error") ? "danger" : "success"; - -} - -@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); - } - } - -} diff --git a/src/AliasVault.Admin2/AliasVault.Admin2.csproj b/src/AliasVault.Admin2/AliasVault.Admin2.csproj index bc51a7055..ff83bb5d5 100644 --- a/src/AliasVault.Admin2/AliasVault.Admin2.csproj +++ b/src/AliasVault.Admin2/AliasVault.Admin2.csproj @@ -26,28 +26,27 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/src/AliasVault.Admin2/Auth/Components/InputTextField.razor b/src/AliasVault.Admin2/Auth/Components/InputTextField.razor new file mode 100644 index 000000000..d0777464d --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Components/InputTextField.razor @@ -0,0 +1,41 @@ +@using System.Linq.Expressions + + + +@code { + /// + /// Gets or sets the ID of the input field. + /// + [Parameter] public string Id { get; set; } = null!; + + /// + /// Gets or sets the value of the input field. + /// + [Parameter] public string Value { get; set; } = null!; + + /// + /// Gets or sets the event callback that is triggered when the value changes. + /// + [Parameter] public EventCallback ValueChanged { get; set; } + + /// + /// Gets or sets the expression that identifies the value property. + /// + [Parameter] public Expression> ValueExpression { get; set; } = null!; + + /// + /// Gets or sets the placeholder text for the input field. + /// + [Parameter] public string Placeholder { get; set; } = null!; + + /// + /// Gets or sets additional attributes for the input field. + /// + [Parameter(CaptureUnmatchedValues = true)] public Dictionary? AdditionalAttributes { get; set; } = new(); +} diff --git a/src/AliasVault.Admin2/Auth/Components/Logo.razor b/src/AliasVault.Admin2/Auth/Components/Logo.razor new file mode 100644 index 000000000..dfd7fe97a --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Components/Logo.razor @@ -0,0 +1,5 @@ + + AliasVault + + + diff --git a/src/AliasVault.Admin2/Account/Shared/RedirectToLogin.razor b/src/AliasVault.Admin2/Auth/Components/RedirectToLogin.razor similarity index 100% rename from src/AliasVault.Admin2/Account/Shared/RedirectToLogin.razor rename to src/AliasVault.Admin2/Auth/Components/RedirectToLogin.razor diff --git a/src/AliasVault.Admin2/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs b/src/AliasVault.Admin2/Auth/IdentityComponentsEndpointRouteBuilderExtensions.cs similarity index 94% rename from src/AliasVault.Admin2/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs rename to src/AliasVault.Admin2/Auth/IdentityComponentsEndpointRouteBuilderExtensions.cs index 341744aa0..576171a1d 100644 --- a/src/AliasVault.Admin2/Account/IdentityComponentsEndpointRouteBuilderExtensions.cs +++ b/src/AliasVault.Admin2/Auth/IdentityComponentsEndpointRouteBuilderExtensions.cs @@ -1,13 +1,9 @@ using System.Security.Claims; using System.Text.Json; using AliasServerDb; -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 AliasVault.Admin2.Account.Pages; namespace Microsoft.AspNetCore.Routing; diff --git a/src/AliasVault.Admin2/Account/IdentityNoOpEmailSender.cs b/src/AliasVault.Admin2/Auth/IdentityNoOpEmailSender.cs similarity index 96% rename from src/AliasVault.Admin2/Account/IdentityNoOpEmailSender.cs rename to src/AliasVault.Admin2/Auth/IdentityNoOpEmailSender.cs index ae08096a7..c9105b62a 100644 --- a/src/AliasVault.Admin2/Account/IdentityNoOpEmailSender.cs +++ b/src/AliasVault.Admin2/Auth/IdentityNoOpEmailSender.cs @@ -2,7 +2,7 @@ using AliasServerDb; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.UI.Services; -namespace AliasVault.Admin2.Account; +namespace AliasVault.Admin2.Auth; // Remove the "else if (EmailSender is IdentityNoOpEmailSender)" block from RegisterConfirmation.razor after updating with a real implementation. internal sealed class IdentityNoOpEmailSender : IEmailSender diff --git a/src/AliasVault.Admin2/Account/IdentityRedirectManager.cs b/src/AliasVault.Admin2/Auth/IdentityRedirectManager.cs similarity index 98% rename from src/AliasVault.Admin2/Account/IdentityRedirectManager.cs rename to src/AliasVault.Admin2/Auth/IdentityRedirectManager.cs index 4527c0102..5d5699576 100644 --- a/src/AliasVault.Admin2/Account/IdentityRedirectManager.cs +++ b/src/AliasVault.Admin2/Auth/IdentityRedirectManager.cs @@ -1,7 +1,7 @@ using System.Diagnostics.CodeAnalysis; using Microsoft.AspNetCore.Components; -namespace AliasVault.Admin2.Account; +namespace AliasVault.Admin2.Auth; internal sealed class IdentityRedirectManager(NavigationManager navigationManager) { diff --git a/src/AliasVault.Admin2/Account/IdentityRevalidatingAuthenticationStateProvider.cs b/src/AliasVault.Admin2/Auth/IdentityRevalidatingAuthenticationStateProvider.cs similarity index 98% rename from src/AliasVault.Admin2/Account/IdentityRevalidatingAuthenticationStateProvider.cs rename to src/AliasVault.Admin2/Auth/IdentityRevalidatingAuthenticationStateProvider.cs index 598a9b3c1..cfbac959c 100644 --- a/src/AliasVault.Admin2/Account/IdentityRevalidatingAuthenticationStateProvider.cs +++ b/src/AliasVault.Admin2/Auth/IdentityRevalidatingAuthenticationStateProvider.cs @@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Components.Server; using Microsoft.AspNetCore.Identity; using Microsoft.Extensions.Options; -namespace AliasVault.Admin2.Account; +namespace AliasVault.Admin2.Auth; // This is a server-side AuthenticationStateProvider that revalidates the security stamp for the connected user // every 30 minutes an interactive circuit is connected. diff --git a/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor b/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor new file mode 100644 index 000000000..6f02899cd --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor @@ -0,0 +1,34 @@ +@inherits LayoutComponentBase +@using AliasVault.Admin2.Auth.Components +@implements IDisposable +@inject NavigationManager NavigationManager + +
+ +
+ @Body +
+
+ +
+ An unhandled error has occurred. + Reload + 🗙 +
+ +@code { + protected override void OnInitialized() + { + NavigationManager.LocationChanged += OnLocationChanged; + } + + private void OnLocationChanged(object? sender, LocationChangedEventArgs e) + { + StateHasChanged(); + } + + public void Dispose() + { + NavigationManager.LocationChanged -= OnLocationChanged; + } +} diff --git a/src/AliasVault.Admin2/Account/Shared/AuthLayout.razor.css b/src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor.css similarity index 100% rename from src/AliasVault.Admin2/Account/Shared/AuthLayout.razor.css rename to src/AliasVault.Admin2/Auth/Layout/AuthLayout.razor.css diff --git a/src/AliasVault.Admin2/Account/Pages/AccessDenied.razor b/src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor similarity index 77% rename from src/AliasVault.Admin2/Account/Pages/AccessDenied.razor rename to src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor index 8100787ff..34055f780 100644 --- a/src/AliasVault.Admin2/Account/Pages/AccessDenied.razor +++ b/src/AliasVault.Admin2/Auth/Pages/AccessDenied.razor @@ -1,6 +1,6 @@ @page "/Account/AccessDenied" -Access denied +Access denied

Access denied

diff --git a/src/AliasVault.Admin2/Account/Pages/ConfirmEmail.razor b/src/AliasVault.Admin2/Auth/Pages/ConfirmEmail.razor similarity index 96% rename from src/AliasVault.Admin2/Account/Pages/ConfirmEmail.razor rename to src/AliasVault.Admin2/Auth/Pages/ConfirmEmail.razor index 369f4ee4f..0b75b987d 100644 --- a/src/AliasVault.Admin2/Account/Pages/ConfirmEmail.razor +++ b/src/AliasVault.Admin2/Auth/Pages/ConfirmEmail.razor @@ -8,7 +8,7 @@ @inject UserManager UserManager @inject IdentityRedirectManager RedirectManager -Confirm email +Confirm email

Confirm email

diff --git a/src/AliasVault.Admin2/Account/Pages/ConfirmEmailChange.razor b/src/AliasVault.Admin2/Auth/Pages/ConfirmEmailChange.razor similarity index 97% rename from src/AliasVault.Admin2/Account/Pages/ConfirmEmailChange.razor rename to src/AliasVault.Admin2/Auth/Pages/ConfirmEmailChange.razor index b7ef57729..2d77e0357 100644 --- a/src/AliasVault.Admin2/Account/Pages/ConfirmEmailChange.razor +++ b/src/AliasVault.Admin2/Auth/Pages/ConfirmEmailChange.razor @@ -8,7 +8,7 @@ @inject SignInManager SignInManager @inject IdentityRedirectManager RedirectManager -Confirm email change +Confirm email change

Confirm email change

diff --git a/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor b/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor new file mode 100644 index 000000000..597578275 --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Pages/ForgotPassword.razor @@ -0,0 +1,67 @@ +@page "/user/forgot-password" + +@using System.ComponentModel.DataAnnotations +@using System.Text +@using System.Text.Encodings.Web +@using Microsoft.AspNetCore.Identity +@using Microsoft.AspNetCore.WebUtilities + +@inject UserManager UserManager +@inject IEmailSender EmailSender +@inject NavigationManager NavigationManager +@inject IdentityRedirectManager RedirectManager + +Forgot your password? + +

+ Forgot your password? +

+

+ Enter your email. +

+
+
+ + + + +
+ + + +
+ + +
+ +@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 { ["code"] = code }); + + await EmailSender.SendPasswordResetLinkAsync(user, Input.Email, HtmlEncoder.Default.Encode(callbackUrl)); + + RedirectManager.RedirectTo("user/forgot-password-confirm"); + } + + private sealed class InputModel + { + [Required] [EmailAddress] public string Email { get; set; } = ""; + } + +} diff --git a/src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor b/src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor new file mode 100644 index 000000000..6b1fca412 --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Pages/ForgotPasswordConfirmation.razor @@ -0,0 +1,12 @@ +@page "/user/forgot-password-confirm" + +Forgot password confirmation + +
+

+ Forgot password confirmation +

+

+ Please check your email to reset your password. +

+
diff --git a/src/AliasVault.Admin2/Account/Pages/InvalidPasswordReset.razor b/src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor similarity index 68% rename from src/AliasVault.Admin2/Account/Pages/InvalidPasswordReset.razor rename to src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor index 1dcd1b680..887c00082 100644 --- a/src/AliasVault.Admin2/Account/Pages/InvalidPasswordReset.razor +++ b/src/AliasVault.Admin2/Auth/Pages/InvalidPasswordReset.razor @@ -1,6 +1,6 @@ @page "/Account/InvalidPasswordReset" -Invalid password reset +Invalid password reset

Invalid password reset

diff --git a/src/AliasVault.Admin2/Account/Pages/InvalidUser.razor b/src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor similarity index 60% rename from src/AliasVault.Admin2/Account/Pages/InvalidUser.razor rename to src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor index 28e26ce0e..780756f52 100644 --- a/src/AliasVault.Admin2/Account/Pages/InvalidUser.razor +++ b/src/AliasVault.Admin2/Auth/Pages/InvalidUser.razor @@ -1,6 +1,6 @@ @page "/Account/InvalidUser" -Invalid user +Invalid user

Invalid user

diff --git a/src/AliasVault.Admin2/Account/Pages/Lockout.razor b/src/AliasVault.Admin2/Auth/Pages/Lockout.razor similarity index 79% rename from src/AliasVault.Admin2/Account/Pages/Lockout.razor rename to src/AliasVault.Admin2/Auth/Pages/Lockout.razor index 9f4e2f1fc..5b9f86d69 100644 --- a/src/AliasVault.Admin2/Account/Pages/Lockout.razor +++ b/src/AliasVault.Admin2/Auth/Pages/Lockout.razor @@ -1,6 +1,6 @@ @page "/Account/Lockout" -Locked out +Locked out

Locked out

diff --git a/src/AliasVault.Admin2/Auth/Pages/Login.razor b/src/AliasVault.Admin2/Auth/Pages/Login.razor new file mode 100644 index 000000000..8d8ad7915 --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Pages/Login.razor @@ -0,0 +1,104 @@ +@page "/user/login" + +@using System.ComponentModel.DataAnnotations +@using Microsoft.AspNetCore.Authentication +@using Microsoft.AspNetCore.Identity + +@inject SignInManager SignInManager +@inject ILogger Logger +@inject NavigationManager NavigationManager +@inject IdentityRedirectManager RedirectManager + +Log in + +

+ Sign in to AliasVault Admin +

+ + + +
+ + + +
+
+ + + +
+ +
+
+ +
+
+ +
+ Lost Password? +
+ + +
+ Not registered? Create account +
+ + + +@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( + "user/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; } + } + +} diff --git a/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor b/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor new file mode 100644 index 000000000..c846ca49d --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Pages/LoginWith2fa.razor @@ -0,0 +1,98 @@ +@page "/user/loginWith2fa" + +@using System.ComponentModel.DataAnnotations +@using Microsoft.AspNetCore.Identity + +@inject SignInManager SignInManager +@inject UserManager UserManager +@inject IdentityRedirectManager RedirectManager +@inject ILogger Logger + +Two-factor authentication + +

+ Two-factor authentication +

+
+ +

Your login is protected with an authenticator app. Enter your authenticator code below.

+
+ + + + + +
+ + + +
+
+
+ +
+
+ +
+
+ + +
+

+ Don't have access to your authenticator device? You can + log in with a recovery code. +

+ +@code { + private string? message; + private AdminUser 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; } + } + +} diff --git a/src/AliasVault.Admin2/Account/Pages/LoginWithRecoveryCode.razor b/src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor similarity index 57% rename from src/AliasVault.Admin2/Account/Pages/LoginWithRecoveryCode.razor rename to src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor index bb8784ed4..abaf42b28 100644 --- a/src/AliasVault.Admin2/Account/Pages/LoginWithRecoveryCode.razor +++ b/src/AliasVault.Admin2/Auth/Pages/LoginWithRecoveryCode.razor @@ -8,28 +8,28 @@ @inject IdentityRedirectManager RedirectManager @inject ILogger Logger -Recovery code verification +Recovery code verification -

Recovery code verification

-
- -

+

+ Recovery code verification +

+
+ +

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.

-
-
- - - -
- - - -
- - -
+
+ + + +
+ + + +
+ +
@code { diff --git a/src/AliasVault.Admin2/Auth/Pages/Logout.razor b/src/AliasVault.Admin2/Auth/Pages/Logout.razor new file mode 100644 index 000000000..d24fc0a06 --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Pages/Logout.razor @@ -0,0 +1,38 @@ +@page "/user/logout" +@using AliasVault.Admin2.Services +@using Microsoft.AspNetCore.Identity +@inject SignInManager SignInManager +@inject NavigationManager NavigationManager +@inject GlobalNotificationService GlobalNotificationService + +@code { + protected override async Task OnInitializedAsync() + { + // Sign out the user. + // NOTE: the try/catch below is a workaround for the issue that the sign out does not work when + // the server session is already started. + try + { + try + { + await SignInManager.SignOutAsync(); + GlobalNotificationService.ClearMessages(); + + // Redirect to the home page with hard refresh. + NavigationManager.NavigateTo("/", true); + } + catch + { + // Hard refresh current page if sign out fails. When an interactive server session is already started + // the sign out will fail because it tries to mutate cookies which is only possible when the server + // session is not started yet. + NavigationManager.NavigateTo(NavigationManager.Uri, true); + } + } + catch + { + // Redirect to the home page with hard refresh. + NavigationManager.NavigateTo("/", true); + } + } +} diff --git a/src/AliasVault.Admin2/Account/Pages/Register.razor b/src/AliasVault.Admin2/Auth/Pages/Register.razor similarity index 67% rename from src/AliasVault.Admin2/Account/Pages/Register.razor rename to src/AliasVault.Admin2/Auth/Pages/Register.razor index b4429dddd..76cc9fbbb 100644 --- a/src/AliasVault.Admin2/Account/Pages/Register.razor +++ b/src/AliasVault.Admin2/Auth/Pages/Register.razor @@ -14,44 +14,35 @@ @inject NavigationManager NavigationManager @inject IdentityRedirectManager RedirectManager -Register +Register -

Register

+

+ Register admin account +

-
-
- - - -

Create a new account.

-
- -
- - - -
-
- - - -
-
- - - -
- - + + +
+ + +
-
-
-

Use another service to register.

-
- -
+
+ + +
-
+
+ + + +
+ + +
+ Already registered? Login here +
+ @code { private IEnumerable? identityErrors; diff --git a/src/AliasVault.Admin2/Account/Pages/RegisterConfirmation.razor b/src/AliasVault.Admin2/Auth/Pages/RegisterConfirmation.razor similarity index 97% rename from src/AliasVault.Admin2/Account/Pages/RegisterConfirmation.razor rename to src/AliasVault.Admin2/Auth/Pages/RegisterConfirmation.razor index d91ac49c7..96ca9579a 100644 --- a/src/AliasVault.Admin2/Account/Pages/RegisterConfirmation.razor +++ b/src/AliasVault.Admin2/Auth/Pages/RegisterConfirmation.razor @@ -9,7 +9,7 @@ @inject NavigationManager NavigationManager @inject IdentityRedirectManager RedirectManager -Register confirmation +Register confirmation

Register confirmation

diff --git a/src/AliasVault.Admin2/Account/Pages/ResendEmailConfirmation.razor b/src/AliasVault.Admin2/Auth/Pages/ResendEmailConfirmation.razor similarity index 95% rename from src/AliasVault.Admin2/Account/Pages/ResendEmailConfirmation.razor rename to src/AliasVault.Admin2/Auth/Pages/ResendEmailConfirmation.razor index 2649ace44..68695f6bf 100644 --- a/src/AliasVault.Admin2/Account/Pages/ResendEmailConfirmation.razor +++ b/src/AliasVault.Admin2/Auth/Pages/ResendEmailConfirmation.razor @@ -9,9 +9,8 @@ @inject UserManager UserManager @inject IEmailSender EmailSender @inject NavigationManager NavigationManager -@inject IdentityRedirectManager RedirectManager -Resend email confirmation +Resend email confirmation

Resend email confirmation

Enter your email.

diff --git a/src/AliasVault.Admin2/Account/Pages/ResetPassword.razor b/src/AliasVault.Admin2/Auth/Pages/ResetPassword.razor similarity index 98% rename from src/AliasVault.Admin2/Account/Pages/ResetPassword.razor rename to src/AliasVault.Admin2/Auth/Pages/ResetPassword.razor index ab9065e16..7808d270e 100644 --- a/src/AliasVault.Admin2/Account/Pages/ResetPassword.razor +++ b/src/AliasVault.Admin2/Auth/Pages/ResetPassword.razor @@ -8,7 +8,7 @@ @inject IdentityRedirectManager RedirectManager @inject UserManager UserManager -Reset password +Reset password

Reset password

Reset your password.

diff --git a/src/AliasVault.Admin2/Account/Pages/ResetPasswordConfirmation.razor b/src/AliasVault.Admin2/Auth/Pages/ResetPasswordConfirmation.razor similarity index 74% rename from src/AliasVault.Admin2/Account/Pages/ResetPasswordConfirmation.razor rename to src/AliasVault.Admin2/Auth/Pages/ResetPasswordConfirmation.razor index b324f999f..133912972 100644 --- a/src/AliasVault.Admin2/Account/Pages/ResetPasswordConfirmation.razor +++ b/src/AliasVault.Admin2/Auth/Pages/ResetPasswordConfirmation.razor @@ -1,5 +1,5 @@ @page "/Account/ResetPasswordConfirmation" -Reset password confirmation +Reset password confirmation

Reset password confirmation

diff --git a/src/AliasVault.Admin2/Auth/Pages/_Imports.razor b/src/AliasVault.Admin2/Auth/Pages/_Imports.razor new file mode 100644 index 000000000..5846fffd8 --- /dev/null +++ b/src/AliasVault.Admin2/Auth/Pages/_Imports.razor @@ -0,0 +1,5 @@ +@using AliasVault.Admin2.Auth.Components +@using AliasVault.Admin2.Auth.Layout +@using AliasVault.Admin2.Main.Components.Layout +@using AliasVault.Admin2.Main.Layout +@layout AuthLayout diff --git a/src/AliasVault.Admin2/Account/_Imports.razor b/src/AliasVault.Admin2/Auth/_Imports.razor similarity index 100% rename from src/AliasVault.Admin2/Account/_Imports.razor rename to src/AliasVault.Admin2/Auth/_Imports.razor diff --git a/src/AliasVault.Admin2/Main/App.razor b/src/AliasVault.Admin2/Main/App.razor index c9c1072ef..33adc10e8 100644 --- a/src/AliasVault.Admin2/Main/App.razor +++ b/src/AliasVault.Admin2/Main/App.razor @@ -14,6 +14,7 @@ + @@ -47,6 +48,10 @@ } }; + window.isFunctionDefined = function(functionName) { + return typeof window[functionName] === 'function'; + }; + // Primarily used by E2E tests. window.blazorNavigate = (url) => { Blazor.navigateTo(url); diff --git a/src/AliasVault.Admin2/Main/Pages/Account/Manage/EnableAuthenticator.razor b/src/AliasVault.Admin2/Main/Pages/Account/Manage/EnableAuthenticator.razor index c559fc1d6..df634ca3b 100644 --- a/src/AliasVault.Admin2/Main/Pages/Account/Manage/EnableAuthenticator.razor +++ b/src/AliasVault.Admin2/Main/Pages/Account/Manage/EnableAuthenticator.razor @@ -8,7 +8,6 @@ @inject UserManager UserManager @inject UrlEncoder UrlEncoder -@inject IdentityRedirectManager RedirectManager @inject ILogger Logger Configure authenticator app @@ -38,7 +37,7 @@ else

Scan the QR Code or enter this key @sharedKey into your two factor authenticator app. Spaces and casing do not matter.

Learn how to enable QR code generation.
-
+

  • @@ -79,6 +78,8 @@ else await base.OnInitializedAsync(); await LoadSharedKeyAndQrCodeUriAsync(UserService.User()); + + await JsInvokeService.RetryInvokeAsync("generateQrCode", TimeSpan.Zero, 5, "authenticator-uri"); } private async Task OnValidSubmitAsync() @@ -151,7 +152,7 @@ else return string.Format( CultureInfo.InvariantCulture, AuthenticatorUriFormat, - UrlEncoder.Encode("Microsoft.AspNetCore.Identity.UI"), + UrlEncoder.Encode("AliasVault Admin"), UrlEncoder.Encode(email), unformattedKey); } diff --git a/src/AliasVault.Admin2/Main/Pages/Account/Manage/_Imports.razor b/src/AliasVault.Admin2/Main/Pages/Account/Manage/_Imports.razor index 6844160cc..5622867d4 100644 --- a/src/AliasVault.Admin2/Main/Pages/Account/Manage/_Imports.razor +++ b/src/AliasVault.Admin2/Main/Pages/Account/Manage/_Imports.razor @@ -1,6 +1,6 @@ @layout ManageLayout @inherits MainBase -@using AliasVault.Admin2.Account +@using AliasVault.Admin2.Auth @using AliasVault.Admin2.Main.Pages.Account.Manage.Components @using AliasVault.Admin2.Main.Components.Layout @attribute [Microsoft.AspNetCore.Authorization.Authorize] diff --git a/src/AliasVault.Admin2/Main/Pages/MainBase.cs b/src/AliasVault.Admin2/Main/Pages/MainBase.cs index 4310ee9e7..0dc150ef5 100644 --- a/src/AliasVault.Admin2/Main/Pages/MainBase.cs +++ b/src/AliasVault.Admin2/Main/Pages/MainBase.cs @@ -1,10 +1,9 @@ -using AliasServerDb; -using Microsoft.AspNetCore.Authorization; - -namespace AliasVault.Admin2.Main.Pages; +namespace AliasVault.Admin2.Main.Pages; +using AliasServerDb; using AliasVault.Admin2.Main.Models; using AliasVault.Admin2.Services; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; diff --git a/src/AliasVault.Admin2/Main/Routes.razor b/src/AliasVault.Admin2/Main/Routes.razor index 3a0b33a42..fc07ba01c 100644 --- a/src/AliasVault.Admin2/Main/Routes.razor +++ b/src/AliasVault.Admin2/Main/Routes.razor @@ -1,5 +1,4 @@ -@using AliasVault.Admin2.Account.Shared - + diff --git a/src/AliasVault.Admin2/Main/_Imports.razor b/src/AliasVault.Admin2/Main/_Imports.razor index 1098c6a00..13ab6161b 100644 --- a/src/AliasVault.Admin2/Main/_Imports.razor +++ b/src/AliasVault.Admin2/Main/_Imports.razor @@ -10,6 +10,7 @@ @using Microsoft.EntityFrameworkCore @using Microsoft.JSInterop @using AliasVault.Admin2 +@using AliasVault.Admin2.Auth.Components @using AliasVault.Admin2.Main @using AliasVault.Admin2.Main.Components @using AliasVault.Admin2.Main.Components.Alerts diff --git a/src/AliasVault.Admin2/Program.cs b/src/AliasVault.Admin2/Program.cs index 5eacab704..8571c0b34 100644 --- a/src/AliasVault.Admin2/Program.cs +++ b/src/AliasVault.Admin2/Program.cs @@ -3,7 +3,7 @@ using AliasServerDb; using Microsoft.AspNetCore.Components.Authorization; using Microsoft.AspNetCore.Identity; using Microsoft.EntityFrameworkCore; -using AliasVault.Admin2.Account; +using AliasVault.Admin2.Auth; using AliasVault.Admin2.Main; using AliasVault.Admin2.Services; using Microsoft.Data.Sqlite; diff --git a/src/AliasVault.Admin2/wwwroot/css/tailwind.css b/src/AliasVault.Admin2/wwwroot/css/tailwind.css index cef190426..2e6f663ba 100644 --- a/src/AliasVault.Admin2/wwwroot/css/tailwind.css +++ b/src/AliasVault.Admin2/wwwroot/css/tailwind.css @@ -728,6 +728,26 @@ video { margin-left: 0.5rem; } +.mb-8 { + margin-bottom: 2rem; +} + +.ml-3 { + margin-left: 0.75rem; +} + +.ml-auto { + margin-left: auto; +} + +.mt-8 { + margin-top: 2rem; +} + +.mt-6 { + margin-top: 1.5rem; +} + .line-clamp-2 { overflow: hidden; display: -webkit-box; @@ -790,6 +810,10 @@ video { height: 100%; } +.h-4 { + height: 1rem; +} + .w-1\/2 { width: 50%; } @@ -818,10 +842,22 @@ video { width: 100%; } +.w-4 { + width: 1rem; +} + .max-w-screen-2xl { max-width: 1536px; } +.max-w-xl { + max-width: 36rem; +} + +.max-w-md { + max-width: 28rem; +} + .flex-shrink-0 { flex-shrink: 0; } @@ -858,6 +894,10 @@ video { flex-wrap: wrap; } +.items-start { + align-items: flex-start; +} + .items-center { align-items: center; } @@ -900,6 +940,18 @@ video { margin-bottom: calc(0.25rem * var(--tw-space-y-reverse)); } +.space-y-4 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(1rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(1rem * var(--tw-space-y-reverse)); +} + +.space-y-6 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(1.5rem * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(1.5rem * var(--tw-space-y-reverse)); +} + .divide-y > :not([hidden]) ~ :not([hidden]) { --tw-divide-y-reverse: 0; border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse))); @@ -1048,6 +1100,16 @@ video { background-color: rgb(220 38 38 / var(--tw-bg-opacity)); } +.bg-primary-700 { + --tw-bg-opacity: 1; + background-color: rgb(184 112 47 / var(--tw-bg-opacity)); +} + +.bg-primary-600 { + --tw-bg-opacity: 1; + background-color: rgb(214 131 56 / var(--tw-bg-opacity)); +} + .bg-opacity-50 { --tw-bg-opacity: 0.5; } @@ -1064,6 +1126,10 @@ video { padding: 1rem; } +.p-6 { + padding: 1.5rem; +} + .px-3 { padding-left: 0.75rem; padding-right: 0.75rem; @@ -1114,6 +1180,16 @@ video { padding-right: 0.5rem; } +.px-5 { + padding-left: 1.25rem; + padding-right: 1.25rem; +} + +.py-2\.5 { + padding-top: 0.625rem; + padding-bottom: 0.625rem; +} + .ps-2 { padding-inline-start: 0.5rem; } @@ -1126,6 +1202,10 @@ video { padding-top: 1.5rem; } +.pt-8 { + padding-top: 2rem; +} + .text-left { text-align: left; } @@ -1255,6 +1335,16 @@ video { color: rgb(239 68 68 / var(--tw-text-opacity)); } +.text-primary-600 { + --tw-text-opacity: 1; + color: rgb(214 131 56 / var(--tw-text-opacity)); +} + +.text-red-600 { + --tw-text-opacity: 1; + color: rgb(220 38 38 / var(--tw-text-opacity)); +} + .opacity-0 { opacity: 0; } @@ -1336,6 +1426,16 @@ video { background-color: rgb(37 99 235 / var(--tw-bg-opacity)); } +.hover\:bg-primary-800:hover { + --tw-bg-opacity: 1; + background-color: rgb(154 93 38 / var(--tw-bg-opacity)); +} + +.hover\:bg-primary-700:hover { + --tw-bg-opacity: 1; + background-color: rgb(184 112 47 / var(--tw-bg-opacity)); +} + .hover\:text-gray-900:hover { --tw-text-opacity: 1; color: rgb(17 24 39 / var(--tw-text-opacity)); @@ -1366,6 +1466,16 @@ video { border-color: rgb(59 130 246 / var(--tw-border-opacity)); } +.focus\:border-primary-500:focus { + --tw-border-opacity: 1; + border-color: rgb(244 149 65 / var(--tw-border-opacity)); +} + +.focus\:border-primary-600:focus { + --tw-border-opacity: 1; + border-color: rgb(214 131 56 / var(--tw-border-opacity)); +} + .focus\:outline-none:focus { outline: 2px solid transparent; outline-offset: 2px; @@ -1398,6 +1508,21 @@ video { --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity)); } +.focus\:ring-primary-500:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(244 149 65 / var(--tw-ring-opacity)); +} + +.focus\:ring-primary-300:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(248 185 99 / var(--tw-ring-opacity)); +} + +.focus\:ring-primary-600:focus { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(214 131 56 / var(--tw-ring-opacity)); +} + .dark\:divide-gray-600:is(.dark *) > :not([hidden]) ~ :not([hidden]) { --tw-divide-opacity: 1; border-color: rgb(75 85 99 / var(--tw-divide-opacity)); @@ -1408,6 +1533,11 @@ video { border-color: rgb(55 65 81 / var(--tw-border-opacity)); } +.dark\:border-gray-600:is(.dark *) { + --tw-border-opacity: 1; + border-color: rgb(75 85 99 / var(--tw-border-opacity)); +} + .dark\:bg-gray-700:is(.dark *) { --tw-bg-opacity: 1; background-color: rgb(55 65 81 / var(--tw-bg-opacity)); @@ -1423,6 +1553,11 @@ video { background-color: rgb(17 24 39 / var(--tw-bg-opacity)); } +.dark\:bg-primary-600:is(.dark *) { + --tw-bg-opacity: 1; + background-color: rgb(214 131 56 / var(--tw-bg-opacity)); +} + .dark\:bg-opacity-80:is(.dark *) { --tw-bg-opacity: 0.8; } @@ -1462,6 +1597,20 @@ video { color: rgb(255 255 255 / var(--tw-text-opacity)); } +.dark\:placeholder-gray-400:is(.dark *)::-moz-placeholder { + --tw-placeholder-opacity: 1; + color: rgb(156 163 175 / var(--tw-placeholder-opacity)); +} + +.dark\:placeholder-gray-400:is(.dark *)::placeholder { + --tw-placeholder-opacity: 1; + color: rgb(156 163 175 / var(--tw-placeholder-opacity)); +} + +.dark\:ring-offset-gray-800:is(.dark *) { + --tw-ring-offset-color: #1f2937; +} + .dark\:hover\:bg-gray-600:hover:is(.dark *) { --tw-bg-opacity: 1; background-color: rgb(75 85 99 / var(--tw-bg-opacity)); @@ -1472,6 +1621,11 @@ video { background-color: rgb(55 65 81 / var(--tw-bg-opacity)); } +.dark\:hover\:bg-primary-700:hover:is(.dark *) { + --tw-bg-opacity: 1; + background-color: rgb(184 112 47 / var(--tw-bg-opacity)); +} + .dark\:hover\:text-primary-500:hover:is(.dark *) { --tw-text-opacity: 1; color: rgb(244 149 65 / var(--tw-text-opacity)); @@ -1482,6 +1636,16 @@ video { color: rgb(255 255 255 / var(--tw-text-opacity)); } +.dark\:focus\:border-primary-500:focus:is(.dark *) { + --tw-border-opacity: 1; + border-color: rgb(244 149 65 / var(--tw-border-opacity)); +} + +.dark\:focus\:border-blue-500:focus:is(.dark *) { + --tw-border-opacity: 1; + border-color: rgb(59 130 246 / var(--tw-border-opacity)); +} + .dark\:focus\:ring-gray-600:focus:is(.dark *) { --tw-ring-opacity: 1; --tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity)); @@ -1492,19 +1656,52 @@ video { --tw-ring-color: rgb(55 65 81 / var(--tw-ring-opacity)); } +.dark\:focus\:ring-primary-500:focus:is(.dark *) { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(244 149 65 / var(--tw-ring-opacity)); +} + +.dark\:focus\:ring-primary-600:focus:is(.dark *) { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(214 131 56 / var(--tw-ring-opacity)); +} + +.dark\:focus\:ring-primary-800:focus:is(.dark *) { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(154 93 38 / var(--tw-ring-opacity)); +} + +.dark\:focus\:ring-blue-500:focus:is(.dark *) { + --tw-ring-opacity: 1; + --tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity)); +} + @media (min-width: 640px) { .sm\:flex { display: flex; } + .sm\:w-auto { + width: auto; + } + .sm\:rounded-lg { border-radius: 0.5rem; } + .sm\:p-8 { + padding: 2rem; + } + .sm\:text-2xl { font-size: 1.5rem; line-height: 2rem; } + + .sm\:text-sm { + font-size: 0.875rem; + line-height: 1.25rem; + } } @media (min-width: 768px) { @@ -1528,6 +1725,10 @@ video { display: flex; } + .md\:h-screen { + height: 100vh; + } + .md\:w-1\/4 { width: 25%; } @@ -1585,6 +1786,10 @@ video { margin-top: 0px; } + .lg\:mb-10 { + margin-bottom: 2.5rem; + } + .lg\:flex { display: flex; } diff --git a/src/AliasVault.Admin2/wwwroot/js/utilities.js b/src/AliasVault.Admin2/wwwroot/js/utilities.js index 71cfb5479..af70e5a83 100644 --- a/src/AliasVault.Admin2/wwwroot/js/utilities.js +++ b/src/AliasVault.Admin2/wwwroot/js/utilities.js @@ -9,3 +9,46 @@ function downloadFileFromStream(fileName, contentStreamReference) { anchorElement.remove(); URL.revokeObjectURL(url); } + +/** + * Generate a QR code for the given id element that has a data-url attribute. + * @param id + */ +function generateQrCode(id) { + console.log(`Generating QR code for element with id "${id}".`); + // Find the element by id + const element = document.getElementById(id); + + // Check if the element exists + if (!element) { + console.log(`Element with id "${id}" not found. QR code generation aborted.`); + return; // Silently fail + } + + // Get the data-url attribute + const dataUrl = element.getAttribute('data-url'); + + // Check if data-url exists + if (!dataUrl) { + console.log(`No data-url attribute found on element with id "${id}". QR code generation aborted.`); + return; // Silently fail + } + + // Create a container for the QR code + const qrContainer = document.createElement('div'); + qrContainer.id = `qrcode-${id}`; + element.appendChild(qrContainer); + + // Initialize QRCode object + const qrcode = new QRCode(qrContainer, { + text: dataUrl, + width: 256, + height: 256, + colorDark : "#000000", + colorLight : "#ffffff", + correctLevel : QRCode.CorrectLevel.H + }); + + console.log(`QR code generated successfully for element with id "${id}".`); +} + diff --git a/src/AliasVault.Admin2/wwwroot/lib/qrcode.min.js b/src/AliasVault.Admin2/wwwroot/lib/qrcode.min.js new file mode 100644 index 000000000..993e88f39 --- /dev/null +++ b/src/AliasVault.Admin2/wwwroot/lib/qrcode.min.js @@ -0,0 +1 @@ +var QRCode;!function(){function a(a){this.mode=c.MODE_8BIT_BYTE,this.data=a,this.parsedData=[];for(var b=[],d=0,e=this.data.length;e>d;d++){var f=this.data.charCodeAt(d);f>65536?(b[0]=240|(1835008&f)>>>18,b[1]=128|(258048&f)>>>12,b[2]=128|(4032&f)>>>6,b[3]=128|63&f):f>2048?(b[0]=224|(61440&f)>>>12,b[1]=128|(4032&f)>>>6,b[2]=128|63&f):f>128?(b[0]=192|(1984&f)>>>6,b[1]=128|63&f):b[0]=f,this.parsedData=this.parsedData.concat(b)}this.parsedData.length!=this.data.length&&(this.parsedData.unshift(191),this.parsedData.unshift(187),this.parsedData.unshift(239))}function b(a,b){this.typeNumber=a,this.errorCorrectLevel=b,this.modules=null,this.moduleCount=0,this.dataCache=null,this.dataList=[]}function i(a,b){if(void 0==a.length)throw new Error(a.length+"/"+b);for(var c=0;c=f;f++){var h=0;switch(b){case d.L:h=l[f][0];break;case d.M:h=l[f][1];break;case d.Q:h=l[f][2];break;case d.H:h=l[f][3]}if(h>=e)break;c++}if(c>l.length)throw new Error("Too long data");return c}function s(a){var b=encodeURI(a).toString().replace(/\%[0-9a-fA-F]{2}/g,"a");return b.length+(b.length!=a?3:0)}a.prototype={getLength:function(){return this.parsedData.length},write:function(a){for(var b=0,c=this.parsedData.length;c>b;b++)a.put(this.parsedData[b],8)}},b.prototype={addData:function(b){var c=new a(b);this.dataList.push(c),this.dataCache=null},isDark:function(a,b){if(0>a||this.moduleCount<=a||0>b||this.moduleCount<=b)throw new Error(a+","+b);return this.modules[a][b]},getModuleCount:function(){return this.moduleCount},make:function(){this.makeImpl(!1,this.getBestMaskPattern())},makeImpl:function(a,c){this.moduleCount=4*this.typeNumber+17,this.modules=new Array(this.moduleCount);for(var d=0;d=7&&this.setupTypeNumber(a),null==this.dataCache&&(this.dataCache=b.createData(this.typeNumber,this.errorCorrectLevel,this.dataList)),this.mapData(this.dataCache,c)},setupPositionProbePattern:function(a,b){for(var c=-1;7>=c;c++)if(!(-1>=a+c||this.moduleCount<=a+c))for(var d=-1;7>=d;d++)-1>=b+d||this.moduleCount<=b+d||(this.modules[a+c][b+d]=c>=0&&6>=c&&(0==d||6==d)||d>=0&&6>=d&&(0==c||6==c)||c>=2&&4>=c&&d>=2&&4>=d?!0:!1)},getBestMaskPattern:function(){for(var a=0,b=0,c=0;8>c;c++){this.makeImpl(!0,c);var d=f.getLostPoint(this);(0==c||a>d)&&(a=d,b=c)}return b},createMovieClip:function(a,b,c){var d=a.createEmptyMovieClip(b,c),e=1;this.make();for(var f=0;f=g;g++)for(var h=-2;2>=h;h++)this.modules[d+g][e+h]=-2==g||2==g||-2==h||2==h||0==g&&0==h?!0:!1}},setupTypeNumber:function(a){for(var b=f.getBCHTypeNumber(this.typeNumber),c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[Math.floor(c/3)][c%3+this.moduleCount-8-3]=d}for(var c=0;18>c;c++){var d=!a&&1==(1&b>>c);this.modules[c%3+this.moduleCount-8-3][Math.floor(c/3)]=d}},setupTypeInfo:function(a,b){for(var c=this.errorCorrectLevel<<3|b,d=f.getBCHTypeInfo(c),e=0;15>e;e++){var g=!a&&1==(1&d>>e);6>e?this.modules[e][8]=g:8>e?this.modules[e+1][8]=g:this.modules[this.moduleCount-15+e][8]=g}for(var e=0;15>e;e++){var g=!a&&1==(1&d>>e);8>e?this.modules[8][this.moduleCount-e-1]=g:9>e?this.modules[8][15-e-1+1]=g:this.modules[8][15-e-1]=g}this.modules[this.moduleCount-8][8]=!a},mapData:function(a,b){for(var c=-1,d=this.moduleCount-1,e=7,g=0,h=this.moduleCount-1;h>0;h-=2)for(6==h&&h--;;){for(var i=0;2>i;i++)if(null==this.modules[d][h-i]){var j=!1;g>>e));var k=f.getMask(b,d,h-i);k&&(j=!j),this.modules[d][h-i]=j,e--,-1==e&&(g++,e=7)}if(d+=c,0>d||this.moduleCount<=d){d-=c,c=-c;break}}}},b.PAD0=236,b.PAD1=17,b.createData=function(a,c,d){for(var e=j.getRSBlocks(a,c),g=new k,h=0;h8*l)throw new Error("code length overflow. ("+g.getLengthInBits()+">"+8*l+")");for(g.getLengthInBits()+4<=8*l&&g.put(0,4);0!=g.getLengthInBits()%8;)g.putBit(!1);for(;;){if(g.getLengthInBits()>=8*l)break;if(g.put(b.PAD0,8),g.getLengthInBits()>=8*l)break;g.put(b.PAD1,8)}return b.createBytes(g,e)},b.createBytes=function(a,b){for(var c=0,d=0,e=0,g=new Array(b.length),h=new Array(b.length),j=0;j=0?p.get(q):0}}for(var r=0,m=0;mm;m++)for(var j=0;jm;m++)for(var j=0;j=0;)b^=f.G15<=0;)b^=f.G18<>>=1;return b},getPatternPosition:function(a){return f.PATTERN_POSITION_TABLE[a-1]},getMask:function(a,b,c){switch(a){case e.PATTERN000:return 0==(b+c)%2;case e.PATTERN001:return 0==b%2;case e.PATTERN010:return 0==c%3;case e.PATTERN011:return 0==(b+c)%3;case e.PATTERN100:return 0==(Math.floor(b/2)+Math.floor(c/3))%2;case e.PATTERN101:return 0==b*c%2+b*c%3;case e.PATTERN110:return 0==(b*c%2+b*c%3)%2;case e.PATTERN111:return 0==(b*c%3+(b+c)%2)%2;default:throw new Error("bad maskPattern:"+a)}},getErrorCorrectPolynomial:function(a){for(var b=new i([1],0),c=0;a>c;c++)b=b.multiply(new i([1,g.gexp(c)],0));return b},getLengthInBits:function(a,b){if(b>=1&&10>b)switch(a){case c.MODE_NUMBER:return 10;case c.MODE_ALPHA_NUM:return 9;case c.MODE_8BIT_BYTE:return 8;case c.MODE_KANJI:return 8;default:throw new Error("mode:"+a)}else if(27>b)switch(a){case c.MODE_NUMBER:return 12;case c.MODE_ALPHA_NUM:return 11;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 10;default:throw new Error("mode:"+a)}else{if(!(41>b))throw new Error("type:"+b);switch(a){case c.MODE_NUMBER:return 14;case c.MODE_ALPHA_NUM:return 13;case c.MODE_8BIT_BYTE:return 16;case c.MODE_KANJI:return 12;default:throw new Error("mode:"+a)}}},getLostPoint:function(a){for(var b=a.getModuleCount(),c=0,d=0;b>d;d++)for(var e=0;b>e;e++){for(var f=0,g=a.isDark(d,e),h=-1;1>=h;h++)if(!(0>d+h||d+h>=b))for(var i=-1;1>=i;i++)0>e+i||e+i>=b||(0!=h||0!=i)&&g==a.isDark(d+h,e+i)&&f++;f>5&&(c+=3+f-5)}for(var d=0;b-1>d;d++)for(var e=0;b-1>e;e++){var j=0;a.isDark(d,e)&&j++,a.isDark(d+1,e)&&j++,a.isDark(d,e+1)&&j++,a.isDark(d+1,e+1)&&j++,(0==j||4==j)&&(c+=3)}for(var d=0;b>d;d++)for(var e=0;b-6>e;e++)a.isDark(d,e)&&!a.isDark(d,e+1)&&a.isDark(d,e+2)&&a.isDark(d,e+3)&&a.isDark(d,e+4)&&!a.isDark(d,e+5)&&a.isDark(d,e+6)&&(c+=40);for(var e=0;b>e;e++)for(var d=0;b-6>d;d++)a.isDark(d,e)&&!a.isDark(d+1,e)&&a.isDark(d+2,e)&&a.isDark(d+3,e)&&a.isDark(d+4,e)&&!a.isDark(d+5,e)&&a.isDark(d+6,e)&&(c+=40);for(var k=0,e=0;b>e;e++)for(var d=0;b>d;d++)a.isDark(d,e)&&k++;var l=Math.abs(100*k/b/b-50)/5;return c+=10*l}},g={glog:function(a){if(1>a)throw new Error("glog("+a+")");return g.LOG_TABLE[a]},gexp:function(a){for(;0>a;)a+=255;for(;a>=256;)a-=255;return g.EXP_TABLE[a]},EXP_TABLE:new Array(256),LOG_TABLE:new Array(256)},h=0;8>h;h++)g.EXP_TABLE[h]=1<h;h++)g.EXP_TABLE[h]=g.EXP_TABLE[h-4]^g.EXP_TABLE[h-5]^g.EXP_TABLE[h-6]^g.EXP_TABLE[h-8];for(var h=0;255>h;h++)g.LOG_TABLE[g.EXP_TABLE[h]]=h;i.prototype={get:function(a){return this.num[a]},getLength:function(){return this.num.length},multiply:function(a){for(var b=new Array(this.getLength()+a.getLength()-1),c=0;cf;f++)for(var g=c[3*f+0],h=c[3*f+1],i=c[3*f+2],k=0;g>k;k++)e.push(new j(h,i));return e},j.getRsBlockTable=function(a,b){switch(b){case d.L:return j.RS_BLOCK_TABLE[4*(a-1)+0];case d.M:return j.RS_BLOCK_TABLE[4*(a-1)+1];case d.Q:return j.RS_BLOCK_TABLE[4*(a-1)+2];case d.H:return j.RS_BLOCK_TABLE[4*(a-1)+3];default:return void 0}},k.prototype={get:function(a){var b=Math.floor(a/8);return 1==(1&this.buffer[b]>>>7-a%8)},put:function(a,b){for(var c=0;b>c;c++)this.putBit(1==(1&a>>>b-c-1))},getLengthInBits:function(){return this.length},putBit:function(a){var b=Math.floor(this.length/8);this.buffer.length<=b&&this.buffer.push(0),a&&(this.buffer[b]|=128>>>this.length%8),this.length++}};var l=[[17,14,11,7],[32,26,20,14],[53,42,32,24],[78,62,46,34],[106,84,60,44],[134,106,74,58],[154,122,86,64],[192,152,108,84],[230,180,130,98],[271,213,151,119],[321,251,177,137],[367,287,203,155],[425,331,241,177],[458,362,258,194],[520,412,292,220],[586,450,322,250],[644,504,364,280],[718,560,394,310],[792,624,442,338],[858,666,482,382],[929,711,509,403],[1003,779,565,439],[1091,857,611,461],[1171,911,661,511],[1273,997,715,535],[1367,1059,751,593],[1465,1125,805,625],[1528,1190,868,658],[1628,1264,908,698],[1732,1370,982,742],[1840,1452,1030,790],[1952,1538,1112,842],[2068,1628,1168,898],[2188,1722,1228,958],[2303,1809,1283,983],[2431,1911,1351,1051],[2563,1989,1423,1093],[2699,2099,1499,1139],[2809,2213,1579,1219],[2953,2331,1663,1273]],o=function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){function g(a,b){var c=document.createElementNS("http://www.w3.org/2000/svg",a);for(var d in b)b.hasOwnProperty(d)&&c.setAttribute(d,b[d]);return c}var b=this._htOption,c=this._el,d=a.getModuleCount();Math.floor(b.width/d),Math.floor(b.height/d),this.clear();var h=g("svg",{viewBox:"0 0 "+String(d)+" "+String(d),width:"100%",height:"100%",fill:b.colorLight});h.setAttributeNS("http://www.w3.org/2000/xmlns/","xmlns:xlink","http://www.w3.org/1999/xlink"),c.appendChild(h),h.appendChild(g("rect",{fill:b.colorDark,width:"1",height:"1",id:"template"}));for(var i=0;d>i;i++)for(var j=0;d>j;j++)if(a.isDark(i,j)){var k=g("use",{x:String(i),y:String(j)});k.setAttributeNS("http://www.w3.org/1999/xlink","href","#template"),h.appendChild(k)}},a.prototype.clear=function(){for(;this._el.hasChildNodes();)this._el.removeChild(this._el.lastChild)},a}(),p="svg"===document.documentElement.tagName.toLowerCase(),q=p?o:m()?function(){function a(){this._elImage.src=this._elCanvas.toDataURL("image/png"),this._elImage.style.display="block",this._elCanvas.style.display="none"}function d(a,b){var c=this;if(c._fFail=b,c._fSuccess=a,null===c._bSupportDataURI){var d=document.createElement("img"),e=function(){c._bSupportDataURI=!1,c._fFail&&_fFail.call(c)},f=function(){c._bSupportDataURI=!0,c._fSuccess&&c._fSuccess.call(c)};return d.onabort=e,d.onerror=e,d.onload=f,d.src="data:image/gif;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHElEQVQI12P4//8/w38GIAXDIBKE0DHxgljNBAAO9TXL0Y4OHwAAAABJRU5ErkJggg==",void 0}c._bSupportDataURI===!0&&c._fSuccess?c._fSuccess.call(c):c._bSupportDataURI===!1&&c._fFail&&c._fFail.call(c)}if(this._android&&this._android<=2.1){var b=1/window.devicePixelRatio,c=CanvasRenderingContext2D.prototype.drawImage;CanvasRenderingContext2D.prototype.drawImage=function(a,d,e,f,g,h,i,j){if("nodeName"in a&&/img/i.test(a.nodeName))for(var l=arguments.length-1;l>=1;l--)arguments[l]=arguments[l]*b;else"undefined"==typeof j&&(arguments[1]*=b,arguments[2]*=b,arguments[3]*=b,arguments[4]*=b);c.apply(this,arguments)}}var e=function(a,b){this._bIsPainted=!1,this._android=n(),this._htOption=b,this._elCanvas=document.createElement("canvas"),this._elCanvas.width=b.width,this._elCanvas.height=b.height,a.appendChild(this._elCanvas),this._el=a,this._oContext=this._elCanvas.getContext("2d"),this._bIsPainted=!1,this._elImage=document.createElement("img"),this._elImage.style.display="none",this._el.appendChild(this._elImage),this._bSupportDataURI=null};return e.prototype.draw=function(a){var b=this._elImage,c=this._oContext,d=this._htOption,e=a.getModuleCount(),f=d.width/e,g=d.height/e,h=Math.round(f),i=Math.round(g);b.style.display="none",this.clear();for(var j=0;e>j;j++)for(var k=0;e>k;k++){var l=a.isDark(j,k),m=k*f,n=j*g;c.strokeStyle=l?d.colorDark:d.colorLight,c.lineWidth=1,c.fillStyle=l?d.colorDark:d.colorLight,c.fillRect(m,n,f,g),c.strokeRect(Math.floor(m)+.5,Math.floor(n)+.5,h,i),c.strokeRect(Math.ceil(m)-.5,Math.ceil(n)-.5,h,i)}this._bIsPainted=!0},e.prototype.makeImage=function(){this._bIsPainted&&d.call(this,a)},e.prototype.isPainted=function(){return this._bIsPainted},e.prototype.clear=function(){this._oContext.clearRect(0,0,this._elCanvas.width,this._elCanvas.height),this._bIsPainted=!1},e.prototype.round=function(a){return a?Math.floor(1e3*a)/1e3:a},e}():function(){var a=function(a,b){this._el=a,this._htOption=b};return a.prototype.draw=function(a){for(var b=this._htOption,c=this._el,d=a.getModuleCount(),e=Math.floor(b.width/d),f=Math.floor(b.height/d),g=[''],h=0;d>h;h++){g.push("");for(var i=0;d>i;i++)g.push('');g.push("")}g.push("
    "),c.innerHTML=g.join("");var j=c.childNodes[0],k=(b.width-j.offsetWidth)/2,l=(b.height-j.offsetHeight)/2;k>0&&l>0&&(j.style.margin=l+"px "+k+"px")},a.prototype.clear=function(){this._el.innerHTML=""},a}();QRCode=function(a,b){if(this._htOption={width:256,height:256,typeNumber:4,colorDark:"#000000",colorLight:"#ffffff",correctLevel:d.H},"string"==typeof b&&(b={text:b}),b)for(var c in b)this._htOption[c]=b[c];"string"==typeof a&&(a=document.getElementById(a)),this._android=n(),this._el=a,this._oQRCode=null,this._oDrawing=new q(this._el,this._htOption),this._htOption.text&&this.makeCode(this._htOption.text)},QRCode.prototype.makeCode=function(a){this._oQRCode=new b(r(a,this._htOption.correctLevel),this._htOption.correctLevel),this._oQRCode.addData(a),this._oQRCode.make(),this._el.title=a,this._oDrawing.draw(this._oQRCode),this.makeImage()},QRCode.prototype.makeImage=function(){"function"==typeof this._oDrawing.makeImage&&(!this._android||this._android>=3)&&this._oDrawing.makeImage()},QRCode.prototype.clear=function(){this._oDrawing.clear()},QRCode.CorrectLevel=d}(); \ No newline at end of file