Skip to content
Snippets Groups Projects

Sprint/2021 11

Merged Petar Hristov requested to merge Sprint/2021-11 into master
1 file
+ 13
9
Compare changes
  • Side-by-side
  • Inline
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,14 +106,9 @@ 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.");
return BadRequest("User has no Access to this resource.");
}
if (check != null)
{
return check;
}
try
{
var resourceTypeOptions = _resourceModel.GetResourceTypeOptions(resource.Id);
@@ -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] != '/')
Loading