Skip to content

Update two-factor-authentication.md #7476

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update two-factor-authentication.md #7476

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 40 additions & 27 deletions 16/umbraco-cms/reference/security/two-factor-authentication.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public class UmbracoAppAuthenticator : ITwoFactorProvider
/// <returns>The required data to setup the authenticator app</returns>
public Task<ISetupTwoFactorModel> GetSetupDataAsync(Guid userOrMemberKey, string secret)
{
var member = _memberService.GetByKey(userOrMemberKey);
var member = _memberService.GetById(userOrMemberKey);

var applicationName = "testingOn15";
var twoFactorAuthenticator = new TwoFactorAuthenticator();
Expand Down Expand Up @@ -175,45 +175,58 @@ If you already have a members-only page with the edit profile options, you can s
@using Umbraco.Cms.Web.Website.Controllers;
@using Umbraco.Cms.Web.Website.Models;
@using My.Website;
@inject MemberModelBuilderFactory memberModelBuilderFactory
@inject ITwoFactorLoginService twoFactorLoginService
@inject MemberModelBuilderFactory MemberModelBuilderFactory
@inject IMemberTwoFactorLoginService MemberTwoFactorLoginService
@{
// Build a profile model to edit
var profileModel = await memberModelBuilderFactory
.CreateProfileModel()
.BuildForCurrentMemberAsync();
var profileModel = await MemberModelBuilderFactory
.CreateProfileModel()
.BuildForCurrentMemberAsync();

List<UserTwoFactorProviderModel>? providerNameList = null;
if (profileModel != null)
{
var providerNamesAttempt = await MemberTwoFactorLoginService.GetProviderNamesAsync(profileModel.Key);

if (providerNamesAttempt.Success)
{
providerNameList = providerNamesAttempt.Result.ToList();
}
}

// Show all two factor providers
var providerNames = twoFactorLoginService.GetAllProviderNames();
if (providerNames.Any())
if (providerNameList != null && providerNameList.Any())
{
<div asp-validation-summary="All" class="text-danger"></div>
foreach (var providerName in providerNames)
{
var setupData = await twoFactorLoginService.GetSetupInfoAsync(profileModel.Key, providerName);
foreach (var provider in providerNameList)
{0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{0
{

var setupData = await MemberTwoFactorLoginService.GetSetupInfoAsync(profileModel.Key, provider.ProviderName);

// If the `setupData` is `null` for the specified `providerName` it means the provider is already set up.
// In this case, a button to disable the authentication is shown.
if (setupData is null)
// If the `setupData.Success` is `true` for the specified `providerName` it means the provider is not set up.
if (setupData.Success)
{
@using (Html.BeginUmbracoForm<UmbTwoFactorLoginController>(nameof(UmbTwoFactorLoginController.Disable)))
if (setupData.Result is QrCodeSetupData qrCodeSetupData)
{
<input type="hidden" name="providerName" value="@providerName"/>
<button type="submit">Disable @providerName</button>
@using (Html.BeginUmbracoForm<UmbTwoFactorLoginController>(nameof(UmbTwoFactorLoginController.ValidateAndSaveSetup)))
{
<h3>Setup @providerName</h3>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<h3>Setup @providerName</h3>
<h3>Setup @provider.ProviderName</h3>

<img src="@qrCodeSetupData.SetupCode.QrCodeSetupImageUrl"/>
<p>Scan the code above with your authenticator app <br /> and enter the resulting code here to validate:</p>
<input type="hidden" name="providerName" value="@providerName" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<input type="hidden" name="providerName" value="@providerName" />
<input type="hidden" name="providerName" value="@provider.ProviderName" />

<input type="hidden" name="secret" value="@qrCodeSetupData.Secret" />
<input type="text" name="code" />
<button type="submit">Validate & save</button>
}
}
}
// If `setupData` is not `null` the type is checked and the UI for how to set up the App Authenticator is shown.
else if(setupData is QrCodeSetupData qrCodeSetupData)
// If `setupData.Success` is `false` the provider is already setup.
// In this case, a button to disable the authentication is shown.
else
{
@using (Html.BeginUmbracoForm<UmbTwoFactorLoginController>(nameof(UmbTwoFactorLoginController.ValidateAndSaveSetup)))
@using (Html.BeginUmbracoForm<UmbTwoFactorLoginController>(nameof(UmbTwoFactorLoginController.Disable)))
{
<h3>Setup @providerName</h3>
<img src="@qrCodeSetupData.SetupCode.QrCodeSetupImageUrl"/>
<p>Scan the code above with your authenticator app <br /> and enter the resulting code here to validate:</p>
<input type="hidden" name="providerName" value="@providerName" />
<input type="hidden" name="secret" value="@qrCodeSetupData.Secret" />
<input type="text" name="code" />
<button type="submit">Validate & save</button>
<input type="hidden" name="providerName" value="@providerName"/>
<button type="submit">Disable @providerName</button>
Comment on lines +228 to +229
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<input type="hidden" name="providerName" value="@providerName"/>
<button type="submit">Disable @providerName</button>
<input type="hidden" name="providerName" value="@provider.ProviderName" />
<button type="submit">Disable @provider.ProviderName</button>

}
}
}
Expand Down