Merge pull request #167 from jerry-goodman/develop

neon-balcony · web-flow · commit a5b0a840971d · 2023-01-05T16:47:22.000+08:00
Improve the material api and fix some bugs
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialMeta.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialMeta.java
@@ -15,4 +15,5 @@ public class MaterialMeta extends HasIdAndAuditing {
     private String filename;
     private String orgId;
     private long size;// in bytes
+    private MaterialType type;
 }
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialType.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/material/model/MaterialType.java
@@ -0,0 +1,6 @@
+package com.openblocks.domain.material.model;
+
+public enum MaterialType {
+
+    COMMON, LOGO, FAVICON
+}
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/material/repository/MaterialMateRepository.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/material/repository/MaterialMateRepository.java
@@ -4,6 +4,7 @@
 import org.springframework.stereotype.Repository;
 
 import com.openblocks.domain.material.model.MaterialMeta;
+import com.openblocks.domain.material.model.MaterialType;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -13,5 +14,9 @@ public interface MaterialMateRepository extends ReactiveMongoRepository<Material
 
     Flux<MaterialMeta> findByOrgId(String orgId);
 
+    Flux<MaterialMeta> findByOrgIdAndType(String orgId, MaterialType type);
+
+    Flux<MaterialMeta> findByOrgIdAndFilenameAndType(String orgId, String filename, MaterialType type);
+
     Mono<Boolean> existsByOrgIdAndFilename(String orgId, String filename);
 }
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/Organization.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/organization/model/Organization.java
@@ -84,6 +84,9 @@ public OrganizationCommonSettings getCommonSettings() {
     public static class OrganizationCommonSettings extends HashMap<String, Object> {
         public static final String USER_EXTRA_TRANSFORMER = "userExtraTransformer";
         public static final String USER_EXTRA_TRANSFORMER_UPDATE_TIME = "userExtraTransformer_updateTime";
+
+        // custom branding configs
+        public static final String CUSTOM_BRANDING_KEY = "branding";
     }
 
     public long getCreateTime() {
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationService.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationService.java
@@ -15,6 +15,9 @@
 
 public interface OrganizationService {
 
+    @PossibleEmptyMono
+    Mono<Organization> getOrganizationInEnterpriseMode();
+
     Mono<Organization> create(Organization organization, String creatorUserId);
 
     Mono<Organization> createDefault(User user);
diff --git a/server/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java b/server/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java
@@ -29,6 +29,7 @@
 import com.openblocks.domain.organization.model.QOrganization;
 import com.openblocks.domain.organization.repository.OrganizationRepository;
 import com.openblocks.domain.user.model.User;
+import com.openblocks.infra.annotation.PossibleEmptyMono;
 import com.openblocks.infra.mongo.MongoUpsertHelper;
 import com.openblocks.sdk.config.CommonConfig;
 import com.openblocks.sdk.config.dynamic.Conf;
@@ -91,7 +92,7 @@ public Mono<Organization> createDefault(User user) {
                 return create(organization, user.getId());
             }
             // enterprise mode
-            return joinOrgForEnterpriseMode(user.getId())
+            return joinOrganizationInEnterpriseMode(user.getId())
                     .flatMap(join -> {
                         if (Boolean.TRUE.equals(join)) {
                             return Mono.empty();
@@ -101,17 +102,26 @@ public Mono<Organization> createDefault(User user) {
         });
     }
 
-    private Mono<Boolean> joinOrgForEnterpriseMode(String userId) {
+    private Mono<Boolean> joinOrganizationInEnterpriseMode(String userId) {
+        return getOrganizationInEnterpriseMode()
+                .flatMap(organization -> orgMemberService.addMember(organization.getId(), userId, MemberRole.MEMBER))
+                .defaultIfEmpty(false);
+    }
+
+    @Override
+    @PossibleEmptyMono
+    public Mono<Organization> getOrganizationInEnterpriseMode() {
+        if (commonConfig.getWorkspace().getMode() == WorkspaceMode.SAAS) {
+            return Mono.empty();
+        }
         return Mono.defer(() -> {
                     String enterpriseOrgId = commonConfig.getWorkspace().getEnterpriseOrgId();
                     if (StringUtils.isNotBlank(enterpriseOrgId)) {
                         return repository.findById(enterpriseOrgId);
                     }
                     return Mono.empty();
                 })
-                .switchIfEmpty(repository.findAll().next())
-                .flatMap(organization -> orgMemberService.addMember(organization.getId(), userId, MemberRole.MEMBER))
-                .defaultIfEmpty(false);
+                .switchIfEmpty(repository.findAll().next());
     }
 
     @Override
diff --git a/server/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationService.java b/server/openblocks-infra/src/main/java/com/openblocks/infra/birelation/BiRelationService.java
@@ -77,8 +77,8 @@ public Mono<Boolean> upsert(BiRelation biRelation) {
         Preconditions.checkArgument(isNotBlank(biRelation.getTargetId()));
         Preconditions.checkArgument(biRelation.getBizType() != null);
 
-        Query query = buildQuery(biRelation.getSourceId(), biRelation.getTargetId(), biRelation.getBizType());
-        return mongoUpsertHelper.upsert(biRelation, query);
+        Criteria criteria = buildCriteria(biRelation.getSourceId(), biRelation.getTargetId(), biRelation.getBizType());
+        return mongoUpsertHelper.upsert(biRelation, criteria);
     }
 
     public Flux<BiRelation> getBySourceIds(BiRelationBizType bizType, Collection<String> sourceIds) {
@@ -169,11 +169,14 @@ public Mono<Long> countByTargetId(BiRelationBizType bizType, String targetId) {
         return biRelationRepository.countByBizTypeAndTargetId(bizType, targetId);
     }
 
-    private Query buildQuery(String sourceId, String targetId, BiRelationBizType bizType) {
-        Criteria criteria = where(BIZ_TYPE).is(bizType)
+    private Criteria buildCriteria(String sourceId, String targetId, BiRelationBizType bizType) {
+        return where(BIZ_TYPE).is(bizType)
                 .and(SOURCE_ID).is(sourceId)
                 .and(TARGET_ID).is(targetId);
-        return new Query(criteria);
+    }
+
+    private Query buildQuery(String sourceId, String targetId, BiRelationBizType bizType) {
+        return new Query(buildCriteria(sourceId, targetId, bizType));
     }
 
     public Mono<BiRelation> getById(String id) {
diff --git a/server/openblocks-infra/src/main/java/com/openblocks/infra/constant/NewUrl.java b/server/openblocks-infra/src/main/java/com/openblocks/infra/constant/NewUrl.java
@@ -1,6 +1,10 @@
 package com.openblocks.infra.constant;
 
 public final class NewUrl {
+
+    private NewUrl() {
+    }
+
     public static final String PREFIX = "/api";
     public static final String ORGANIZATION_URL = PREFIX + "/organizations";
     public static final String DATASOURCE_URL = PREFIX + "/datasources";
@@ -21,5 +25,7 @@ public final class NewUrl {
     public static final String LIBRARY_QUERY_RECORD_URL = PREFIX + "/library-query-records";
 
     public static final String FOLDER_URL = PREFIX + "/folders";
+
+    public static final String GITHUB_STAR = PREFIX + "/misc/github-star";
     public static final String MATERIAL_URL = PREFIX + "/materials";
 }
diff --git a/server/openblocks-infra/src/main/java/com/openblocks/infra/mongo/MongoUpsertHelper.java b/server/openblocks-infra/src/main/java/com/openblocks/infra/mongo/MongoUpsertHelper.java
@@ -89,26 +89,39 @@ public <T extends HasIdAndAuditing> Mono<T> upsertWithAuditingParams(T newResour
                 .switchIfEmpty(Mono.defer(() -> reactiveMongoTemplate.save(newResource)));
     }
 
+    /**
+     * reactiveMongoTemplate#upsert is not used because createdAt/createdBy/updatedAt/updatedBy params cannot be set here
+     */
+    @SuppressWarnings("unchecked")
+    public <T extends HasIdAndAuditing> Mono<T> upsertWithAuditingParams(T newResource, Criteria criteria) {
+        return reactiveMongoTemplate.findOne(new Query(criteria), (Class<T>) newResource.getClass())
+                .flatMap(existingResource -> {
+                    newResource.setId(existingResource.getId());
+                    newResource.setCreatedAt(existingResource.getCreatedAt());
+                    newResource.setCreatedBy(existingResource.getCreatedBy());
+                    return reactiveMongoTemplate.save(newResource);
+                })
+                .switchIfEmpty(Mono.defer(() -> reactiveMongoTemplate.save(newResource)));
+    }
+
     /**
      * used for createdAt/createdBy/updatedAt/updatedBy is not required
      */
     public <T> Mono<Boolean> upsert(T newResource, String uniqueKeyName, String uniqueKeyValue) {
-        Query query = new Query(Criteria.where(uniqueKeyName).is(uniqueKeyValue));
-        return upsert(newResource, query);
+        return upsert(newResource, Criteria.where(uniqueKeyName).is(uniqueKeyValue));
     }
 
     public Mono<Boolean> upsert(Update update, String uniqueKeyName, String uniqueKeyValue, Class<?> collection) {
-        Query query = new Query(Criteria.where(uniqueKeyName).is(uniqueKeyValue));
-        return upsert(update, query, collection);
+        return upsert(update, Criteria.where(uniqueKeyName).is(uniqueKeyValue), collection);
     }
 
-    public <T> Mono<Boolean> upsert(T newResource, Query query) {
+    public <T> Mono<Boolean> upsert(T newResource, Criteria criteria) {
         Update update = convertToUpdate(newResource);
-        return upsert(update, query, newResource.getClass());
+        return upsert(update, criteria, newResource.getClass());
     }
 
-    public Mono<Boolean> upsert(Update update, Query query, Class<?> collection) {
-        return reactiveMongoTemplate.upsert(query, update, collection)
+    public Mono<Boolean> upsert(Update update, Criteria criteria, Class<?> collection) {
+        return reactiveMongoTemplate.upsert(new Query(criteria), update, collection)
                 .map(updateResult -> updateResult.getModifiedCount() > 0);
     }
 
diff --git a/server/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HashUtils.java b/server/openblocks-sdk/src/main/java/com/openblocks/sdk/util/HashUtils.java
@@ -0,0 +1,11 @@
+package com.openblocks.sdk.util;
+
+import com.google.common.hash.Hashing;
+
+public class HashUtils {
+
+    @SuppressWarnings("UnstableApiUsage")
+    public static String hash(byte[] content) {
+        return Hashing.sha256().hashBytes(content).toString();
+    }
+}
diff --git a/server/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MediaTypeUtils.java b/server/openblocks-sdk/src/main/java/com/openblocks/sdk/util/MediaTypeUtils.java
@@ -1,4 +1,4 @@
-package com.openblocks.api.util;
+package com.openblocks.sdk.util;
 
 import static org.springframework.http.MediaType.APPLICATION_OCTET_STREAM;
 import static org.springframework.http.MediaType.APPLICATION_PDF;
@@ -7,6 +7,7 @@
 import static org.springframework.http.MediaType.IMAGE_PNG;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.http.MediaType;
@@ -15,21 +16,34 @@
 
 public class MediaTypeUtils {
 
+    @Nonnull
+    @SuppressWarnings("ConstantConditions")
     public static MediaType parse(String filename) {
+        return parse(filename, APPLICATION_OCTET_STREAM);
+    }
+
+    @Nullable
+    public static MediaType parse(String filename, @Nullable MediaType defaultContentType) {
         Preconditions.checkArgument(StringUtils.isNotBlank(filename));
         String[] split = filename.split("\\.");
-        return getMediaType(split[split.length - 1]);
+        return getMediaType(split[split.length - 1], defaultContentType);
     }
 
     @Nonnull
+    @SuppressWarnings("ConstantConditions")
     public static MediaType getMediaType(String fileType) {
+        return getMediaType(fileType, APPLICATION_OCTET_STREAM);
+    }
+
+    @Nullable
+    public static MediaType getMediaType(String fileType, @Nullable MediaType defaultContentType) {
         return switch (fileType) {
             case "jpg", "jpeg" -> IMAGE_JPEG;
             case "gif" -> IMAGE_GIF;
             case "png" -> IMAGE_PNG;
             case "pdf" -> APPLICATION_PDF;
             case "svg" -> new MediaType("image", "svg+xml");
-            default -> APPLICATION_OCTET_STREAM;
+            default -> defaultContentType;
         };
     }
 }
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiService.java
@@ -1,7 +1,6 @@
 package com.openblocks.api.authentication.service;
 
 import com.openblocks.api.authentication.request.AuthRequestContext;
-import com.openblocks.domain.organization.model.EnterpriseConnectionConfig;
 import com.openblocks.domain.user.model.AuthorizedUser;
 import com.openblocks.domain.user.model.User;
 import com.openblocks.sdk.auth.AbstractAuthConfig;
@@ -17,6 +16,4 @@ public interface AuthenticationApiService {
     Mono<Void> onUserRegister(User user);
 
     Mono<AbstractAuthConfig> findAuthConfig(String source, AuthRequestContext context, String domain);
-
-    Mono<EnterpriseConnectionConfig> getEnterpriseConnectionConfigMono(String domain);
 }
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiServiceImpl.java b/server/openblocks-server/src/main/java/com/openblocks/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -15,8 +15,6 @@
 import com.openblocks.api.authentication.request.AuthRequestFactory;
 import com.openblocks.api.authentication.request.form.FormAuthRequestContext;
 import com.openblocks.api.usermanagement.OrgApiService;
-import com.openblocks.domain.organization.model.EnterpriseConnectionConfig;
-import com.openblocks.domain.organization.model.Organization;
 import com.openblocks.domain.organization.service.OrganizationService;
 import com.openblocks.domain.user.model.AuthorizedUser;
 import com.openblocks.domain.user.model.User;
@@ -80,14 +78,6 @@ public Mono<AbstractAuthConfig> findAuthConfig(String source, AuthRequestContext
                 .switchIfEmpty(ofError(LOG_IN_SOURCE_NOT_SUPPORTED, "LOG_IN_SOURCE_NOT_SUPPORTED"));
     }
 
-    @Override
-    public Mono<EnterpriseConnectionConfig> getEnterpriseConnectionConfigMono(String domain) {
-        return organizationService.getByDomain(domain)
-                .map(Organization::getOrganizationDomain)
-                .cast(EnterpriseConnectionConfig.class)
-                .defaultIfEmpty(envAuthConfig);
-    }
-
     @Override
     public Mono<Void> onUserRegister(User user) {
         return organizationService.createDefault(user).then();
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/config/ConfigController.java b/server/openblocks-server/src/main/java/com/openblocks/api/config/ConfigController.java
@@ -1,5 +1,7 @@
 package com.openblocks.api.config;
 
+import javax.annotation.PostConstruct;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -9,13 +11,15 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ServerWebExchange;
 
-import com.openblocks.api.authentication.service.AuthenticationApiService;
 import com.openblocks.api.framework.view.ResponseView;
+import com.openblocks.api.usermanagement.OrgApiService;
 import com.openblocks.infra.config.model.ServerConfig;
 import com.openblocks.infra.config.repository.ServerConfigRepository;
 import com.openblocks.infra.constant.NewUrl;
 import com.openblocks.infra.constant.Url;
 import com.openblocks.sdk.config.CommonConfig;
+import com.openblocks.sdk.config.dynamic.Conf;
+import com.openblocks.sdk.config.dynamic.ConfigCenter;
 import com.openblocks.sdk.util.UriUtils;
 
 import lombok.extern.slf4j.Slf4j;
@@ -33,7 +37,22 @@ public class ConfigController {
     private ServerConfigRepository serverConfigRepository;
 
     @Autowired
-    private AuthenticationApiService authenticationApiService;
+    private OrgApiService orgApiService;
+
+    @Autowired
+    private ConfigCenter configCenter;
+
+    private Conf<String> deploymentIdConf;
+
+    @PostConstruct
+    public void init() {
+        deploymentIdConf = configCenter.deployment().ofString("id", "");
+    }
+
+    @GetMapping(value = "/deploymentId")
+    public Mono<String> getDeploymentId() {
+        return Mono.just(deploymentIdConf.get());
+    }
 
     @GetMapping("/{key}")
     public Mono<ResponseView<ServerConfig>> getServerConfig(@PathVariable String key) {
@@ -51,14 +70,7 @@ public Mono<ResponseView<ServerConfig>> updateServerConfig(@PathVariable String
     @GetMapping
     public Mono<ResponseView<ConfigView>> getConfig(ServerWebExchange exchange) {
         String domain = UriUtils.getRefererDomain(exchange);
-        return authenticationApiService.getEnterpriseConnectionConfigMono(domain)
-                .map(enterpriseConnectionConfig ->
-                        ConfigView.builder()
-                                .authConfigs(enterpriseConnectionConfig.getAuthConfigs())
-                                .isCloudHosting(commonConfig.isCloud())
-                                .workspaceMode(commonConfig.getWorkspace().getMode())
-                                .build()
-                )
+        return orgApiService.getOrganizationConfigs(domain)
                 .map(ResponseView::success);
     }
 
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/config/ConfigView.java b/server/openblocks-server/src/main/java/com/openblocks/api/config/ConfigView.java
@@ -8,16 +8,15 @@
 import com.openblocks.sdk.auth.AbstractAuthConfig;
 import com.openblocks.sdk.constants.WorkspaceMode;
 
-import lombok.Builder;
 import lombok.Getter;
+import lombok.experimental.SuperBuilder;
 
-@Builder
 @Getter
+@SuperBuilder
 public class ConfigView {
 
     private boolean isCloudHosting;
     private List<AbstractAuthConfig> authConfigs;
-    @JsonInclude(Include.NON_EMPTY)
-    private String warning;
     private WorkspaceMode workspaceMode;
+    private boolean selfDomain;
 }
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java b/server/openblocks-server/src/main/java/com/openblocks/api/framework/security/SecurityConfig.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiService.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiServiceImpl.java b/server/openblocks-server/src/main/java/com/openblocks/api/material/MaterialApiServiceImpl.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/material/MaterialController.java b/server/openblocks-server/src/main/java/com/openblocks/api/material/MaterialController.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiService.java b/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiService.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiServiceImpl.java b/server/openblocks-server/src/main/java/com/openblocks/api/usermanagement/OrgApiServiceImpl.java
diff --git a/server/openblocks-server/src/main/java/com/openblocks/runner/migrations/DatabaseChangelog.java b/server/openblocks-server/src/main/java/com/openblocks/runner/migrations/DatabaseChangelog.java

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ public class MaterialMeta extends HasIdAndAuditing {`
`15`	`15`	`private String filename;`
`16`	`16`	`private String orgId;`
`17`	`17`	`private long size;// in bytes`
	`18`	`+ private MaterialType type;`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,9 @@ public OrganizationCommonSettings getCommonSettings() {`
`84`	`84`	`public static class OrganizationCommonSettings extends HashMap<String, Object> {`
`85`	`85`	`public static final String USER_EXTRA_TRANSFORMER = "userExtraTransformer";`
`86`	`86`	`public static final String USER_EXTRA_TRANSFORMER_UPDATE_TIME = "userExtraTransformer_updateTime";`
	`87`	`+`
	`88`	`+ // custom branding configs`
	`89`	`+ public static final String CUSTOM_BRANDING_KEY = "branding";`
`87`	`90`	`}`
`88`	`91`
`89`	`92`	`public long getCreateTime() {`