Simplify permissions

This commit is contained in:
René Pfeuffer
2020-09-22 10:08:30 +02:00
parent f594674ad0
commit ab6be650e9
6 changed files with 6 additions and 8 deletions

View File

@@ -47,7 +47,7 @@ class NamespaceToNamespaceDtoMapper {
.self(links.namespace().self(namespace))
.single(link("repositories", links.repositoryCollection().forNamespace(namespace)));
if (NamespacePermissions.permissionRead().isPermitted() || NamespacePermissions.permissionWrite().isPermitted()) {
if (NamespacePermissions.permissionRead().isPermitted()) {
linkingTo
.single(link("permissions", links.namespacePermission().all(namespace)));
}

View File

@@ -78,9 +78,7 @@ public class RepositoryPermissionCollectionToDtoMapper {
}
private Links createLinks(Namespace namespace) {
if (!NamespacePermissions.permissionWrite().isPermitted()) {
NamespacePermissions.permissionRead().check();
}
NamespacePermissions.permissionRead().check();
Links.Builder linksBuilder = linkingTo()
.with(Links.linkingTo().self(resourceLinks.namespacePermission().all(namespace.getNamespace())).build());
if (NamespacePermissions.permissionWrite().isPermitted()) {

View File

@@ -104,7 +104,7 @@ public class DefaultNamespaceManager implements NamespaceManager {
}
private Namespace createNamespaceForName(String namespace) {
if (NamespacePermissions.permissionRead().isPermitted() || NamespacePermissions.permissionWrite().isPermitted()) {
if (NamespacePermissions.permissionRead().isPermitted()) {
return dao.get(namespace)
.map(Namespace::clone)
.orElse(new Namespace(namespace));

View File

@@ -48,7 +48,7 @@
<value>namespace:permissionRead</value>
</permission>
<permission>
<value>namespace:permissionWrite</value>
<value>namespace:permissionRead,permissionWrite</value>
</permission>
<permission>
<value>user:*</value>

View File

@@ -98,7 +98,7 @@
"displayName": "Berechtigungen auf Namespaces lesen",
"description": "Darf die Berechtigungen auf Namespace-Ebene sehen"
},
"permissionWrite": {
"permissionRead,permissionWrite": {
"displayName": "Berechtigungen auf Namespaces modifizieren",
"description": "Darf die Berechtigungen auf Namespace-Ebene lesen und bearbeiten"
}

View File

@@ -98,7 +98,7 @@
"displayName": "Read permissions on namespaces",
"description": "May see the permissions set for namespaces"
},
"permissionWrite": {
"permissionRead,permissionWrite": {
"displayName": "Modify permissions on namespaces",
"description": "May read and modify the permissions set for namespaces"
}