fix: 允许平台管理员登录【yunteng需要】

@@ -33,10 +33,12 @@ import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
+import org.thingsboard.server.common.data.yunteng.dto.UserDetailRoleDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 import org.thingsboard.server.common.data.yunteng.dto.UserDetailsDTO;
 import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
 import org.thingsboard.server.common.data.yunteng.dto.request.CodeTTL;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
+import org.thingsboard.server.common.data.yunteng.enums.RoleEnum;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.audit.AuditLogService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.service.security.model.SecurityUser;
 import org.thingsboard.server.service.security.model.SecurityUser;
@@ -47,10 +49,8 @@ import org.thingsboard.server.dao.yunteng.service.YtUserService;
 import ua_parser.Client;
 import ua_parser.Client;
 
 
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CacheConfigKey.MOBILE_LOGIN_SMS_CODE;
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CacheConfigKey.MOBILE_LOGIN_SMS_CODE;
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.DEFAULT_DELIMITER;
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.DEFAULT_DELIMITER;
@@ -94,6 +94,10 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
       if (!FastIotConstants.EMAIL_PATTERN.matcher(username).matches()) {
       if (!FastIotConstants.EMAIL_PATTERN.matcher(username).matches()) {
         username += FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
         username += FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
         ytDetailDTO = ytUserDetailsByUserName(ytUserName, password).get();
         ytDetailDTO = ytUserDetailsByUserName(ytUserName, password).get();
+        // 如果是平台用户单独处理
+        if (isPlatFormUser(ytDetailDTO)) {
+          return validateByUsernameAndPassword(ytDetailDTO, authentication, userPrincipal);
+        }
       }
       }
       return authenticateByUsernameAndPassword(
       return authenticateByUsernameAndPassword(
           ytDetailDTO, authentication, userPrincipal, username, password);
           ytDetailDTO, authentication, userPrincipal, username, password);
@@ -109,6 +113,26 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
     }
     }
   }
   }
 
 
+  private Authentication validateByUsernameAndPassword(
+      UserDetailsDTO ytDetailDTO, Authentication authentication, UserPrincipal userPrincipal) {
+    Object principal = authentication.getPrincipal();
+    if (!(principal instanceof UserPrincipal)) {
+      throw new BadCredentialsException("Authentication Failed. Bad user principal.");
+    }
+    User user = new User();
+    user.setUserDetailsDTO(ytDetailDTO);
+    user.setAuthority(Authority.PLATFORM_USER);
+    user.setTenantId(new TenantId(EntityId.NULL_UUID));
+    user.setId(new UserId(UUID.fromString(ytDetailDTO.getId())));
+    String email = ytDetailDTO.getUsername();
+    email += FastIotConstants.DEFAULT_EMAIL_SUFFIX_FOR_TB;
+    user.setEmail(email);
+    UserCredentials userCredentials = new UserCredentials();
+    SecurityUser securityUser = new SecurityUser(user, userCredentials.isEnabled(), userPrincipal);
+    return new UsernamePasswordAuthenticationToken(
+        securityUser, null, securityUser.getAuthorities());
+  }
+
   private Authentication authenticateByUsernameAndPassword(
   private Authentication authenticateByUsernameAndPassword(
       UserDetailsDTO ytDetailDTO,
       UserDetailsDTO ytDetailDTO,
       Authentication authentication,
       Authentication authentication,
@@ -116,7 +140,6 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
       String username,
       String username,
       String password) {
       String password) {
 
 
-    // TODO 先验证sys_user账号密码是否正确，正确后，在账号后面加上后缀验证TB用户是否正确
     Object principal = authentication.getPrincipal();
     Object principal = authentication.getPrincipal();
     if (!(principal instanceof UserPrincipal)) {
     if (!(principal instanceof UserPrincipal)) {
       throw new BadCredentialsException("Authentication Failed. Bad user principal.");
       throw new BadCredentialsException("Authentication Failed. Bad user principal.");
@@ -358,4 +381,19 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
     }
     }
     return true;
     return true;
   }
   }
+
+  /**
+   * 判断是否是平台用户
+   *
+   * @param ytDetailDTO 用户详情
+   * @return true是平台用户 false不是平台用户
+   */
+  private boolean isPlatFormUser(UserDetailsDTO ytDetailDTO) {
+    Set<String> roles =
+        ytDetailDTO.getRoles().stream()
+            .map(UserDetailRoleDTO::getRoleType)
+            .map(RoleEnum::name)
+            .collect(Collectors.toSet());
+    return roles.stream().anyMatch(role -> role.equals(RoleEnum.PLATFORM_ADMIN.name()));
+  }
 }
 }

@@ -20,6 +20,7 @@ public enum Authority {
     SYS_ADMIN(0),
     SYS_ADMIN(0),
     TENANT_ADMIN(1),
     TENANT_ADMIN(1),
     CUSTOMER_USER(2),
     CUSTOMER_USER(2),
+    PLATFORM_USER(3),
     REFRESH_TOKEN(10);
     REFRESH_TOKEN(10);
 
 
     private int code;
     private int code;