From e4203a3bb4b15ebc82c02ebea173608febef1630 Mon Sep 17 00:00:00 2001 From: Diamantis Tziotzios Date: Fri, 27 Oct 2023 09:54:49 +0300 Subject: [PATCH] backend fixes --- .../types/dmpblueprint/SectionEntity.java | 10 ++++--- .../configurations/DepositConfiguration.java | 26 +++++++++---------- .../dmpblueprintdefinition/FieldPersist.java | 3 ++- 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java index e91ecaacf..1ca7c9a19 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java +++ b/dmp-backend/core/src/main/java/eu/eudat/commons/types/dmpblueprint/SectionEntity.java @@ -87,11 +87,13 @@ public class SectionEntity implements XmlSerializable { systemFields.appendChild(systemField.toXml(doc)); } rootElement.appendChild(systemFields); - Element descriptionTemplates = doc.createElement("descriptionTemplates"); - for (DescriptionTemplateEntity descriptionTemplate : this.descriptionTemplates) { - descriptionTemplates.appendChild(descriptionTemplate.toXml(doc)); + if (this.descriptionTemplates != null) { + Element descriptionTemplates = doc.createElement("descriptionTemplates"); + for (DescriptionTemplateEntity descriptionTemplate : this.descriptionTemplates) { + descriptionTemplates.appendChild(descriptionTemplate.toXml(doc)); + } + rootElement.appendChild(descriptionTemplates); } - rootElement.appendChild(descriptionTemplates); temp = this.fields.stream().filter(f -> f.getCategory().equals(DmpBlueprintFieldCategory.Extra)).collect(Collectors.toList()); List extraFieldList = temp.stream().map(x-> (ExtraFieldEntity)x).collect(Collectors.toList()); Element extraFields = doc.createElement("extraFields"); diff --git a/dmp-backend/core/src/main/java/eu/eudat/configurations/DepositConfiguration.java b/dmp-backend/core/src/main/java/eu/eudat/configurations/DepositConfiguration.java index 0f1ccdfd2..50159cdde 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/configurations/DepositConfiguration.java +++ b/dmp-backend/core/src/main/java/eu/eudat/configurations/DepositConfiguration.java @@ -36,19 +36,19 @@ public class DepositConfiguration { public List depositClients() { List clients = new ArrayList<>(); for (DepositProperties.DepositSource source: properties.getSources()) { - ClientRegistration clientRegistration = ClientRegistration - .withRegistrationId(source.getClientId()) - .clientId(source.getClientId()) - .clientSecret(source.getClientSecret()) - .scope(source.getScope()) - .issuerUri(source.getIssuerUrl()) - .authorizationGrantType(AuthorizationGrantType.JWT_BEARER) - .build(); - ReactiveClientRegistrationRepository clientRegistrationRepository = new InMemoryReactiveClientRegistrationRepository(clientRegistration); - ReactiveOAuth2AuthorizedClientService clientService = new InMemoryReactiveOAuth2AuthorizedClientService(clientRegistrationRepository); - AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager authorizedClientManager = new AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager(clientRegistrationRepository, clientService); - ServerOAuth2AuthorizedClientExchangeFilterFunction oauth = new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager); - clients.add(new DepositRepository(WebClient.builder().baseUrl(source.getUrl() + "/api/deposit").filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(oauth)).build())); +// ClientRegistration clientRegistration = ClientRegistration +// .withRegistrationId(source.getClientId()) +// .clientId(source.getClientId()) +// .clientSecret(source.getClientSecret()) +// .scope(source.getScope()) +// .issuerUri(source.getIssuerUrl()) +// .authorizationGrantType(AuthorizationGrantType.JWT_BEARER) +// .build(); +// ReactiveClientRegistrationRepository clientRegistrationRepository = new InMemoryReactiveClientRegistrationRepository(clientRegistration); +// ReactiveOAuth2AuthorizedClientService clientService = new InMemoryReactiveOAuth2AuthorizedClientService(clientRegistrationRepository); +// AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager authorizedClientManager = new AuthorizedClientServiceReactiveOAuth2AuthorizedClientManager(clientRegistrationRepository, clientService); +// ServerOAuth2AuthorizedClientExchangeFilterFunction oauth = new ServerOAuth2AuthorizedClientExchangeFilterFunction(authorizedClientManager); +// clients.add(new DepositRepository(WebClient.builder().baseUrl(source.getUrl() + "/api/deposit").filters(exchangeFilterFunctions -> exchangeFilterFunctions.add(oauth)).build())); } return clients; } diff --git a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java index 69a36e177..c43857531 100644 --- a/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java +++ b/dmp-backend/core/src/main/java/eu/eudat/model/persist/dmpblueprintdefinition/FieldPersist.java @@ -14,7 +14,8 @@ import java.util.UUID; @JsonTypeInfo( use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, - property = "category") + property = "category", + visible = true) @JsonSubTypes({ @JsonSubTypes.Type(value = SystemFieldPersist.class, name = "0"), @JsonSubTypes.Type(value = ExtraFieldPersist.class, name = "1")