passkey adjustments
This commit is contained in:
@ -52,7 +52,7 @@ else
|
||||
</div>
|
||||
<button type="button" class="btn btn-secondary col-12 mt-4" @onclick="Forgot">@Localizer["ForgotPassword"]</button>
|
||||
|
||||
@if (_allowpasskeys && PageState.Route.Scheme == "https")
|
||||
@if (_allowpasskeys)
|
||||
{
|
||||
<hr class="app-rule mt-3" />
|
||||
<button type="button" class="btn btn-primary col-12 mt-2" @onclick="Passkey">@Localizer["Passkey"]</button>
|
||||
@ -116,7 +116,7 @@ else
|
||||
{
|
||||
_allowexternallogin = (SettingService.GetSetting(PageState.Site.Settings, "ExternalLogin:ProviderType", "") != "") ? true : false;
|
||||
_allowsitelogin = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowSiteLogin", "true"));
|
||||
_allowpasskeys = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AllowPasskeys", "false"));
|
||||
_allowpasskeys = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:Passkeys", "false"));
|
||||
_alwaysremember = bool.Parse(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:AlwaysRemember", "false"));
|
||||
|
||||
if (!string.IsNullOrEmpty(SettingService.GetSetting(PageState.Site.Settings, "LoginOptions:RegisterUrl", "")))
|
||||
@ -365,14 +365,14 @@ else
|
||||
}
|
||||
else
|
||||
{
|
||||
await logger.LogError("Error Logging In With Passkey");
|
||||
AddModuleMessage(Localizer["Error.Passkey"], MessageType.Error);
|
||||
await logger.LogError("Passkey Login Was Not Successful");
|
||||
AddModuleMessage(Localizer["Error.Passkey.Fail"], MessageType.Warning);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await logger.LogError(ex, "Error Logging In With Passkey");
|
||||
AddModuleMessage(Localizer["Error.Passkey"], MessageType.Error);
|
||||
await logger.LogError(ex, "Passkey Login Was Not Successful");
|
||||
AddModuleMessage(Localizer["Error.Passkey.Fail"], MessageType.Warning);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@ -115,14 +115,7 @@
|
||||
@if (_allowpasskeys)
|
||||
{
|
||||
<Section Name="Passkeys" Heading="Passkeys" ResourceKey="Passkeys">
|
||||
@if (PageState.Route.Scheme == "https")
|
||||
{
|
||||
<button type="button" class="btn btn-primary" @onclick="AddPasskey">@SharedLocalizer["Add"]</button>
|
||||
}
|
||||
else
|
||||
{
|
||||
<ModuleMessage Type="MessageType.Warning" Message="@Localizer["Message.Passkeys.Insecure"]" />
|
||||
}
|
||||
<button type="button" class="btn btn-primary" @onclick="AddPasskey">@SharedLocalizer["Add"]</button>
|
||||
@if (_passkeys != null && _passkeys.Count > 0)
|
||||
{
|
||||
<Pager Items="@_passkeys">
|
||||
@ -669,7 +662,7 @@
|
||||
{
|
||||
// post back to the Passkey page so that the cookies are set correctly
|
||||
var interop = new Interop(JSRuntime);
|
||||
var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, operation = "create", returnurl = NavigateUrl() };
|
||||
var fields = new { __RequestVerificationToken = SiteState.AntiForgeryToken, operation = "create", returnurl = NavigateUrl(PageState.Page.Path, "tab=Security") };
|
||||
string url = Utilities.TenantUrl(PageState.Alias, "/pages/passkey/");
|
||||
await interop.SubmitForm(url, fields);
|
||||
}
|
||||
@ -694,14 +687,14 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
await logger.LogError("Error Adding Passkey");
|
||||
AddModuleMessage(Localizer["Error.Passkey"], MessageType.Error);
|
||||
await logger.LogError("Passkey Could Not Be Created");
|
||||
AddModuleMessage(Localizer["Error.Passkey.Fail"], MessageType.Warning);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
await logger.LogError(ex, "Error Adding Passkey");
|
||||
AddModuleMessage(Localizer["Error.Passkey"], MessageType.Error);
|
||||
await logger.LogError(ex, "Passkey Could Not Be Created");
|
||||
AddModuleMessage(Localizer["Error.Passkey.Fail"], MessageType.Warning);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -234,4 +234,7 @@
|
||||
<data name="Passkey" xml:space="preserve">
|
||||
<value>Use Passkey</value>
|
||||
</data>
|
||||
<data name="Error.Passkey.Fail" xml:space="preserve">
|
||||
<value>Passkey Login Was Not Successful</value>
|
||||
</data>
|
||||
</root>
|
||||
@ -279,13 +279,13 @@
|
||||
<data name="Confirm.Login.Delete" xml:space="preserve">
|
||||
<value>Are You Sure You Wish To Delete {0}?</value>
|
||||
</data>
|
||||
<data name="Message.Passkeys.Insecure" xml:space="preserve">
|
||||
<value>Passkeys Can Only Be Created Using a Secure Browser Connection</value>
|
||||
</data>
|
||||
<data name="Message.Passkeys.None" xml:space="preserve">
|
||||
<value>You Have Not Created Any Passkeys</value>
|
||||
</data>
|
||||
<data name="Message.Logins.None" xml:space="preserve">
|
||||
<value>You Do Not Have Any External Logins For This Site</value>
|
||||
</data>
|
||||
<data name="Error.Passkey.Fail" xml:space="preserve">
|
||||
<value>Passkey Could Not Be Created</value>
|
||||
</data>
|
||||
</root>
|
||||
Reference in New Issue
Block a user