Skip to content

Commit 96e1aa3

Browse files
committed
Moved the permission annotation from AuthResource to AuthAdminResource
This way it doesn't matter how the reference to AuthAdminResource is obtained. The old version would require to guard each "getAuthAdminResource" methods individually. This is no longer necessary. Request: MO Change-Id: I69d7e0a1dd43addef3edda24a13cb6da692660ea
1 parent 53cb90a commit 96e1aa3

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

ui/src/main/java/io/bdeploy/ui/api/AuthAdminResource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import java.util.SortedSet;
55

66
import io.bdeploy.api.remote.v1.dto.CredentialsApi;
7+
import io.bdeploy.common.security.RequiredPermission;
8+
import io.bdeploy.common.security.ScopedPermission.Permission;
79
import io.bdeploy.interfaces.UserGroupInfo;
810
import io.bdeploy.interfaces.UserInfo;
911
import io.bdeploy.interfaces.settings.LDAPSettingsDto;
@@ -20,6 +22,7 @@
2022

2123
@Consumes(MediaType.APPLICATION_JSON)
2224
@Produces(MediaType.APPLICATION_JSON)
25+
@RequiredPermission(permission = Permission.ADMIN)
2326
public interface AuthAdminResource {
2427

2528
/**

ui/src/main/java/io/bdeploy/ui/api/AuthResource.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.bdeploy.ui.api;
22

33
import io.bdeploy.api.remote.v1.dto.CredentialsApi;
4-
import io.bdeploy.common.security.RequiredPermission;
5-
import io.bdeploy.common.security.ScopedPermission.Permission;
64
import io.bdeploy.interfaces.UserChangePasswordDto;
75
import io.bdeploy.interfaces.UserInfo;
86
import io.bdeploy.interfaces.UserProfileInfo;
@@ -132,6 +130,5 @@ public interface AuthResource {
132130
* @return the administrative interface for user managements.
133131
*/
134132
@Path("/admin")
135-
@RequiredPermission(permission = Permission.ADMIN)
136133
public AuthAdminResource getAdmin();
137134
}

0 commit comments

Comments
 (0)