diff --git a/src/Project/Controllers/ProjectController.cs b/src/Project/Controllers/ProjectController.cs
index a2d4f5ad42885ef586113c04355c75f013cb67e4..a6dad85b02a4b47b457181ee881bd1c407d5219f 100644
--- a/src/Project/Controllers/ProjectController.cs
+++ b/src/Project/Controllers/ProjectController.cs
@@ -35,8 +35,9 @@ namespace Coscine.Api.Project.Controllers
var user = _authenticator.GetUser();
return Ok(_projectModel.GetWithAccess(user, UserRoles.Member, UserRoles.Owner).ToList()
- .Select((project) => _projectModel.CreateReturnObjectFromDatabaseObject(project)))
- .OrderBy(element => element.DisplayName);
+ .Select((project) => _projectModel.CreateReturnObjectFromDatabaseObject(project))
+ .OrderBy(element => element.DisplayName)
+ );
}
diff --git a/src/Project/Controllers/SearchController.cs b/src/Project/Controllers/SearchController.cs
index aac2de73f18e49b10a76dbbdf9c62f37fc52dfd3..33ee8607a621f9185fd80094270b905077b69230 100644
--- a/src/Project/Controllers/SearchController.cs
+++ b/src/Project/Controllers/SearchController.cs
@@ -8,6 +8,7 @@ using LinqToDB.Tools;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using Microsoft.AspNetCore.Authorization;
namespace Coscine.Api.Project.Controllers
{
@@ -26,37 +27,29 @@ namespace Coscine.Api.Project.Controllers
[HttpGet("[controller]/allNoFilter/")]
public IActionResult SearchNoFilter()
{
- return Ok(_authenticator.ValidateAndExecute((user) =>
- {
- return GetSearchResults(user.Id, "", "");
- }));
+ var user = _authenticator.GetUser();
+ return Ok(GetSearchResults(user.Id, "", ""));
}
[HttpGet("[controller]/all/{encodedSearchWord}")]
public IActionResult Search(string encodedSearchWord)
{
- return Ok(_authenticator.ValidateAndExecute((user) =>
- {
- return GetSearchResults(user.Id, encodedSearchWord, "");
- }));
+ var user = _authenticator.GetUser();
+ return Ok(GetSearchResults(user.Id, encodedSearchWord, ""));
}
[HttpGet("[controller]/projectNoFilter/{projectId}")]
public IActionResult SearchProjectNoFilter(string projectId)
{
- return Ok(_authenticator.ValidateAndExecute((user) =>
- {
- return GetSearchResults(user.Id, "", projectId);
- }));
+ var user = _authenticator.GetUser();
+ return Ok(GetSearchResults(user.Id, "", projectId));
}
[HttpGet("[controller]/project/{projectId}/{encodedSearchWord}")]
public IActionResult SearchProject(string projectId, string encodedSearchWord)
{
- return Ok(_authenticator.ValidateAndExecute((user) =>
- {
- return GetSearchResults(user.Id, encodedSearchWord, projectId);
- }));
+ var user = _authenticator.GetUser();
+ return Ok(GetSearchResults(user.Id, encodedSearchWord, projectId));
}
private JToken GetSearchResults(Guid userId, string encodedSearchWord, string projectId)