From 91bc3fd4d32dadbb693061aba71f5be8ddec8667 Mon Sep 17 00:00:00 2001 From: Sonia Zorba <sonia.zorba@inaf.it> Date: Sun, 10 Jan 2021 12:10:59 +0100 Subject: [PATCH] Minor changes --- .../inaf/ia2/vospace/ui/controller/NodesController.java | 5 +++++ vospace-ui-backend/src/main/resources/auth.properties | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodesController.java b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodesController.java index 199fbfc..4e2abc5 100644 --- a/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodesController.java +++ b/vospace-ui-backend/src/main/java/it/inaf/ia2/vospace/ui/controller/NodesController.java @@ -3,6 +3,7 @@ package it.inaf.ia2.vospace.ui.controller; import it.inaf.ia2.vospace.ui.client.VOSpaceClient; import it.inaf.ia2.vospace.ui.service.NodesService; import javax.servlet.http.HttpServletRequest; +import net.ivoa.xml.vospace.v2.Protocol; import net.ivoa.xml.vospace.v2.Transfer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -53,6 +54,10 @@ public class NodesController { transfer.setDirection("pullFromVoSpace"); transfer.setTarget("vos://" + authority + path); + Protocol protocol = new Protocol(); + protocol.setUri("ivo://ivoa.net/vospace/core#httpget"); + transfer.getProtocols().add(protocol); + String url = client.getDownloadEndpoints(transfer).get(0).getEndpoint(); HttpHeaders headers = new HttpHeaders(); headers.set("Location", url); diff --git a/vospace-ui-backend/src/main/resources/auth.properties b/vospace-ui-backend/src/main/resources/auth.properties index 93f1c04..621a3ef 100644 --- a/vospace-ui-backend/src/main/resources/auth.properties +++ b/vospace-ui-backend/src/main/resources/auth.properties @@ -1,9 +1,8 @@ -client_id=vospace_local -client_secret=vospace +client_id=@client_id@ +client_secret=@client_secret@ +rap_uri=@rap_uri@ +gms_uri=@gms_uri@ -rap_uri=http://localhost/rap-ia2 - -gms_uri=http://localhost:8082/gms groups_autoload=false store_state_on_login_endpoint=true scope=openid email profile read:rap -- GitLab