feat: 增加平台管理员、用户的密码重置功能

xp.Huang
1 parent 80c80f5f
Showing 1 changed file with 55 additions and 12 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
View file @08b808a
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkUserController.java
View file @08b808a
@@ -21,6 +21,7 @@ import org.thingsboard.server.common.data.id.*;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.security.event.UserAuthDataChangedEvent;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
 import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
@@ -50,6 +51,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
@@ -113,8 +115,8 @@ public class TkUserController extends AbstractUserAccount {
     queryMap.put(PAGE_SIZE, pageSize);
     queryMap.put(PAGE, page);
     queryMap.put(ORDER_FILED, orderBy);
-    queryMap.put("realName",realName);
-    queryMap.put("username",username);
+    queryMap.put("realName", realName);
+    queryMap.put("username", username);
     if (null != roleType && roleType.equals(RoleEnum.TENANT_ADMIN)) {
       queryMap.put("roleType", roleType.name());
     } else {
@@ -200,7 +202,7 @@ public class TkUserController extends AbstractUserAccount {
           createTBUser(
               tbUser, userDTO, customer.getTenantId(), customer.getId(), Authority.CUSTOMER_USER);
       // 激活CUSTOMER_USER的管理员
-      activeTBUser(tbUser.getId(), userDTO.getPassword(),null,false);
+      activeTBUser(tbUser.getId(), userDTO.getPassword(), null, false);
     }
     return ResponseEntity.ok(
         userService.saveAccount(
@@ -211,7 +213,8 @@ public class TkUserController extends AbstractUserAccount {
             getCurrentUser().getCurrentTenantId()));
   }
-  @PreAuthorize("@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:user:saveTenantAdmin:post'})")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','PLATFORM_ADMIN'},{'api:yt:user:saveTenantAdmin:post'})")
   @PostMapping("save_tenant_admin")
   public UserDTO saveTenantAdmin(@Validated(AddGroup.class) @RequestBody UserDTO userDTO)
       throws ThingsboardException {
@@ -230,14 +233,20 @@ public class TkUserController extends AbstractUserAccount {
       if (null == userDTO.getId()) {
         tbUser = createTBUser(tbUser, userDTO, tenantId, customerId, Authority.TENANT_ADMIN);
         // 激活租户管理员
-        activeTBUser(tbUser.getId(), accountProperties.getDefaultPassword(),tbUser.getTenantId(),true);
+        activeTBUser(
+            tbUser.getId(), accountProperties.getDefaultPassword(), tbUser.getTenantId(), true);
       }
     } catch (Exception e) {
       throw handleException(e);
     }
-
-    return userService.saveTenantAdmin(
-        userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
+    UserDTO result =
+        userService.saveTenantAdmin(
+            userDTO, getCurrentUser().isPtSysadmin(), tenantId.getId().toString());
+    userService.updateTenantAdminUserCredentials(
+        List.of(new UserId(UUID.fromString(result.getTbUser()))),
+        userDTO.getTenantId(),
+        userDTO.isEnabled(),false);
+    return result;
   }
   @DeleteMapping
@@ -318,6 +327,40 @@ public class TkUserController extends AbstractUserAccount {
             getCurrentUser().getCurrentTenantId(),
             getCurrentUser().isPtTenantAdmin()));
   }
+
+  @PostMapping("/reset_password/{userId}")
+  @ApiOperation(value = "重置客户密码")
+  @PreAuthorize(
+      "@check.checkPermissions({'SYS_ADMIN','TENANT_ADMIN'},{'api:yt:user:resetPassword'})")
+  public ResponseResult resetPassword(@PathVariable("userId") String userId)
+      throws ThingsboardException {
+    boolean isSysAdmin = getCurrentUser().isSystemAdmin();
+    Integer level = isSysAdmin ? 1 : 3;
+    // 检查平台、客户账号
+    UserDTO user = userService.checkAccount(userId, level);
+    if (null == user) {
+      throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+    String tenantId = getCurrentUser().getCurrentTenantId();
+    if (!Objects.equals(user.getTenantId(), tenantId) && !isSysAdmin) {
+      throw new TkDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
+    }
+    // update
+    String resetPassword = accountProperties.getDefaultPassword();
+    if (!isSysAdmin) {
+      // 租户才需要改tb的凭证
+      SecurityUser securityUser = new SecurityUser();
+      securityUser.setId(new UserId(UUID.fromString(user.getTbUser())));
+      securityUser.setTenantId(TenantId.fromUUID(UUID.fromString(user.getTenantId())));
+      updatePassword(resetPassword, securityUser);
+    }
+    userService.resetPassword(userId, tenantId, resetPassword);
+    if(isSysAdmin){
+      eventPublisher.publishEvent(new UserAuthDataChangedEvent(new UserId(UUID.fromString(userId))));
+    }
+    return ResponseResult.success(ErrorMessage.RESET_PASSWORD_SUCCESS.getMessage());
+  }
+
   /**
    * 创建租户用户
    *
@@ -353,17 +396,17 @@ public class TkUserController extends AbstractUserAccount {
    * @param userId 用户ID
    * @throws ThingsboardException tb运行异常
    */
-  private void activeTBUser(UserId userId, String password,TenantId tenantId ,boolean isPtAdmin) throws ThingsboardException {
+  private void activeTBUser(UserId userId, String password, TenantId tenantId, boolean isPtAdmin)
+      throws ThingsboardException {
     try {
       // 1、获取UserCredentials 并获取activateToken
-      if(!isPtAdmin){
+      if (!isPtAdmin) {
         User user = checkUserId(userId, Operation.READ);
         userId = user.getId();
         SecurityUser authUser = getCurrentUser();
         tenantId = authUser.getTenantId();
       }
-      UserCredentials userCredentials =
-          tbUserService.findUserCredentialsByUserId(tenantId, userId);
+      UserCredentials userCredentials = tbUserService.findUserCredentialsByUserId(tenantId, userId);
       // 2、进行激活
       String encodedPassword = passwordEncoder.encode(password);
       UserCredentials credentials =