⬆️ #2838 up nacos 2.0.2

pigx-register/src/main/java/com/alibaba/nacos/controller/UserController.java

@@ -16,12 +16,6 @@
 
 package com.alibaba.nacos.controller;
 
-import java.io.IOException;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.nacos.api.common.Constants;
 import com.alibaba.nacos.auth.annotation.Secured;
 import com.alibaba.nacos.auth.common.ActionTypes;
@@ -29,6 +23,7 @@ import com.alibaba.nacos.auth.common.AuthConfigs;
 import com.alibaba.nacos.auth.common.AuthSystemTypes;
 import com.alibaba.nacos.auth.exception.AccessException;
 import com.alibaba.nacos.common.model.RestResult;
+import com.alibaba.nacos.common.model.RestResultUtils;
 import com.alibaba.nacos.common.utils.JacksonUtils;
 import com.alibaba.nacos.common.utils.Objects;
 import com.alibaba.nacos.config.server.auth.RoleInfo;
@@ -42,8 +37,8 @@ import com.alibaba.nacos.security.nacos.users.NacosUser;
 import com.alibaba.nacos.security.nacos.users.NacosUserDetailsServiceImpl;
 import com.alibaba.nacos.utils.PasswordEncoderUtil;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.security.authentication.AuthenticationManager;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -58,6 +53,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * User related methods entry.
  *
@@ -103,7 +103,7 @@ public class UserController {
 			throw new IllegalArgumentException("user '" + username + "' already exist!");
 		}
 		userDetailsService.createUser(username, PasswordEncoderUtil.encode(password));
-		return new RestResult<>(200, "create user ok!");
+		return RestResultUtils.success("create user ok!");
 	}
 
 	/**
@@ -124,7 +124,7 @@ public class UserController {
 			}
 		}
 		userDetailsService.deleteUser(username);
-		return new RestResult<>(200, "delete user ok!");
+		return RestResultUtils.success("delete user ok!");
 	}
 
 	/**
@@ -153,7 +153,7 @@ public class UserController {
 
 		userDetailsService.updateUserPassword(username, PasswordEncoderUtil.encode(newPassword));
 
-		return new RestResult<>(200, "update user ok!");
+		return RestResultUtils.success("update user ok!");
 	}
 
 	private boolean hasPermission(String username, HttpServletRequest request) {
@@ -202,42 +202,39 @@ public class UserController {
 	public Object login(@RequestParam String username, @RequestParam String password, HttpServletResponse response,
 			HttpServletRequest request) throws AccessException {
 
-		if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) {
+		if (AuthSystemTypes.NACOS.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())
+				|| AuthSystemTypes.LDAP.name().equalsIgnoreCase(authConfigs.getNacosAuthSystemType())) {
 			NacosUser user = (NacosUser) authManager.login(request);
 
 			response.addHeader(NacosAuthConfig.AUTHORIZATION_HEADER, NacosAuthConfig.TOKEN_PREFIX + user.getToken());
 
 			ObjectNode result = JacksonUtils.createEmptyJsonNode();
-			// JSONObject result = new JSONObject();
 			result.put(Constants.ACCESS_TOKEN, user.getToken());
 			result.put(Constants.TOKEN_TTL, authConfigs.getTokenValidityInSeconds());
 			result.put(Constants.GLOBAL_ADMIN, user.isGlobalAdmin());
+			result.put(Constants.USERNAME, user.getUserName());
 			return result;
 		}
 
-		// 通过用户名和密码创建一个 Authentication 认证对象，实现类为 UsernamePasswordAuthenticationToken
+		// create Authentication class through username and password, the implement class
+		// is UsernamePasswordAuthenticationToken
 		UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username,
 				password);
 
-		RestResult<String> rr = new RestResult<String>();
 		try {
-			// 通过 AuthenticationManager（默认实现为ProviderManager）的authenticate方法验证
-			// Authentication 对象
+			// use the method authenticate of AuthenticationManager(default implement is
+			// ProviderManager) to valid Authentication
 			Authentication authentication = authenticationManager.authenticate(authenticationToken);
-			// 将 Authentication 绑定到 SecurityContext
+			// bind SecurityContext to Authentication
 			SecurityContextHolder.getContext().setAuthentication(authentication);
-			// 生成Token
+			// generate Token
 			String token = jwtTokenManager.createToken(authentication);
-			// 将Token写入到Http头部
+			// write Token to Http header
 			response.addHeader(NacosAuthConfig.AUTHORIZATION_HEADER, "Bearer " + token);
-			rr.setCode(200);
-			rr.setData("Bearer " + token);
-			return rr;
+			return RestResultUtils.success("Bearer " + token);
 		}
 		catch (BadCredentialsException authentication) {
-			rr.setCode(401);
-			rr.setMessage("Login failed");
-			return rr;
+			return RestResultUtils.failed(HttpStatus.UNAUTHORIZED.value(), null, "Login failed");
 		}
 	}
 
@@ -252,8 +249,6 @@ public class UserController {
 	@Deprecated
 	public RestResult<String> updatePassword(@RequestParam(value = "oldPassword") String oldPassword,
 			@RequestParam(value = "newPassword") String newPassword) {
-
-		RestResult<String> rr = new RestResult<String>();
 		Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
 		String username = ((UserDetails) principal).getUsername();
 		User user = userDetailsService.getUserFromDatabase(username);
@@ -263,19 +258,13 @@ public class UserController {
 		try {
 			if (PasswordEncoderUtil.matches(oldPassword, password)) {
 				userDetailsService.updateUserPassword(username, PasswordEncoderUtil.encode(newPassword));
-				rr.setCode(200);
-				rr.setMessage("Update password success");
-			}
-			else {
-				rr.setCode(401);
-				rr.setMessage("Old password is invalid");
+				return RestResultUtils.success("Update password success");
 			}
+			return RestResultUtils.failed(HttpStatus.UNAUTHORIZED.value(), "Old password is invalid");
 		}
 		catch (Exception e) {
-			rr.setCode(500);
-			rr.setMessage("Update userpassword failed");
+			return RestResultUtils.failed(HttpStatus.INTERNAL_SERVER_ERROR.value(), "Update userpassword failed");
 		}
-		return rr;
 	}
 
 	/**