Merge pull request overture-stack#10 from overture-stack/dependency-upgrades

Dependency Upgrades and JWT Template Update

Author: joneubank

pom.xml

@@ -30,7 +30,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>1.5.9.RELEASE</version>
+        <version>2.1.6.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -50,6 +50,7 @@
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
             <artifactId>spring-security-oauth2</artifactId>
+            <version>2.3.6.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -67,12 +68,12 @@
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-jwt</artifactId>
+            <version>1.0.10.RELEASE</version>
         </dependency>
 
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.8.9</version>
         </dependency>
 
         <!-- Test -->

src/main/java/bio/overture/microservicetemplate/jwt/JWTAuthorizationFilter.java

@@ -30,7 +30,9 @@
 @Slf4j
 public class JWTAuthorizationFilter extends GenericFilterBean {
 
-  private final String REQUIRED_ROLE = "USER";
+  private final String TYPE_ADMIN = "ADMIN";
+  private final String TYPE_USER = "USER";
+  private final String REQUIRED_TYPE = TYPE_ADMIN;
   private final String REQUIRED_STATUS = "Approved";
 
   @Override
@@ -42,7 +44,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
       val details = (OAuth2AuthenticationDetails) authentication.getDetails();
       val user = (JWTUser) details.getDecodedDetails();
 
-      boolean hasCorrectRole = user.getRoles().contains(REQUIRED_ROLE);
+      boolean hasCorrectRole = user.getType().equals(REQUIRED_TYPE);
       boolean hasCorrectStatus = user.getStatus().equalsIgnoreCase(REQUIRED_STATUS);
 
       if(!hasCorrectRole || !hasCorrectStatus) {

src/main/java/bio/overture/microservicetemplate/jwt/JWTUser.java

@@ -31,6 +31,7 @@ public class JWTUser {
   private String createdAt;
   private String lastLogin;
   private String preferredLanguage;
-  private List<String> roles;
+  private String type;
+  private List<String> permissions;
 
 }