yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v9/dev' into v10/dev

Browse Source
This commit is contained in:
Bjarke Berg
2022-04-22 14:28:56 +02:00
parent a5b41b3133 d1fcacb442
commit c441a26dc7
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.BackOffice/Controllers/TwoFactorLoginController.cs
View File

@@ -72,7 +72,14 @@ namespace Umbraco.Cms.Web.BackOffice.Controllers
var enabledProviderNameHashSet = new HashSet<string>(await _twoFactorLoginService.GetEnabledTwoFactorProviderNamesAsync(user.Key)); var enabledProviderNameHashSet = new HashSet<string>(await _twoFactorLoginService.GetEnabledTwoFactorProviderNamesAsync(user.Key));
var providerNames = await _backOfficeUserManager.GetValidTwoFactorProvidersAsync(user); IEnumerable<string> providerNames = await _backOfficeUserManager.GetValidTwoFactorProvidersAsync(user);
// Filter out any providers that does not have a view attached to it, since it's unusable then.
providerNames = providerNames.Where(providerName =>
{
TwoFactorLoginViewOptions options = _twoFactorLoginViewOptions.Get(providerName);
return options is not null && !string.IsNullOrWhiteSpace(options.SetupViewPath);
});
return providerNames.Select(providerName => return providerNames.Select(providerName =>
new UserTwoFactorProviderModel(providerName, enabledProviderNameHashSet.Contains(providerName))).ToArray(); new UserTwoFactorProviderModel(providerName, enabledProviderNameHashSet.Contains(providerName))).ToArray();

3
tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Languages/languages.ts
View File

@@ -13,7 +13,8 @@ context('Languages', () => {
cy.umbracoEnsureLanguageCultureNotExists(culture); cy.umbracoEnsureLanguageCultureNotExists(culture);
cy.umbracoSection('settings'); cy.umbracoSection('settings');
cy.get('.umb-tree-root-link').contains('Settings') cy.get('.umb-box-content').should('be.visible');
cy.get('li .umb-tree-root:contains("Settings")').should("be.visible");
// Enter language tree and create new language // Enter language tree and create new language
cy.umbracoTreeItem('settings', ['Languages']).click(); cy.umbracoTreeItem('settings', ['Languages']).click();
cy.umbracoButtonByLabelKey('languages_addLanguage').click(); cy.umbracoButtonByLabelKey('languages_addLanguage').click();