vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 22:27:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix authentication.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2024-01-15 16:20:00 -08:00
parent 5fe3bb082a
commit b7591ab995
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wise-webapp/src/main/java/com/wisemapping/config/Application.java
View File

@ -4,6 +4,8 @@ import com.wisemapping.config.common.CommonConfig;
import com.wisemapping.config.common.HibernateConfig; import com.wisemapping.config.common.HibernateConfig;
import com.wisemapping.config.common.InterceptorsConfig; import com.wisemapping.config.common.InterceptorsConfig;
import com.wisemapping.config.common.SecurityConfig; import com.wisemapping.config.common.SecurityConfig;
import com.wisemapping.config.mvc.MvcAppConfig;
import com.wisemapping.config.mvc.MvcSecurityConfig;
import com.wisemapping.config.rest.ServletConfig; import com.wisemapping.config.rest.ServletConfig;
import com.wisemapping.config.rest.RestAppConfig; import com.wisemapping.config.rest.RestAppConfig;
import org.springframework.boot.WebApplicationType; import org.springframework.boot.WebApplicationType;
@ -19,8 +21,8 @@ public class Application {
new SpringApplicationBuilder() new SpringApplicationBuilder()
.parent(HibernateConfig.class, ServletConfig.class, CommonConfig.class, SecurityConfig.class).web(WebApplicationType.NONE) .parent(HibernateConfig.class, ServletConfig.class, CommonConfig.class, SecurityConfig.class).web(WebApplicationType.NONE)
// .child(MvcAppConfig.class, MvcSecurityConfig.class, SecurityConfig.class).web(WebApplicationType.SERVLET) .child(MvcAppConfig.class, MvcSecurityConfig.class, SecurityConfig.class, InterceptorsConfig.class).web(WebApplicationType.SERVLET)
.child(RestAppConfig.class, ServletConfig.class, InterceptorsConfig.class).web(WebApplicationType.SERVLET) .sibling(RestAppConfig.class, ServletConfig.class, InterceptorsConfig.class).web(WebApplicationType.SERVLET)
.run(args); .run(args);
} }

2
wise-webapp/src/main/java/com/wisemapping/config/common/SecurityConfig.java
View File

@ -45,7 +45,7 @@ public class SecurityConfig {
@Bean @Bean
public PasswordEncoder passwordEncoder() { public PasswordEncoder passwordEncoder() {
return createDelegatingPasswordEncoder(); return DefaultPasswordEncoderFactories.createDelegatingPasswordEncoder();
} }
@Bean @Bean

2
wise-webapp/src/main/java/com/wisemapping/security/DefaultPasswordEncoderFactories.java
View File

@ -28,7 +28,7 @@ public class DefaultPasswordEncoderFactories {
public static final String ENCODING_ID = "bcrypt"; public static final String ENCODING_ID = "bcrypt";
static PasswordEncoder createDelegatingPasswordEncoder() { public static PasswordEncoder createDelegatingPasswordEncoder() {
final Map<String, PasswordEncoder> encoders = new HashMap<>(); final Map<String, PasswordEncoder> encoders = new HashMap<>();
encoders.put(ENCODING_ID, new BCryptPasswordEncoder(12)); encoders.put(ENCODING_ID, new BCryptPasswordEncoder(12));