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

Merge branch 'master' of ssh://git.iqser.com:2222/red/persistence-service into bugfix/RED-6265

Browse Source 
# Conflicts:
#	persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java
This commit is contained in:
devplant 2023-03-28 18:44:07 +03:00
commit 95f15cebd9
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
persistence-service-v1/keycloak-commons/src/main/java/com/iqser/red/keycloak/commons/security/SecuredKeyCloakConfiguration.java
View File

@ -74,6 +74,7 @@ public class SecuredKeyCloakConfiguration extends KeycloakWebSecurityConfigurerA
"/redaction-gateway-v1/async/download/with-ott/**",
"/redaction-gateway-v1/docs/**",
"/redaction-gateway-v1/docs",
"/redaction-gateway-v1/tenants/simple",
"/redaction-gateway-v1",
"/internal-api/**");

6
persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/multitenacy/HeaderBasedKeycloakRealmResolver.java vendored
View File

@ -57,10 +57,8 @@ public class HeaderBasedKeycloakRealmResolver implements KeycloakConfigResolver
}
// PMD marks this as unused, although it is clearly used.
// This seems to be a bug in PMD.
@SuppressWarnings("PMD.UnusedPrivateMethod")
@SneakyThrows
@SuppressWarnings("PMD.UnusedPrivateMethod")
private String getTenantFromBearerToken(HttpFacade.Request request) {
String authHeader = request.getHeader("Authorization");
@ -98,4 +96,4 @@ public class HeaderBasedKeycloakRealmResolver implements KeycloakConfigResolver
return values.get(values.size() - 1);
}
}
}

7
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/TenantManagementService.java
View File

@ -35,7 +35,6 @@ import org.springframework.jdbc.datasource.SingleConnectionDataSource;
import org.springframework.stereotype.Service;
import com.iqser.red.keycloak.commons.KeyCloakAdminClientService;
import com.iqser.red.keycloak.commons.KeyCloakSettings;
import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException;
import com.iqser.red.service.persistence.management.v1.processor.exception.InternalServerErrorException;
import com.iqser.red.service.persistence.management.v1.processor.exception.NotFoundException;
@ -87,8 +86,6 @@ public class TenantManagementService {
private final GeneralConfigurationService generalConfigurationService;
private final KeyCloakRoleManagerService keyCloakRoleManagerService;
private final KeyCloakAdminClientService keycloak;
@SuppressWarnings("PMD.UnusedPrivateField")
private final KeyCloakSettings keyCloakSettings;
public TenantManagementService(EncryptionDecryptionService encryptionService,
@ -98,8 +95,7 @@ public class TenantManagementService {
AsyncMigrationStarterService asyncMigrationStarterService,
GeneralConfigurationService generalConfigurationService,
KeyCloakRoleManagerService keyCloakRoleManagerService,
KeyCloakAdminClientService keycloak,
KeyCloakSettings keyCloakSettings) {
KeyCloakAdminClientService keycloak) {
this.encryptionService = encryptionService;
this.liquibaseProperties = liquibaseProperties;
@ -109,7 +105,6 @@ public class TenantManagementService {
this.generalConfigurationService = generalConfigurationService;
this.keyCloakRoleManagerService = keyCloakRoleManagerService;
this.keycloak = keycloak;
this.keyCloakSettings = keyCloakSettings;
}