Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e16d918

Browse files
Thomasrludomikula
Thomasr
authored andcommitted
slug validation
1 parent d3523c1 commit e16d918

File tree

5 files changed

+24
-9
lines changed

5 files changed

+24
-9
lines changed

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,8 @@ public interface ApplicationRepository extends ReactiveMongoRepository<Applicati
6767
* Find all agency applications
6868
*/
6969
Flux<Application> findByPublicToAllIsTrueAndAgencyProfileIsTrue();
70-
Mono<Boolean> existsBySlug(String slug);
70+
71+
@Query("{ 'organizationId': ?0, 'slug': ?1 }")
72+
Mono<Boolean> existsByOrganizationIdAndSlug(String organizationId, String slug);
7173

7274
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/service/ApplicationServiceImpl.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import org.lowcoder.domain.permission.model.ResourceType;
1919
import org.lowcoder.domain.permission.service.ResourcePermissionService;
2020
import org.lowcoder.domain.user.repository.UserRepository;
21+
import org.lowcoder.domain.util.SlugUtils;
2122
import org.lowcoder.infra.annotation.NonEmptyMono;
2223
import org.lowcoder.infra.mongo.MongoUpsertHelper;
2324
import org.lowcoder.sdk.constants.FieldName;
@@ -349,15 +350,15 @@ public Mono<Map<String, Object>> getLiveDSLByApplicationId(String applicationId)
349350

350351
@Override
351352
public Mono<Application> updateSlug(String applicationId, String newSlug) {
352-
return repository.existsBySlug(newSlug).flatMap(exists -> {
353+
return repository.findById(applicationId).flatMap(application -> repository.existsByOrganizationIdAndSlug(application.getOrganizationId(), newSlug).flatMap(exists -> {
354+
if (!SlugUtils.validate(newSlug)) {
355+
return Mono.error(new BizException(BizError.INVALID_SLUG, "Slug format is invalid"));
356+
}
353357
if (exists) {
354358
return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
355359
}
356-
return repository.findById(applicationId)
357-
.flatMap(application -> {
358-
application.setSlug(newSlug);
359-
return repository.save(application);
360-
});
361-
});
360+
application.setSlug(newSlug);
361+
return repository.save(application);
362+
}));
362363
}
363364
}

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/service/OrganizationServiceImpl.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.lowcoder.domain.organization.repository.OrganizationRepository;
1717
import org.lowcoder.domain.user.model.User;
1818
import org.lowcoder.domain.user.repository.UserRepository;
19+
import org.lowcoder.domain.util.SlugUtils;
1920
import org.lowcoder.infra.annotation.PossibleEmptyMono;
2021
import org.lowcoder.infra.mongo.MongoUpsertHelper;
2122
import org.lowcoder.sdk.config.CommonConfig;
@@ -292,6 +293,9 @@ private String buildCommonSettingsUpdateTimeKey(String key) {
292293
@Override
293294
public Mono<Organization> updateSlug(String organizationId, String newSlug) {
294295
return repository.existsBySlug(newSlug).flatMap(exists -> {
296+
if (!SlugUtils.validate(newSlug)) {
297+
return Mono.error(new BizException(BizError.INVALID_SLUG, "Slug format is invalid"));
298+
}
295299
if (exists) {
296300
return Mono.error(new BizException(BizError.DUPLICATE_ENTRY, "Slug already exists"));
297301
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package org.lowcoder.domain.util;
2+
3+
public class SlugUtils {
4+
public static Boolean validate(String slug) {
5+
return slug.matches("^[a-zA-Z0-9_-]*$");
6+
}
7+
}

‎server/api-service/lowcoder-sdk/src/main/java/org/lowcoder/sdk/exception/BizError.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@ public enum BizError {
154154
ILLEGAL_BUNDLE_PERMISSION_ID(500, 6404),
155155

156156
//slug 6501 - 6501
157-
DUPLICATE_ENTRY(403, 6501);
157+
DUPLICATE_ENTRY(403, 6501),
158+
INVALID_SLUG(403, 6502);
158159

159160
static {
160161
checkDuplicates(values(), BizError::getBizErrorCode);

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /