refactor

Author: mrge-sevket-goekay

src/main/java/de/rwth/idsg/steve/repository/WebUserRepository.java

@@ -18,10 +18,8 @@
  */
 package de.rwth.idsg.steve.repository;
 
-import jooq.steve.db.tables.records.WebUserRecord;
-import de.rwth.idsg.steve.service.dto.WebUserOverview;
 import de.rwth.idsg.steve.web.dto.WebUserQueryForm;
-import java.util.List;
+import jooq.steve.db.tables.records.WebUserRecord;
 import org.jooq.JSON;
 import org.jooq.Record4;
 import org.jooq.Result;
@@ -45,9 +43,8 @@ public interface WebUserRepository  {
     boolean userExists(String username);
 
     WebUserRecord loadUserByUsePk(Integer webUserPk);
+
     WebUserRecord loadUserByUsername(String username);
 
-    //List<WebUserOverview> getOverview(WebUserQueryForm form);
     Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryForm form);
-
-}
+}

src/main/java/de/rwth/idsg/steve/repository/impl/WebUserRepositoryImpl.java

@@ -23,6 +23,7 @@
 import jooq.steve.db.tables.records.WebUserRecord;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.jooq.Condition;
 import org.jooq.DSLContext;
 import org.jooq.JSON;
 import org.springframework.stereotype.Repository;
@@ -31,6 +32,11 @@
 import org.jooq.Record4;
 import org.jooq.Result;
 import org.jooq.SelectQuery;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
 import static org.jooq.impl.DSL.condition;
 import static org.jooq.impl.DSL.count;
 
@@ -99,10 +105,9 @@ public void changeStatusOfUser(String username, boolean enabled) {
 
     @Override
     public Integer getUserCountWithAuthority(String authority) {
-        JSON authValue = JSON.json("\"" + authority + "\"");
         return ctx.selectCount()
             .from(WEB_USER)
-            .where(condition("json_contains({0}, {1})", WEB_USER.AUTHORITIES, authValue))
+            .where(conditionsForAuthorities(Collections.singletonList(authority)))
             .fetchOne(count());
     }
 
@@ -136,7 +141,7 @@ public WebUserRecord loadUserByUsePk(Integer webUserPk) {
             .where(WEB_USER.WEB_USER_PK.eq(webUserPk))
             .fetchOne();
     }
-    
+
     @Override
     public Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryForm form) {
         SelectQuery selectQuery = ctx.selectQuery();
@@ -148,7 +153,7 @@ public Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryF
                 WEB_USER.AUTHORITIES
         );
 
-        if (form.isSetWebusername()) {
+        if (form.isSetWebUsername()) {
             selectQuery.addConditions(WEB_USER.USERNAME.eq(form.getWebUsername()));
         }
 
@@ -157,13 +162,18 @@ public Result<Record4<Integer, String, Boolean, JSON>> getOverview(WebUserQueryF
         }
 
         if (form.isSetRoles()) {
-            String[] roles = form.getRoles().split(","); //Semicolon seperated String to StringArray
-            for (String role : roles) {
-                JSON authValue = JSON.json("\"" + role.strip() + "\""); // strip --> No Withspace
-                selectQuery.addConditions(condition("json_contains({0}, {1})", WEB_USER.AUTHORITIES, authValue)); 
-            }
+            String[] split = form.getRoles().split(","); //Semicolon seperated String to StringArray
+            List<String> roles = Arrays.stream(split).map(String::strip).toList();
+            selectQuery.addConditions(conditionsForAuthorities(roles));
         }
 
         return selectQuery.fetch();
     }
-}
+
+    private static List<Condition> conditionsForAuthorities(List<String> authorities) {
+        return authorities.stream()
+            .map(it -> JSON.json("\"" + it + "\""))
+            .map(it -> condition("json_contains({0}, {1})", WEB_USER.AUTHORITIES, it))
+            .toList();
+    }
+}

src/main/java/de/rwth/idsg/steve/service/WebUserService.java

@@ -26,7 +26,6 @@
 import de.rwth.idsg.steve.service.dto.WebUserOverview;
 import de.rwth.idsg.steve.web.dto.WebUserForm;
 import de.rwth.idsg.steve.web.dto.WebUserQueryForm;
-import java.util.ArrayList;
 import jooq.steve.db.tables.records.WebUserRecord;
 import lombok.RequiredArgsConstructor;
 import org.jooq.JSON;
@@ -40,6 +39,7 @@
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.provisioning.JdbcUserDetailsManager;
 import org.springframework.security.provisioning.UserDetailsManager;
 import org.springframework.stereotype.Service;
@@ -51,9 +51,7 @@
 import java.util.stream.Collectors;
 
 import static org.springframework.security.authentication.UsernamePasswordAuthenticationToken.authenticated;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import static org.springframework.security.core.context.SecurityContextHolder.getContextHolderStrategy;
-import org.springframework.security.crypto.password.PasswordEncoder;
 
 /**
  * Inspired by {@link org.springframework.security.provisioning.JdbcUserDetailsManager}
@@ -167,11 +165,10 @@ public void add(WebUserForm form) {
         createUser(toUserDetails(form));
     }
 
-
     public void update(WebUserForm form) {
         updateUser(toUserDetails(form));
     }
-    
+
     public List<WebUserOverview> getOverview(WebUserQueryForm form) {
         return webUserRepository.getOverview(form)
                 .map(r -> WebUserOverview.builder()
@@ -191,31 +188,16 @@ public WebUserForm getDetails(Integer webUserPk) {
             throw new SteveException("There is no user with id '%d'", webUserPk);
         }
 
-        WebUserForm form = new WebUserForm();
+        String[] authValues = fromJson(ur.getAuthorities());
+        String joinedAuthValues = String.join(", ", authValues);
 
+        WebUserForm form = new WebUserForm();
         form.setEnabled(ur.getEnabled());
         form.setWebUsername(ur.getUsername());
-        form.setPassword(""); // don't expose the pw 
-        form.setApiToken(""); // ur.getApiToken()
-        form.setAuthorities(rolesStr(fromJson(ur.getAuthorities())));
-
+        form.setAuthorities(joinedAuthValues);
         return form;
     }
 
-    private static String rolesStr(String[] authorities) {
-        String roles = "";
-
-        for (String ar : authorities) {
-            roles = roles + ar + ", ";
-        }
-        roles = roles.strip();
-        if (!roles.isBlank()) { //(roles.endsWith(","))
-            roles = roles.substring(0, roles.length() - 1);
-        }
-
-        return roles;
-    }
-
     // Helpers
     private WebUserRecord toWebUserRecord(UserDetails user) {
         return new WebUserRecord()
@@ -227,17 +209,16 @@ private WebUserRecord toWebUserRecord(UserDetails user) {
 
     private UserDetails toUserDetails(WebUserForm form) {
         String encPw = "";
-        if (form.getPassword()!= null) {
+        if (form.getPassword() != null) {
             //encPw = form.getPassword();
             encPw = encoder.encode(form.getPassword());
         }
-        var user = User
-                .withUsername(form.getWebUsername())
-                .password(encPw)
-                .disabled(!form.getEnabled())
-                .authorities(toAuthorities(form.getAuthorities()))
-                .build();
-        return user;
+        return User
+            .withUsername(form.getWebUsername())
+            .password(encPw)
+            .disabled(!form.getEnabled())
+            .authorities(form.getAuthorities().split(","))
+            .build();
     }
 
     private String[] fromJson(JSON jsonArray) {
@@ -248,15 +229,6 @@ private String[] fromJson(JSON jsonArray) {
         }
     }
 
-    private Collection<? extends GrantedAuthority> toAuthorities(String authoritiesStr) {
-        String[] authoritiesList = authoritiesStr.split(",");
-        List<GrantedAuthority> authorities = new ArrayList<>();
-        for (String authStr: authoritiesList) {
-            authorities.add(new SimpleGrantedAuthority(authStr.strip()));
-        }
-        return authorities;
-    }
-
     private JSON toJson(Collection<? extends GrantedAuthority> authorities) {
         Collection<String> auths = authorities.stream()
             .map(GrantedAuthority::getAuthority)

src/main/java/de/rwth/idsg/steve/web/dto/WebUserForm.java

@@ -22,7 +22,7 @@
 import lombok.Setter;
 
 
- /**
+/**
  * @author fnkbsi
  * @since 01.04.2022
  */
@@ -37,13 +37,13 @@ public class WebUserForm {
 
     private String webUsername;
 
-    private String password;
+    private String password = ""; // don't expose the pw
 
     private String passwordComparison;
 
     private String authorities;
 
     private Boolean pwError;
 
-    private String apiToken;
+    private String apiToken = "";
 }

src/main/java/de/rwth/idsg/steve/web/dto/WebUserQueryForm.java

@@ -24,7 +24,7 @@
 import lombok.Getter;
 import lombok.Setter;
 
- /**
+/**
  * @author fnkbsi
  * @since 01.04.2022
  */
@@ -39,7 +39,7 @@ public class WebUserQueryForm {
     private String roles;
     private String apiToken;
 
-    public boolean isSetWebusername() {
+    public boolean isSetWebUsername() {
         return webUsername != null;
     }