From 5be27c3db80837252ac021762c863d32cf8e552c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 15 Dec 2021 16:11:31 +0100 Subject: [PATCH] Allow to query by null email. --- backend/src/Squidex.Domain.Users/DefaultUserResolver.cs | 5 ++--- .../Squidex/Areas/Api/Controllers/Users/UsersController.cs | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs b/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs index 64612c847..a7a171483 100644 --- a/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs +++ b/backend/src/Squidex.Domain.Users/DefaultUserResolver.cs @@ -8,6 +8,7 @@ using System.Security.Claims; using Microsoft.Extensions.DependencyInjection; using Squidex.Infrastructure; +using Squidex.Shared.Identity; using Squidex.Shared.Users; #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> QueryByEmailAsync(string email, CancellationToken ct = default) { - Guard.NotNullOrEmpty(email, nameof(email)); - await using (var scope = serviceProvider.CreateAsyncScope()) { var userService = scope.ServiceProvider.GetRequiredService(); var result = await userService.QueryAsync(email, ct: ct); - return result.ToList(); + return result.Where(x => !x.Claims.IsHidden()).ToList(); } } diff --git a/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs b/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs index b7e5d4088..733e968d6 100644 --- a/backend/src/Squidex/Areas/Api/Controllers/Users/UsersController.cs +++ b/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 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); }