Skip to content
Snippets Groups Projects
Commit 5517eff0 authored by Petar Hristov's avatar Petar Hristov :speech_balloon:
Browse files

Merge branch 'Sprint/2021-11' into 'master'

Sprint/2021 11

See merge request !36
parents 55546715 c9e5d9b6
Branches
Tags
1 merge request!36Sprint/2021 11
using Coscine.WaterbutlerHelper;
using Coscine.WaterbutlerHelper;
using Coscine.WaterbutlerHelper.ReturnObjects;
using Coscine.ApiCommons;
using Coscine.ApiCommons.Factories;
......@@ -94,6 +94,10 @@ namespace Coscine.Api.Tree.Controllers
var user = _authenticator.GetUser();
var check = CheckResourceIdAndPath(resourceId, path, out Resource resource);
if (check != null)
{
return check;
}
if (resource.ApplicationProfile[^1] != '/')
{
......@@ -102,12 +106,7 @@ namespace Coscine.Api.Tree.Controllers
if (user == null || !_resourceModel.HasAccess(user, resource, UserRoles.Owner, UserRoles.Member))
{
return Forbid("User has no Access to this resource.");
}
if (check != null)
{
return check;
return BadRequest("User has no Access to this resource.");
}
try
......@@ -223,7 +222,12 @@ namespace Coscine.Api.Tree.Controllers
if (user == null || !_resourceModel.HasAccess(user, resource, UserRoles.Owner, UserRoles.Member))
{
return Forbid("User is no project member!");
return BadRequest("User is no project member!");
}
if (resource.Archived == "1")
{
return BadRequest("The resource is readonly!");
}
if (resource.ApplicationProfile[^1] != '/')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment