From 44dc17c6c1a0c709d911e459628358709beee406 Mon Sep 17 00:00:00 2001
From: "argiro.kokogiannaki"
 <argiro.kokogiannaki@d315682c-612b-4755-9ff5-7f18f6832af3>
Date: Fri, 21 Jun 2019 11:11:50 +0000
Subject: [PATCH] UploadService:

	add properties file
	make it work for beta
	add new property local path


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@56159 d315682c-612b-4755-9ff5-7f18f6832af3
---
 services/upload/beta-properties.file | 5 +++++
 services/upload/prepareDeploy.sh     | 4 ++++
 services/upload/properties.file      | 3 ++-
 services/upload/uploadService.js     | 4 ++--
 4 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 services/upload/beta-properties.file
 create mode 100755 services/upload/prepareDeploy.sh

diff --git a/services/upload/beta-properties.file b/services/upload/beta-properties.file
new file mode 100644
index 00000000..9804899e
--- /dev/null
+++ b/services/upload/beta-properties.file
@@ -0,0 +1,5 @@
+userInfoUrl = https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=
+originServer = .openaire.eu
+post.allowed = /upload,/upload/
+ssl = true
+localPath = false
diff --git a/services/upload/prepareDeploy.sh b/services/upload/prepareDeploy.sh
new file mode 100755
index 00000000..fd986e30
--- /dev/null
+++ b/services/upload/prepareDeploy.sh
@@ -0,0 +1,4 @@
+#mv beta-properties.file  properties.file
+
+#rm -rf node_modules/ run.sh uploads/
+
diff --git a/services/upload/properties.file b/services/upload/properties.file
index b7d0ba44..d4709831 100644
--- a/services/upload/properties.file
+++ b/services/upload/properties.file
@@ -1,4 +1,5 @@
 userInfoUrl = http://scoobydoo.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=
 originServer = .di.uoa.gr
-post.allowed = /upload
+post.allowed = /upload,/upload/
 ssl = false
+localPath = true
diff --git a/services/upload/uploadService.js b/services/upload/uploadService.js
index 8bf44e2c..ca02e13c 100644
--- a/services/upload/uploadService.js
+++ b/services/upload/uploadService.js
@@ -19,6 +19,7 @@ if(properties.get('ssl')) {
 var auth = properties.get('userInfoUrl');
 var originServer = properties.get('originServer');
 var allowPostRequests = properties.get('post.allowed').split(',');
+var localPath = properties.get('localPath');
 
 var storage = multer.diskStorage({
     destination: function (req, file, cb) {
@@ -67,7 +68,7 @@ app.use(function (req, res, next) {
 });
 
 app.post("/upload", upload.array("uploads[]", 12), function (req, res) {
-    var filepath = "./" + req.files[0].path;
+    var filepath = (localPath?".":__dirname)+"/" + req.files[0].path;
     if (req.files[0].mimetype !== 'text/csv') {
         console.error("No proper file type");
         res.status(500).send(getResponse(500, "No proper file type"));
@@ -233,4 +234,3 @@ function hasValidOrigin(origin) {
         return false;
     }
 }
-