Browse Source

Fix admin creation.

pull/669/head
Sebastian 5 years ago
parent
commit
57d00d60e7
  1. 3
      backend/src/Squidex.Domain.Users/DefaultUserService.cs
  2. 4
      backend/src/Squidex/Areas/IdentityServer/Config/CreateAdminInitializer.cs
  3. 14
      backend/tests/Squidex.Domain.Users.Tests/DefaultUserServiceTests.cs

3
backend/src/Squidex.Domain.Users/DefaultUserService.cs

@ -76,6 +76,9 @@ namespace Squidex.Domain.Users
public async Task<IResultList<IUser>> QueryAsync(string? query, int take, int skip)
{
Guard.GreaterThan(take, 0, nameof(take));
Guard.GreaterEquals(skip, 0, nameof(skip));
IQueryable<IdentityUser> QueryUsers(string? email = null)
{
var result = userManager.Users;

4
backend/src/Squidex/Areas/IdentityServer/Config/CreateAdminInitializer.cs

@ -55,7 +55,7 @@ namespace Squidex.Areas.IdentityServer.Config
{
try
{
var user = await userService.FindByIdAsync(adminEmail);
var user = await userService.FindByEmailAsync(adminEmail);
if (user != null)
{
@ -113,7 +113,7 @@ namespace Squidex.Areas.IdentityServer.Config
private static async Task<bool> IsEmptyAsync(IUserService userService)
{
var users = await userService.QueryAsync(take: 0);
var users = await userService.QueryAsync(take: 1);
return users.Total == 0;
}

14
backend/tests/Squidex.Domain.Users.Tests/DefaultUserServiceTests.cs

@ -175,7 +175,7 @@ namespace Squidex.Domain.Users
Email = identity.Email
};
SetupCreation(identity, values, 1);
SetupCreation(identity, 1);
await sut.CreateAsync(values.Email, values);
@ -205,7 +205,7 @@ namespace Squidex.Domain.Users
Consent = true,
};
SetupCreation(identity, values, 1);
SetupCreation(identity, 1);
await sut.CreateAsync(identity.Email, values);
@ -223,7 +223,7 @@ namespace Squidex.Domain.Users
Consent = true,
};
SetupCreation(identity, values, 0);
SetupCreation(identity, 0);
await sut.CreateAsync(identity.Email, values);
@ -241,7 +241,7 @@ namespace Squidex.Domain.Users
Consent = true,
};
SetupCreation(identity, values, 0);
SetupCreation(identity, 0);
await sut.CreateAsync(identity.Email, values, true);
@ -259,7 +259,7 @@ namespace Squidex.Domain.Users
Consent = true,
};
SetupCreation(identity, values, 1);
SetupCreation(identity, 1);
await sut.CreateAsync(identity.Email, values, true);
@ -277,7 +277,7 @@ namespace Squidex.Domain.Users
Password = "password"
};
SetupCreation(identity, values, 1);
SetupCreation(identity, 1);
await sut.CreateAsync(identity.Email, values, false);
@ -564,7 +564,7 @@ namespace Squidex.Domain.Users
return identity;
}
private void SetupCreation(IdentityUser identity, UserValues values, int numCurrentUsers)
private void SetupCreation(IdentityUser identity, int numCurrentUsers)
{
var users = new List<IdentityUser>();

Loading…
Cancel
Save