Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

RED-5293: 500 for invalid tenant

Browse Source
This commit is contained in:
Ali Oezyetimoglu 2022-11-04 14:39:28 +01:00
parent cf32e1684f
commit 8a3439ddf5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantRequest.java
View File

@ -22,8 +22,8 @@ public class TenantRequest {
@NotBlank
private String jdbcUrl;
@NotBlank
private String databaseUser;
private String user;
@NotBlank
private String databasePassword;
private String password;
}

6
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/TenantManagementService.java
View File

@ -58,9 +58,9 @@ public class TenantManagementService {
if (tenantRepository.findById(tenantRequest.getTenantId()).isEmpty()) {
String encryptedPassword = encryptionService.encrypt(tenantRequest.getDatabasePassword());
String encryptedPassword = encryptionService.encrypt(tenantRequest.getPassword());
try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getDatabaseUser(), tenantRequest.getDatabasePassword())) {
try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getUser(), tenantRequest.getPassword())) {
DataSource tenantDataSource = new SingleConnectionDataSource(connection, false);
runLiquibase(tenantDataSource);
} catch (PSQLException e) {
@ -71,7 +71,7 @@ public class TenantManagementService {
.tenantId(tenantRequest.getTenantId())
.displayName(tenantRequest.getDisplayName())
.guid(UUID.randomUUID().toString())
.username(tenantRequest.getDatabaseUser())
.username(tenantRequest.getUser())
.jdbcUrl(tenantRequest.getJdbcUrl())
.password(encryptedPassword)
.build();