Skip to content
Snippets Groups Projects
Commit a7a491c5 authored by Benedikt Heinrichs's avatar Benedikt Heinrichs
Browse files

Merge branch 'Hotfix/1035-fixResourceApi' into 'master'

Fix: Fixed HasAccessMethod

See merge request coscine/cs/database!99
parents 790dd32e 6f40ea8a
No related branches found
No related tags found
1 merge request!99Fix: Fixed HasAccessMethod
...@@ -175,13 +175,13 @@ namespace Coscine.Database.Models ...@@ -175,13 +175,13 @@ namespace Coscine.Database.Models
public bool HasAccess(User user, Resource resource, params string[] allowedAccess) public bool HasAccess(User user, Resource resource, params string[] allowedAccess)
{ {
var projectId = new ProjectResourceModel().GetProjectForResource(resource.Id);
IEnumerable<string> allowedAccessLabels = allowedAccess.Select(x => x.ToLower().Trim()).ToList(); IEnumerable<string> allowedAccessLabels = allowedAccess.Select(x => x.ToLower().Trim()).ToList();
return DatabaseConnection.ConnectToDatabase((db) => (from relation in db.ProjectRoles return DatabaseConnection.ConnectToDatabase((db) => (from relation in db.ProjectRoles
where relation.Project.ProjectResourceProjectIdIds != null && relation.Project.ProjectResourceProjectIdIds where relation.ProjectId == projectId
.Any((projectResource) => projectResource.Resource.Id == resource.Id) && relation.User.Id == user.Id
&& relation.User.Id == user.Id && allowedAccessLabels.Contains(relation.Role.DisplayName.ToLower())
&& allowedAccessLabels.Contains(relation.Role.DisplayName.ToLower()) select relation).Any());
select relation).Any());
} }
public int UpdateByObject(Resource resource, ResourceObject resourceObject) public int UpdateByObject(Resource resource, ResourceObject resourceObject)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment