zervo/seb-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed spring security oauth version stick on 2.3.6

Browse source 
(2.3.7) gives deserialization problems
This commit is contained in:
anhefti 2019-10-17 22:38:50 +02:00
parent 2b7c5da479
commit 4e40ee7f0e
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -285,7 +285,7 @@
<dependency> <dependency>
<groupId>org.springframework.security.oauth</groupId> <groupId>org.springframework.security.oauth</groupId>
<artifactId>spring-security-oauth2</artifactId> <artifactId>spring-security-oauth2</artifactId>
<version>[2.3.4,)</version> <version>2.3.6.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.security</groupId> <groupId>org.springframework.security</groupId>

10
src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserRole.java
View file

@ -13,11 +13,13 @@ import java.util.Collections;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.List; import java.util.List;
import org.springframework.security.core.GrantedAuthority;
import ch.ethz.seb.sebserver.gbl.api.EntityType; import ch.ethz.seb.sebserver.gbl.api.EntityType;
import ch.ethz.seb.sebserver.gbl.model.Entity; import ch.ethz.seb.sebserver.gbl.model.Entity;
/** Defines the possible user roles of SEB Server users. */ /** Defines the possible user roles of SEB Server users. */
public enum UserRole implements Entity { public enum UserRole implements Entity, GrantedAuthority {
SEB_SERVER_ADMIN, SEB_SERVER_ADMIN,
INSTITUTIONAL_ADMIN, INSTITUTIONAL_ADMIN,
EXAM_ADMIN, EXAM_ADMIN,
@ -38,6 +40,11 @@ public enum UserRole implements Entity {
return name(); return name();
} }
@Override
public String getAuthority() {
return name();
}
public static List<UserRole> publicRolesForUser(final UserInfo user) { public static List<UserRole> publicRolesForUser(final UserInfo user) {
final EnumSet<UserRole> roles = user.getUserRoles(); final EnumSet<UserRole> roles = user.getUserRoles();
if (roles.contains(SEB_SERVER_ADMIN)) { if (roles.contains(SEB_SERVER_ADMIN)) {
@ -52,4 +59,5 @@ public enum UserRole implements Entity {
return Collections.emptyList(); return Collections.emptyList();
} }
} }
} }