[kbss-cvut/record-manager-ui#202] Remove Security Role

kbss-cvut · Oct 9, 2024 · 500fb8e · 500fb8e
1 parent 50d0136
commit 500fb8e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 93 deletions.
diff --git a/src/main/java/cz/cvut/kbss/study/model/Role.java b/src/main/java/cz/cvut/kbss/study/model/Role.java
@@ -55,12 +55,7 @@ public enum Role {
         this.iri = iri;
     }
 
-    public static Role getFromSecurityRole(cz.cvut.kbss.study.security.model.Role r) {
-        return switch (r) {
-            case USER -> user;
-            case ADMIN -> administrator;
-        };
-    }
+
 
     public String getIri() {
         return iri;

diff --git a/src/main/java/cz/cvut/kbss/study/security/model/Role.java b/src/main/java/cz/cvut/kbss/study/security/model/Role.java
diff --git a/src/main/java/cz/cvut/kbss/study/service/security/SecurityUtils.java b/src/main/java/cz/cvut/kbss/study/service/security/SecurityUtils.java
@@ -1,13 +1,9 @@
 package cz.cvut.kbss.study.service.security;
 
 import cz.cvut.kbss.study.exception.NotFoundException;
-import cz.cvut.kbss.study.model.PatientRecord;
-import cz.cvut.kbss.study.model.RoleGroup;
-import cz.cvut.kbss.study.model.User;
-import cz.cvut.kbss.study.model.Vocabulary;
+import cz.cvut.kbss.study.model.*;
 import cz.cvut.kbss.study.persistence.dao.PatientRecordDao;
 import cz.cvut.kbss.study.persistence.dao.UserDao;
-import cz.cvut.kbss.study.security.model.Role;
 import cz.cvut.kbss.study.security.model.UserDetails;
 import cz.cvut.kbss.study.service.ConfigReader;
 import cz.cvut.kbss.study.util.ConfigParam;
@@ -106,8 +102,7 @@ private User resolveAccountFromOAuthPrincipal(Jwt principal) {
 
         RoleGroup roleGroup = new RoleGroup();
         user.setRoleGroup(roleGroup);
-        roles.stream().map(Role::forName).filter(Optional::isPresent).map(Optional::get)
-            .forEach(r ->  roleGroup.addRole(cz.cvut.kbss.study.model.Role.getFromSecurityRole(r)));
+        roles.forEach(r ->  roleGroup.addRole(Role.fromIriOrName(r)));
         return user;
     }
 

diff --git a/src/test/java/cz/cvut/kbss/study/security/model/RoleTest.java b/src/test/java/cz/cvut/kbss/study/security/model/RoleTest.java