[#11935] UserListPageApi - fix password encoding

smartbit4all · Jul 17, 2023 · fba8983 · fba8983
1 parent fbbc01b
commit fba8983
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 71 deletions.
diff --git a/api/src/main/java/org/smartbit4all/api/config/PlatformApiConfig.java b/api/src/main/java/org/smartbit4all/api/config/PlatformApiConfig.java
@@ -49,7 +49,6 @@
 import org.smartbit4all.api.object.bean.AggregationKind;
 import org.smartbit4all.api.object.bean.ObjectDefinitionData;
 import org.smartbit4all.api.object.bean.ReferencePropertyKind;
-import org.smartbit4all.api.org.PasswordEncoderApi;
 import org.smartbit4all.api.rdbms.DatabaseDefinitionApi;
 import org.smartbit4all.api.rdbms.DatabaseDefinitionApiImpl;
 import org.smartbit4all.api.session.SessionManagementApi;
@@ -83,7 +82,6 @@
 import org.smartbit4all.domain.service.transfer.TransferService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -328,12 +326,6 @@ public StorageSequenceApi storageSequenceApi() {
     return new StorageSequenceApiImpl();
   }
 
-  @Bean
-  @ConditionalOnMissingBean
-  public PasswordEncoderApi passwordEncoderApi() {
-    return new PasswordEncoderApi() {};
-  }
-
   @Bean
   public Storage viewContextServiceStorage(@Autowired(required = false) ObjectStorage objectStorage,
       ObjectDefinitionApi objectDefinitionApi) {

diff --git a/api/src/main/java/org/smartbit4all/api/org/PasswordEncoderApi.java b/api/src/main/java/org/smartbit4all/api/org/PasswordEncoderApi.java
diff --git a/bff-api/build.gradle b/bff-api/build.gradle
@@ -5,6 +5,7 @@ plugins {
 
 dependencies {
     api project(':api')
+    api project(':sec')
 }
 
 

diff --git a/bff-api/src/main/java/org/smartbit4all/bff/api/org/UserEditorPageApiImpl.java b/bff-api/src/main/java/org/smartbit4all/bff/api/org/UserEditorPageApiImpl.java
@@ -5,22 +5,22 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 import org.smartbit4all.api.org.OrgApi;
-import org.smartbit4all.api.org.PasswordEncoderApi;
 import org.smartbit4all.api.org.bean.User;
 import org.smartbit4all.api.userselector.bean.UserEditingModel;
 import org.smartbit4all.api.view.PageApiImpl;
 import org.smartbit4all.api.view.bean.UiActionRequest;
 import org.smartbit4all.api.view.bean.View;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 public class UserEditorPageApiImpl extends PageApiImpl<UserEditingModel>
     implements UserEditorPageApi {
 
   @Autowired
   OrgApi orgApi;
 
-  @Autowired
-  private PasswordEncoderApi passwordEncoderApi;
+  @Autowired(required = false)
+  private PasswordEncoder passwordEncoder;
 
   public UserEditorPageApiImpl() {
     super(UserEditingModel.class);
@@ -63,7 +63,7 @@ public void saveUser(UUID viewUuid, UiActionRequest request) {
 
     User user = pageModel.getUser();
 
-    user.password(passwordEncoderApi.encode(user.getPassword()));
+    user.password(passwordEncoder.encode(user.getPassword()));
 
     if (orgApi.getActiveUsers().stream().map(User::getUri).collect(Collectors.toList())
         .contains(user.getUri())) {

diff --git a/sec/src/main/java/org/smartbit4all/sec/config/PlatformSecurityConfig.java b/sec/src/main/java/org/smartbit4all/sec/config/PlatformSecurityConfig.java
@@ -1,8 +1,6 @@
 package org.smartbit4all.sec.config;
 
-import org.smartbit4all.api.org.PasswordEncoderApi;
 import org.smartbit4all.core.reactive.ObjectChangePublisher;
-import org.smartbit4all.sec.localauth.PasswordEncoderApiImpl;
 import org.smartbit4all.sec.session.ObjectChangePublisherSpringSecAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -19,10 +17,4 @@ public ObjectChangePublisher<?> objectChangePublisher() {
     return new ObjectChangePublisherSpringSecAware<>();
   }
 
-  @Bean
-  public PasswordEncoderApi passwordEncoderApi() {
-    return new PasswordEncoderApiImpl();
-
-  }
-
 }
diff --git a/sec/src/main/java/org/smartbit4all/sec/localauth/PasswordEncoderApiImpl.java b/sec/src/main/java/org/smartbit4all/sec/localauth/PasswordEncoderApiImpl.java