From 4e40ee7f0eb3ae7dd2b87e882cb57682beb53770 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Thu, 17 Oct 2019 22:38:50 +0200
Subject: [PATCH] fixed spring security oauth version stick on 2.3.6

(2.3.7) gives deserialization problems
---
 pom.xml                                                |  2 +-
 .../ch/ethz/seb/sebserver/gbl/model/user/UserRole.java | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index d59a3a4f..acf1584c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,7 +285,7 @@
     <dependency>
       <groupId>org.springframework.security.oauth</groupId>
       <artifactId>spring-security-oauth2</artifactId>
-      <version>[2.3.4,)</version>
+      <version>2.3.6.RELEASE</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.security</groupId>
diff --git a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserRole.java b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserRole.java
index 9e649592..03b235c9 100644
--- a/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserRole.java
+++ b/src/main/java/ch/ethz/seb/sebserver/gbl/model/user/UserRole.java
@@ -13,11 +13,13 @@ import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 
+import org.springframework.security.core.GrantedAuthority;
+
 import ch.ethz.seb.sebserver.gbl.api.EntityType;
 import ch.ethz.seb.sebserver.gbl.model.Entity;
 
 /** Defines the possible user roles of SEB Server users. */
-public enum UserRole implements Entity {
+public enum UserRole implements Entity, GrantedAuthority {
     SEB_SERVER_ADMIN,
     INSTITUTIONAL_ADMIN,
     EXAM_ADMIN,
@@ -38,6 +40,11 @@ public enum UserRole implements Entity {
         return name();
     }
 
+    @Override
+    public String getAuthority() {
+        return name();
+    }
+
     public static List<UserRole> publicRolesForUser(final UserInfo user) {
         final EnumSet<UserRole> roles = user.getUserRoles();
         if (roles.contains(SEB_SERVER_ADMIN)) {
@@ -52,4 +59,5 @@ public enum UserRole implements Entity {
             return Collections.emptyList();
         }
     }
+
 }