From 083f347efc7f30a0ca32944556fb6355f3305176 Mon Sep 17 00:00:00 2001
From: Marcel Nellesen <nellesen@itc.rwth-aachen.de>
Date: Thu, 16 Jan 2020 10:09:48 +0100
Subject: [PATCH] Replaced now deprecated functions with new implementation

---
 src/Project/Controllers/ProjectController.cs |  5 ++--
 src/Project/Controllers/SearchController.cs  | 25 +++++++-------------
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/Project/Controllers/ProjectController.cs b/src/Project/Controllers/ProjectController.cs
index a2d4f5a..a6dad85 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 aac2de7..33ee860 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)
-- 
GitLab