Skip to content
Snippets Groups Projects
Commit 083f347e authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Replaced now deprecated functions with new implementation

parent ad957e69
No related branches found
No related tags found
2 merge requests!57Sprint/202000,!52Sprint/202000
......@@ -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)
);
}
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment