Browse Source

Allow to query by null email.

pull/815/head
Sebastian 4 years ago
parent
commit
5be27c3db8
  1. 5
      backend/src/Squidex.Domain.Users/DefaultUserResolver.cs
  2. 2
      backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs

5
backend/src/Squidex.Domain.Users/DefaultUserResolver.cs

@ -8,6 +8,7 @@
using System.Security.Claims; using System.Security.Claims;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Squidex.Infrastructure; using Squidex.Infrastructure;
using Squidex.Shared.Identity;
using Squidex.Shared.Users; using Squidex.Shared.Users;
#pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body #pragma warning disable RECS0022 // A catch clause that catches System.Exception and has an empty body
@ -125,15 +126,13 @@ namespace Squidex.Domain.Users
public async Task<List<IUser>> QueryByEmailAsync(string email, public async Task<List<IUser>> QueryByEmailAsync(string email,
CancellationToken ct = default) CancellationToken ct = default)
{ {
Guard.NotNullOrEmpty(email, nameof(email));
await using (var scope = serviceProvider.CreateAsyncScope()) await using (var scope = serviceProvider.CreateAsyncScope())
{ {
var userService = scope.ServiceProvider.GetRequiredService<IUserService>(); var userService = scope.ServiceProvider.GetRequiredService<IUserService>();
var result = await userService.QueryAsync(email, ct: ct); var result = await userService.QueryAsync(email, ct: ct);
return result.ToList(); return result.Where(x => !x.Claims.IsHidden()).ToList();
} }
} }

2
backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs

@ -93,7 +93,7 @@ namespace Squidex.Areas.Api.Controllers.Users
{ {
var users = await userResolver.QueryByEmailAsync(query, HttpContext.RequestAborted); var users = await userResolver.QueryByEmailAsync(query, HttpContext.RequestAborted);
var response = users.Where(x => !x.Claims.IsHidden()).Select(x => UserDto.FromUser(x, Resources)).ToArray(); var response = users.Select(x => UserDto.FromUser(x, Resources)).ToArray();
return Ok(response); return Ok(response);
} }

Loading…
Cancel
Save