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

RED-5292: Split Tenant object into Request and Response without password

Browse Source
This commit is contained in:
Philipp Schramm 2022-10-12 16:05:23 +02:00
parent c9b91fd74e
commit 2dabbb1193
6 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import lombok.NoArgsConstructor;
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor
public class Tenant { public class TenantRequest {
private String tenantId; private String tenantId;
private String displayName; private String displayName;

20
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/multitenancy/TenantResponse.java Normal file
View File

@ -0,0 +1,20 @@
package com.iqser.red.service.persistence.service.v1.api.model.multitenancy;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class TenantResponse {
private String tenantId;
private String displayName;
private String guid;
private String jdbcUrl;
private String user;
}

7
persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/TenantsResource.java
View File

@ -11,7 +11,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.ResponseStatus;
import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.Tenant; import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantRequest;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantResponse;
@ResponseStatus(value = HttpStatus.OK) @ResponseStatus(value = HttpStatus.OK)
public interface TenantsResource { public interface TenantsResource {
@ -20,11 +21,11 @@ public interface TenantsResource {
String TENANT_ID_PATH_PARAM = "/{" + TENANT_ID_PARAM + "}"; String TENANT_ID_PATH_PARAM = "/{" + TENANT_ID_PARAM + "}";
@PostMapping(value = "/tenants", consumes = MediaType.APPLICATION_JSON_VALUE) @PostMapping(value = "/tenants", consumes = MediaType.APPLICATION_JSON_VALUE)
void createTenant(@RequestBody Tenant tenant); void createTenant(@RequestBody TenantRequest tenantRequest);
@GetMapping(value = "/tenants", produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "/tenants", produces = MediaType.APPLICATION_JSON_VALUE)
List<Tenant> getTenants(); List<TenantResponse> getTenants();
@GetMapping(value = "/deploymentKey" + TENANT_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE) @GetMapping(value = "/deploymentKey" + TENANT_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
JSONPrimitive<String> getDeploymentKey(@PathVariable(TENANT_ID_PARAM) String tenantId); JSONPrimitive<String> getDeploymentKey(@PathVariable(TENANT_ID_PARAM) String tenantId);

9
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/TenantsController.java
View File

@ -9,7 +9,8 @@ import org.springframework.web.bind.annotation.RestController;
import com.iqser.red.service.peristence.v1.server.service.DeploymentKeyService; import com.iqser.red.service.peristence.v1.server.service.DeploymentKeyService;
import com.iqser.red.service.peristence.v1.server.service.TenantManagementService; import com.iqser.red.service.peristence.v1.server.service.TenantManagementService;
import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive; import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.Tenant; import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantRequest;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantResponse;
import com.iqser.red.service.persistence.service.v1.api.resources.TenantsResource; import com.iqser.red.service.persistence.service.v1.api.resources.TenantsResource;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
@ -24,13 +25,13 @@ public class TenantsController implements TenantsResource {
public void createTenant(@RequestBody Tenant tenant) { public void createTenant(@RequestBody TenantRequest tenantRequest) {
tenantManagementService.createTenant(tenant); tenantManagementService.createTenant(tenantRequest);
} }
public List<Tenant> getTenants(){ public List<TenantResponse> getTenants(){
return tenantManagementService.getTenants(); return tenantManagementService.getTenants();
} }

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

@ -19,7 +19,8 @@ import com.iqser.red.service.persistence.management.v1.processor.exception.NotFo
import com.iqser.red.service.persistence.management.v1.processor.multitenancy.entity.TenantEntity; import com.iqser.red.service.persistence.management.v1.processor.multitenancy.entity.TenantEntity;
import com.iqser.red.service.persistence.management.v1.processor.service.EncryptionDecryptionService; import com.iqser.red.service.persistence.management.v1.processor.service.EncryptionDecryptionService;
import com.iqser.red.service.persistence.management.v1.processor.service.persistence.mulitenancy.repository.TenantRepository; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.mulitenancy.repository.TenantRepository;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.Tenant; import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantRequest;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantResponse;
import liquibase.exception.LiquibaseException; import liquibase.exception.LiquibaseException;
import liquibase.integration.spring.SpringLiquibase; import liquibase.integration.spring.SpringLiquibase;
@ -38,7 +39,8 @@ public class TenantManagementService {
public TenantManagementService(EncryptionDecryptionService encryptionService, public TenantManagementService(EncryptionDecryptionService encryptionService,
@Qualifier("tenantLiquibaseProperties") LiquibaseProperties liquibaseProperties, @Qualifier("tenantLiquibaseProperties") LiquibaseProperties liquibaseProperties,
ResourceLoader resourceLoader, TenantRepository tenantRepository) { ResourceLoader resourceLoader,
TenantRepository tenantRepository) {
this.encryptionService = encryptionService; this.encryptionService = encryptionService;
this.liquibaseProperties = liquibaseProperties; this.liquibaseProperties = liquibaseProperties;
@ -49,23 +51,23 @@ public class TenantManagementService {
@SneakyThrows @SneakyThrows
public void createTenant(Tenant tenant) { public void createTenant(TenantRequest tenantRequest) {
if (!tenantRepository.findById(tenant.getTenantId()).isPresent()) { if (tenantRepository.findById(tenantRequest.getTenantId()).isEmpty()) {
String encryptedPassword = encryptionService.encrypt(tenant.getPassword()); String encryptedPassword = encryptionService.encrypt(tenantRequest.getPassword());
try (Connection connection = DriverManager.getConnection(tenant.getJdbcUrl(), tenant.getUser(), tenant.getPassword())) { try (Connection connection = DriverManager.getConnection(tenantRequest.getJdbcUrl(), tenantRequest.getUser(), tenantRequest.getPassword())) {
DataSource tenantDataSource = new SingleConnectionDataSource(connection, false); DataSource tenantDataSource = new SingleConnectionDataSource(connection, false);
runLiquibase(tenantDataSource); runLiquibase(tenantDataSource);
} }
TenantEntity tenantEntity = TenantEntity.builder() TenantEntity tenantEntity = TenantEntity.builder()
.tenantId(tenant.getTenantId()) .tenantId(tenantRequest.getTenantId())
.displayName(tenant.getDisplayName()) .displayName(tenantRequest.getDisplayName())
.guid(UUID.randomUUID().toString()) .guid(UUID.randomUUID().toString())
.username(tenant.getUser()) .username(tenantRequest.getUser())
.jdbcUrl(tenant.getJdbcUrl()) .jdbcUrl(tenantRequest.getJdbcUrl())
.password(encryptedPassword) .password(encryptedPassword)
.build(); .build();
tenantRepository.save(tenantEntity); tenantRepository.save(tenantEntity);
@ -73,28 +75,27 @@ public class TenantManagementService {
} }
public List<Tenant> getTenants() { public List<TenantResponse> getTenants() {
return tenantRepository.findAll().stream().map(this::convert).collect(Collectors.toList()); return tenantRepository.findAll().stream().map(this::convert).collect(Collectors.toList());
} }
public Tenant getTenant(String tenantId) { public TenantResponse getTenant(String tenantId) {
return tenantRepository.findById(tenantId).map(this::convert).orElseThrow(() -> new NotFoundException("Tenant does not exist")); return tenantRepository.findById(tenantId).map(this::convert).orElseThrow(() -> new NotFoundException("Tenant does not exist"));
} }
private Tenant convert(TenantEntity entity) { private TenantResponse convert(TenantEntity entity) {
return Tenant.builder() return TenantResponse.builder()
.tenantId(entity.getTenantId()) .tenantId(entity.getTenantId())
.displayName(entity.getDisplayName()) .displayName(entity.getDisplayName())
.guid(entity.getGuid()) .guid(entity.getGuid())
.jdbcUrl(entity.getJdbcUrl()) .jdbcUrl(entity.getJdbcUrl())
.password(encryptionService.decrypt(entity.getPassword())) .user(entity.getUsername())
.user(entity.getUsername()) .build();
.build();
} }

4
persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java
View File

@ -83,7 +83,7 @@ import com.iqser.red.service.persistence.management.v1.processor.service.persist
import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext; import com.iqser.red.service.persistence.management.v1.processor.utils.multitenancy.TenantContext;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.ApplicationConfig; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.ApplicationConfig;
import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType; import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileType;
import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.Tenant; import com.iqser.red.service.persistence.service.v1.api.model.multitenancy.TenantRequest;
import com.iqser.red.service.redaction.v1.model.RedactionLog; import com.iqser.red.service.redaction.v1.model.RedactionLog;
import com.iqser.red.service.redaction.v1.model.RedactionResult; import com.iqser.red.service.redaction.v1.model.RedactionResult;
import com.iqser.red.storage.commons.StorageAutoConfiguration; import com.iqser.red.storage.commons.StorageAutoConfiguration;
@ -254,7 +254,7 @@ public abstract class AbstractPersistenceServerServiceTest {
createDatabase("redaction", "redaction"); createDatabase("redaction", "redaction");
createSchema(jdbcUrl, "redaction", "redaction"); createSchema(jdbcUrl, "redaction", "redaction");
tenantsClient.createTenant(new Tenant("redaction","Redaction default", UUID.randomUUID().toString(), jdbcUrl, "redaction", "redaction")); tenantsClient.createTenant(new TenantRequest("redaction", "Redaction default", UUID.randomUUID().toString(), jdbcUrl, "redaction", "redaction"));
} }
} }