Make SystemSecurityService available in rule engine; move PasswordEncoder to CryptoConfig
This commit is contained in:
		
							parent
							
								
									c55ac0efc6
								
							
						
					
					
						commit
						0b31c49d57
					
				@ -0,0 +1,30 @@
 | 
				
			|||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * Copyright © 2016-2023 The Thingsboard Authors
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Licensed under the Apache License, Version 2.0 (the "License");
 | 
				
			||||||
 | 
					 * you may not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					 * You may obtain a copy of the License at
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *     http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					 * distributed under the License is distributed on an "AS IS" BASIS,
 | 
				
			||||||
 | 
					 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					 * See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					 * limitations under the License.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					package org.thingsboard.server.config;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Bean;
 | 
				
			||||||
 | 
					import org.springframework.context.annotation.Configuration;
 | 
				
			||||||
 | 
					import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Configuration
 | 
				
			||||||
 | 
					public class CryptoConfig {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    @Bean
 | 
				
			||||||
 | 
					    protected BCryptPasswordEncoder passwordEncoder() {
 | 
				
			||||||
 | 
					        return new BCryptPasswordEncoder();
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@ -188,11 +188,6 @@ public class ThingsboardSecurityConfiguration {
 | 
				
			|||||||
        return auth.build();
 | 
					        return auth.build();
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Bean
 | 
					 | 
				
			||||||
    protected BCryptPasswordEncoder passwordEncoder() {
 | 
					 | 
				
			||||||
        return new BCryptPasswordEncoder();
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    @Autowired
 | 
					    @Autowired
 | 
				
			||||||
    private OAuth2AuthorizationRequestResolver oAuth2AuthorizationRequestResolver;
 | 
					    private OAuth2AuthorizationRequestResolver oAuth2AuthorizationRequestResolver;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -55,7 +55,6 @@ import org.thingsboard.server.dao.exception.DataValidationException;
 | 
				
			|||||||
import org.thingsboard.server.dao.settings.AdminSettingsService;
 | 
					import org.thingsboard.server.dao.settings.AdminSettingsService;
 | 
				
			||||||
import org.thingsboard.server.dao.user.UserService;
 | 
					import org.thingsboard.server.dao.user.UserService;
 | 
				
			||||||
import org.thingsboard.server.dao.user.UserServiceImpl;
 | 
					import org.thingsboard.server.dao.user.UserServiceImpl;
 | 
				
			||||||
import org.thingsboard.server.queue.util.TbCoreComponent;
 | 
					 | 
				
			||||||
import org.thingsboard.server.service.security.auth.rest.RestAuthenticationDetails;
 | 
					import org.thingsboard.server.service.security.auth.rest.RestAuthenticationDetails;
 | 
				
			||||||
import org.thingsboard.server.service.security.exception.UserPasswordExpiredException;
 | 
					import org.thingsboard.server.service.security.exception.UserPasswordExpiredException;
 | 
				
			||||||
import org.thingsboard.server.service.security.model.SecurityUser;
 | 
					import org.thingsboard.server.service.security.model.SecurityUser;
 | 
				
			||||||
@ -73,7 +72,6 @@ import static org.thingsboard.server.common.data.CacheConstants.SECURITY_SETTING
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
@Service
 | 
					@Service
 | 
				
			||||||
@Slf4j
 | 
					@Slf4j
 | 
				
			||||||
@TbCoreComponent
 | 
					 | 
				
			||||||
public class DefaultSystemSecurityService implements SystemSecurityService {
 | 
					public class DefaultSystemSecurityService implements SystemSecurityService {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Autowired
 | 
					    @Autowired
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user