* Add UserResponseModel * Add factory to created UserResponseModel * Add GetByKey controller * Add GetAllUsers endpoint * User proper response model * Make naming consistent * Order by username in GetAll * Add user filter endpoint * Fix includer user states * Remove gravatar from the backend * Send user avatars in response * Add create user model * start working on create * Validate the create model * Add authorization to create * Use UserRepository instead of UserService to ValidateSessíonId * Create IBackofficeUserStore interface This is essentially a core-friendly version of the BackOfficeUserStore, additionally it contains basic methods for managing users, I.E. Get users, save users, create users, etc. * Remove more usages of user service * Remove usages of IUserService in BackofficeUserStore * Add documentation * Fix tests and DI * add IBackOfficeUserStoreAccessor to resolve it in singleton services * Resolve circular dependency * Remove obsolete constructor * Add core friendly user manager * Finish createasync in user service * Add WIP create endpoint * Save newly creates users user groups * Use service scope for user service * Remove now unnecessary accessors * Add response types * Add update user endpoint * Add EmailUserInviteSender * Add technology free way of creating confirmation token * Add invite uri provider * Add invite user to user service * Add invite user controller * Add delete endpoint * Add operation status responses * Add operation status responses * Added temporary file uploads including a repository implementation using local temp folder. * Add Disable users endpoint * missing files * Fixed copy paste error * Fix create users return type * Updated OpenApi.json * Updated OpenApi.json * Handle if created failed in identity * Add enable user * Make users plural in enable/disable We're doing the operation on multiple entities * Added file extension check * Add unlock user endpoint * Clean up. Removed old TemporaryFileService and UploadFileService and updated dictionary items to use this new items * Clean up * Add reset password * Add UpdateUserGroupsOnUsers method * Add UpdateUserGroups * Get rid of stream directly on TemporaryFileModel, and use delegate to open stream instead. * Fix post merge * Use keys instead of IDs * Add ClearAvatar endpoint * Review changes * Moved models to their own files * Reverted launch settings * Move enlist extension to its own namespace * Create set avatar endpoint * Add reponse types * Remove infrastructure extension after merge * Add Cmapatibility suppressions * Add test suppression * Add integration tests * Fix issue found in tests * Add invited user to UserInvitationResult * Add more tests * Add update tests * Hide different tests under parent * Return DuplicatUserName user operation status if username matches an email * Add update tests * Change sorted set to HashSet It doesn't work if it's not IComparable * Change ID to Key when checking super * Add get tests * Add more GetAllTests * Move tests to the right namespace * Add filter test * Fix including disabled users bug found by test * Add test to ensure invited user state * Add test case for UserState.All * Add more filter tests * Add enable disable tests * Add resolver for keys and ids * Replace usages of IUserService with IUserIdKeyResolver * Add CompatibilitySuppressions * Add UserIdKeyResolverTests * Fix UserIdKeyResolver * Add missing user operation results * Updates from review * ID not key * Post instead of patch * Use set instead of params for enable/disable * Don't call to array * Use sets for usergroup keys and user keys instead * LanguageIsoCode instead of Language * Update CompatibilitySuppressions after changin enumerable to set --------- Co-authored-by: Bjarke Berg <mail@bergmania.dk> Co-authored-by: kjac <kja@umbraco.dk>
86 lines
3.0 KiB
C#
86 lines
3.0 KiB
C#
using System.Collections.Generic;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Microsoft.Extensions.Logging.Abstractions;
|
|
using NUnit.Framework;
|
|
using Umbraco.Cms.Core.Configuration.Models;
|
|
using Umbraco.Cms.Core.Events;
|
|
using Umbraco.Cms.Core.Mapping;
|
|
using Umbraco.Cms.Core.Models.Membership;
|
|
using Umbraco.Cms.Core.Persistence.Repositories;
|
|
using Umbraco.Cms.Core.Security;
|
|
using Umbraco.Cms.Core.Services;
|
|
using Umbraco.Cms.Tests.Common;
|
|
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 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 IUserGroupService UserGroupService => GetRequiredService<IUserGroupService>();
|
|
|
|
private IUserRepository UserRepository => GetRequiredService<IUserRepository>();
|
|
|
|
private IRuntimeState RuntimeState => GetRequiredService<IRuntimeState>();
|
|
|
|
private IEventMessagesFactory EventMessagesFactory => GetRequiredService<IEventMessagesFactory>();
|
|
|
|
private ILogger<BackOfficeUserStore> Logger = NullLogger<BackOfficeUserStore>.Instance;
|
|
|
|
|
|
private BackOfficeUserStore GetUserStore()
|
|
=> new(
|
|
ScopeProvider,
|
|
EntityService,
|
|
ExternalLoginService,
|
|
new TestOptionsSnapshot<GlobalSettings>(GlobalSettings),
|
|
UmbracoMapper,
|
|
new BackOfficeErrorDescriber(TextService),
|
|
AppCaches,
|
|
TwoFactorLoginService,
|
|
UserGroupService,
|
|
UserRepository,
|
|
RuntimeState,
|
|
EventMessagesFactory,
|
|
Logger
|
|
);
|
|
|
|
[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"
|
|
};
|
|
var 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);
|
|
}
|
|
}
|