Merge pull request #429 from FlowCI/feature/1598

Feature/1598

Author: gy2006

core/src/main/java/com/flowci/core/auth/config/AuthConfig.java

@@ -55,7 +55,7 @@ public PermissionMap actionMap() {
 
         // developer
         permissionMap.add(User.Role.Developer,
-                FlowAction.GET, FlowAction.LIST, FlowAction.LIST_BRANCH, FlowAction.GET, FlowAction.GET_YML);
+                FlowAction.GET, FlowAction.LIST, FlowAction.LIST_BRANCH, FlowAction.GET, FlowAction.GET_YML, FlowAction.LIST_USER);
         permissionMap.add(User.Role.Developer, JobAction.ALL);
         permissionMap.add(User.Role.Developer, SecretActions.LIST_NAME);
         permissionMap.add(User.Role.Developer, AgentAction.GET, AgentAction.LIST);

core/src/main/java/com/flowci/core/auth/AuthController.java renamed to core/src/main/java/com/flowci/core/auth/controller/AuthController.java

@@ -15,22 +15,19 @@
  *
  */
 
-package com.flowci.core.auth;
+package com.flowci.core.auth.controller;
 
 import com.flowci.core.auth.domain.Tokens;
 import com.flowci.core.auth.service.AuthService;
 import com.flowci.core.user.domain.User;
 import com.flowci.exception.AuthenticationException;
 import com.google.common.base.Strings;
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
 
 @RestController()
 @RequestMapping("/auth")

core/src/main/java/com/flowci/core/auth/WebAuth.java renamed to core/src/main/java/com/flowci/core/auth/controller/WebAuth.java

@@ -15,7 +15,7 @@
  *
  */
 
-package com.flowci.core.auth;
+package com.flowci.core.auth.controller;
 
 import com.flowci.core.auth.annotation.Action;
 import com.flowci.core.auth.service.AuthService;

core/src/main/java/com/flowci/core/auth/service/AuthService.java

@@ -22,6 +22,7 @@
 import com.flowci.core.user.domain.User;
 
 import java.util.Optional;
+import java.util.Set;
 
 /**
  * 'login' ->
@@ -65,4 +66,8 @@ public interface AuthService {
      */
     Optional<User> get(String token);
 
+    /**
+     * Get action list by role
+     */
+    Set<String> getActions(User.Role role);
 }

core/src/main/java/com/flowci/core/auth/service/AuthServiceImpl.java

@@ -36,6 +36,7 @@
 
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 
 @Log4j2
 @Service
@@ -159,6 +160,11 @@ public Optional<User> get(String token) {
         return Optional.empty();
     }
 
+    @Override
+    public Set<String> getActions(User.Role role) {
+        return permissionMap.get(role);
+    }
+
     private User getUser(String email) {
         try {
             return userService.getByEmail(email);

core/src/main/java/com/flowci/core/job/controller/TtyController.java

@@ -1,7 +1,7 @@
 package com.flowci.core.job.controller;
 
 import com.flowci.core.agent.domain.TtyCmd;
-import com.flowci.core.auth.WebAuth;
+import com.flowci.core.auth.controller.WebAuth;
 import com.flowci.core.common.manager.SpringEventManager;
 import com.flowci.core.job.event.TtyStatusUpdateEvent;
 import com.flowci.core.job.service.TtyService;

core/src/main/java/com/flowci/core/user/UserController.java

@@ -18,9 +18,12 @@
 
 import com.flowci.core.auth.annotation.Action;
 import com.flowci.core.auth.service.AuthService;
+import com.flowci.core.common.manager.SessionManager;
 import com.flowci.core.user.domain.*;
 import com.flowci.core.user.service.UserService;
 import com.flowci.exception.ArgumentException;
+
+import java.util.Collection;
 import java.util.Objects;
 import java.util.Optional;
 
@@ -41,6 +44,9 @@ public class UserController {
 
     private static final String DefaultSize = "20";
 
+    @Autowired
+    private SessionManager sessionManager;
+
     @Autowired
     private UserService userService;
 
@@ -75,7 +81,8 @@ public User create(@Validated @RequestBody CreateUser body) {
     @Action(UserAction.CHANGE_PASSWORD)
     public void changePassword(@Validated @RequestBody ChangePassword body) {
         if (Objects.equals(body.getNewOne(), body.getConfirm())) {
-            userService.changePassword(body.getOld(), body.getNewOne());
+            User user = sessionManager.get();
+            userService.changePassword(user, body.getOld(), body.getNewOne());
             authService.logout();
             return;
         }

core/src/main/java/com/flowci/core/user/service/UserService.java

@@ -62,7 +62,7 @@ public interface UserService {
     /**
      * Change password for current user
      */
-    void changePassword(String old, String newOne);
+    void changePassword(User user, String old, String newOne);
 
     /**
      * Change role for target user

core/src/main/java/com/flowci/core/user/service/UserServiceImpl.java

@@ -56,9 +56,6 @@ public class UserServiceImpl implements UserService {
     @Autowired
     private UserDao userDao;
 
-    @Autowired
-    private SessionManager sessionManager;
-
     @Autowired
     private SpringEventManager eventManager;
 
@@ -108,9 +105,7 @@ public User getByEmail(String email) {
     }
 
     @Override
-    public void changePassword(String oldOnMd5, String newOnMd5) {
-        User user = sessionManager.get();
-
+    public void changePassword(User user, String oldOnMd5, String newOnMd5) {
         if (Objects.equals(user.getPasswordOnMd5(), oldOnMd5)) {
             user.setPasswordOnMd5(newOnMd5);
             userDao.save(user);