* Added functionality to enable 2FA for users.. * Do not use the obsolete ctor in tests * cleanup * Cleanup * Convert User view from overlay to infinite editor * Add support for having additional editors on top of the user (2fa) which overlay does not support * Add controllerAs syntax in the template * Remove unused dependencies * Adjustments to 2fa login view * organize elements * add translations * add a11y helpers * add autocompletion = one-time-code * change to controllerAs syntax * add callback to cancel 2fa and fix error where submit button was not reset when all other validations were * add a cancel/go back button to the 2fa view * replace header with something less obstrusive * move logout button to the footer in the new editor view * change 'edit profile' to an umb-box and move ng-if for password fields out to reduce amount of checks * Add umb-box to external login provider section * add umb-box to user history section * bug: fix bug where notificationsService would not allow new notifications if removeAll had been called * add styling and a11y to configureTwoFactor view - also ensure that the view reloads when changes happen in the custom user view to enable 2fa - ensure that view updates when disabling 2fa - add extra button to show options (disable) for each 2fa provider * add notification when 2fa is disabled * add data-element to support the intro tour also changed a minor selector in the cypress test * correct usage of umb-box with umb-box-content * do not use the .form class twice to prevent double box-shadow * make tranlastion for 2fa placeholder shorter * ensure that field with 2fa provider is always visible when more than 1 provider * move error state of 2fa field to token field * update translation of multiple 2fa providers * move CTA buttons to right side to follow general UI practices * rename options to disable * add disabled state * add helper folders to gitignore so you can work with plugins and custom code without committing it accidentally * move the disable functionality to its own infinite editor view * use properties from umb-control-group correctly * add 'track by' to repeater * make use of umb-control-group * remove unused functions * clean up translations * add Danish translations * copy translations to english * Only return enabled 2fa providers as expected Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
70 lines
2.7 KiB
C#
70 lines
2.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Microsoft.Extensions.Options;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Mapping;
|
|
using Umbraco.Cms.Core.Models.Membership;
|
|
using Umbraco.Cms.Core.Scoping;
|
|
using Umbraco.Cms.Core.Security;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Tests.Common.Testing;
|
|
using Umbraco.Cms.Tests.Integration.Testing;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Security
|
|
{
|
|
[TestFixture]
|
|
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
|
|
public class BackOfficeUserStoreTests : UmbracoIntegrationTest
|
|
{
|
|
private IUserService UserService => GetRequiredService<IUserService>();
|
|
private IEntityService EntityService => GetRequiredService<IEntityService>();
|
|
private IExternalLoginWithKeyService ExternalLoginService => GetRequiredService<IExternalLoginWithKeyService>();
|
|
private IUmbracoMapper UmbracoMapper => GetRequiredService<IUmbracoMapper>();
|
|
private ILocalizedTextService TextService => GetRequiredService<ILocalizedTextService>();
|
|
private ITwoFactorLoginService TwoFactorLoginService => GetRequiredService<ITwoFactorLoginService>();
|
|
|
|
private BackOfficeUserStore GetUserStore()
|
|
=> new BackOfficeUserStore(
|
|
ScopeProvider,
|
|
UserService,
|
|
EntityService,
|
|
ExternalLoginService,
|
|
Options.Create(GlobalSettings),
|
|
UmbracoMapper,
|
|
new BackOfficeErrorDescriber(TextService),
|
|
AppCaches,
|
|
TwoFactorLoginService
|
|
);
|
|
|
|
[Test]
|
|
public async Task Can_Persist_Is_Approved()
|
|
{
|
|
var userStore = GetUserStore();
|
|
var user = new BackOfficeIdentityUser(GlobalSettings, 1, new List<IReadOnlyUserGroup>())
|
|
{
|
|
Name = "Test",
|
|
Email = "test@test.com",
|
|
UserName = "test@test.com"
|
|
};
|
|
IdentityResult createResult = await userStore.CreateAsync(user);
|
|
Assert.IsTrue(createResult.Succeeded);
|
|
Assert.IsFalse(user.IsApproved);
|
|
|
|
// update
|
|
user.IsApproved = true;
|
|
var saveResult = await userStore.UpdateAsync(user);
|
|
Assert.IsTrue(saveResult.Succeeded);
|
|
Assert.IsTrue(user.IsApproved);
|
|
|
|
// get get
|
|
user = await userStore.FindByIdAsync(user.Id);
|
|
Assert.IsTrue(user.IsApproved);
|
|
}
|
|
}
|
|
}
|