Merge pull request lowcoder-org#323 from lvhuichao/develop

1. feat: solve the deserialization of polymorphism in mongodb; 2. support js library

Author: neon-balcony

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java

@@ -70,8 +70,7 @@ private Flux<FindAuthConfig> findAllAuthConfigsByDomain() {
                                 .stream()
                                 .map(abstractAuthConfig -> new FindAuthConfig(abstractAuthConfig, organization))
                                 .collect(Collectors.toList())
-                )
-                .doOnNext(__ -> log.info("find auth configs by domain"));
+                );
     }
 
     protected Flux<FindAuthConfig> findAllAuthConfigsForEnterpriseMode() {
@@ -84,15 +83,13 @@ protected Flux<FindAuthConfig> findAllAuthConfigsForEnterpriseMode() {
                                 .stream()
                                 .map(abstractAuthConfig -> new FindAuthConfig(abstractAuthConfig, organization))
                                 .collect(Collectors.toList())
-                )
-                .doOnNext(__ -> log.info("find auth configs for enterprise mode."));
+                );
     }
 
     private Flux<FindAuthConfig> findAllAuthConfigsForSaasMode() {
         if (commonConfig.getWorkspace().getMode() == WorkspaceMode.SAAS) {
             return Flux.fromIterable(authProperties.getAuthConfigs())
-                    .map(abstractAuthConfig -> new FindAuthConfig(abstractAuthConfig, null))
-                    .doOnNext(__ -> log.info("find auth configs for saas mode"));
+                    .map(abstractAuthConfig -> new FindAuthConfig(abstractAuthConfig, null));
         }
         return Flux.empty();
     }

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/configurations/MongoConfig.java

@@ -25,8 +25,6 @@
 import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
-import com.openblocks.domain.encryption.EncryptionService;
-import com.openblocks.domain.encryption.ModelEncryptionEventListener;
 import com.openblocks.domain.user.model.User;
 import com.openblocks.sdk.config.MaterialProperties;
 import com.openblocks.sdk.models.HasIdAndAuditing;
@@ -104,10 +102,4 @@ public ReactiveGridFsTemplate reactiveGridFsTemplate(ReactiveMongoDatabaseFactor
     public MongoTemplate mongoTemplate(MongoDatabaseFactory mongoDbFactory, MappingMongoConverter mappingMongoConverter) {
         return new MongoTemplate(mongoDbFactory, mappingMongoConverter);
     }
-
-    @Bean
-    public <E> ModelEncryptionEventListener<E> encryptionMongoEventListener(EncryptionService encryptionService) {
-        return new ModelEncryptionEventListener<>(encryptionService);
-    }
-
 }

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/DecryptRequired.java

@@ -0,0 +1,6 @@
+package com.openblocks.domain.mongodb;
+
+public interface AfterMongodbRead {
+
+    void afterMongodbRead(MongodbInterceptorContext context);
+}

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/EncryptRequired.java

@@ -0,0 +1,6 @@
+package com.openblocks.domain.mongodb;
+
+public interface BeforeMongodbWrite {
+
+    void beforeMongodbWrite(MongodbInterceptorContext context);
+}

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/AfterMongodbRead.java

@@ -1,39 +1,40 @@
-package com.openblocks.domain.encryption;
+package com.openblocks.domain.mongodb;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
 import org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
+import org.springframework.stereotype.Component;
 
+import com.openblocks.domain.encryption.EncryptionService;
 import com.openblocks.infra.mongo.MongoUpsertHelper;
 import com.openblocks.sdk.event.BeforeSaveEvent;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-public class ModelEncryptionEventListener<E> extends AbstractMongoEventListener<E> {
+@Component
+public class MongodbEventListener<E> extends AbstractMongoEventListener<E> {
 
-    private final EncryptionService encryptionService;
-
-    public ModelEncryptionEventListener(EncryptionService encryptionService) {
-        this.encryptionService = encryptionService;
-    }
+    @Autowired
+    private EncryptionService encryptionService;
 
     @Override
     public void onBeforeConvert(BeforeConvertEvent<E> event) {
         E source = event.getSource();
 
-        if (source instanceof EncryptRequired encryptRequired) {
-            encryptRequired.encrypt(encryptionService);
+        if (source instanceof BeforeMongodbWrite beforeMongodbWrite) {
+            beforeMongodbWrite.beforeMongodbWrite(new MongodbInterceptorContext(encryptionService));
         }
     }
 
     @Override
     public void onAfterConvert(AfterConvertEvent<E> event) {
         E source = event.getSource();
 
-        if (source instanceof DecryptRequired decryptRequired) {
-            decryptRequired.decrypt(encryptionService);
+        if (source instanceof AfterMongodbRead afterMongodbRead) {
+            afterMongodbRead.afterMongodbRead(new MongodbInterceptorContext(encryptionService));
         }
     }
 
@@ -44,8 +45,8 @@ public void onAfterConvert(AfterConvertEvent<E> event) {
     public <T> void onBeforeSaveEvent(BeforeSaveEvent<T> beforeSaveEvent) {
         T source = beforeSaveEvent.source();
 
-        if (source instanceof EncryptRequired encryptRequired) {
-            encryptRequired.encrypt(encryptionService);
+        if (source instanceof BeforeMongodbWrite beforeMongodbWrite) {
+            beforeMongodbWrite.beforeMongodbWrite(new MongodbInterceptorContext(encryptionService));
         }
     }
 }

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/BeforeMongodbWrite.java

@@ -0,0 +1,6 @@
+package com.openblocks.domain.mongodb;
+
+import com.openblocks.domain.encryption.EncryptionService;
+
+public record MongodbInterceptorContext(EncryptionService encryptionService) {
+}

…yption/ModelEncryptionEventListener.java …domain/mongodb/MongodbEventListener.javaserver/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/ModelEncryptionEventListener.java renamed to server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbEventListener.java server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/encryption/ModelEncryptionEventListener.java renamed to server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbEventListener.java

@@ -6,5 +6,5 @@
 
 public interface EnterpriseConnectionConfig {
 
-    List<AbstractAuthConfig> getAuthConfigs();
+    List<AbstractAuthConfig> getConfigs();
 }

server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/mongodb/MongodbInterceptorContext.java

@@ -15,9 +15,9 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import com.openblocks.domain.encryption.DecryptRequired;
-import com.openblocks.domain.encryption.EncryptRequired;
-import com.openblocks.domain.encryption.EncryptionService;
+import com.openblocks.domain.mongodb.AfterMongodbRead;
+import com.openblocks.domain.mongodb.BeforeMongodbWrite;
+import com.openblocks.domain.mongodb.MongodbInterceptorContext;
 import com.openblocks.sdk.auth.AbstractAuthConfig;
 import com.openblocks.sdk.models.HasIdAndAuditing;
 
@@ -30,7 +30,7 @@
 @Setter
 @NoArgsConstructor
 @Document
-public class Organization extends HasIdAndAuditing implements EncryptRequired, DecryptRequired {
+public class Organization extends HasIdAndAuditing implements BeforeMongodbWrite, AfterMongodbRead {
 
     private static final OrganizationCommonSettings EMPTY_SETTINGS = new OrganizationCommonSettings();
 
@@ -68,17 +68,15 @@ public String toString() {
     }
 
     @Override
-    public void decrypt(EncryptionService encryptionService) {
+    public void afterMongodbRead(MongodbInterceptorContext context) {
         ofNullable(getOrganizationDomain())
-                .map(domain -> domain.doDecrypt(encryptionService::decryptString))
-                .ifPresent(this::setOrganizationDomain);
+                .ifPresent(domain -> domain.afterMongodbRead(context));
     }
 
     @Override
-    public void encrypt(EncryptionService encryptionService) {
+    public void beforeMongodbWrite(MongodbInterceptorContext context) {
         ofNullable(getOrganizationDomain())
-                .map(domain -> domain.doEncrypt(encryptionService::encryptString))
-                .ifPresent(this::setOrganizationDomain);
+                .ifPresent(domain -> domain.beforeMongodbWrite(context));
     }
 
     public OrganizationCommonSettings getCommonSettings() {
@@ -99,7 +97,7 @@ public long getCreateTime() {
 
     public List<AbstractAuthConfig> getAuthConfigs() {
         return Optional.ofNullable(organizationDomain)
-                .map(OrganizationDomain::getAuthConfigs)
+                .map(OrganizationDomain::getConfigs)
                 .orElse(Collections.emptyList());
     }
 }