From b9c9cfee6fb304e0b173bf900f496f5d0016060e Mon Sep 17 00:00:00 2001
From: unknown <adrwit95@gmail.com>
Date: Sun, 1 Dec 2019 13:03:18 +0100
Subject: [PATCH] usos login fix - deploy

---
 .../studycaverestservice/PropertiesLoader.java      | 13 +++++++++++++
 .../usos/AuthorizationService.java                  |  3 ++-
 BackEnd/src/main/resources/application.properties   |  5 ++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/PropertiesLoader.java b/BackEnd/src/main/java/studycave/studycaverestservice/PropertiesLoader.java
index b6c1ec6..097cd38 100644
--- a/BackEnd/src/main/java/studycave/studycaverestservice/PropertiesLoader.java
+++ b/BackEnd/src/main/java/studycave/studycaverestservice/PropertiesLoader.java
@@ -22,6 +22,12 @@ public class PropertiesLoader {
     @Value("${application.secret}")
     private String secret;
 
+    @Value("${server.address}")
+    private String serverAddress;
+
+    @Value("${server.port}")
+    private String serverPort;
+
     public void initUsosInstance() {
         RestAssured.baseURI = usosBaseURI;
         RestAssured.basePath = usosBasePath;
@@ -40,4 +46,11 @@ public class PropertiesLoader {
         return secret;
     }
 
+    public String getServerAddress() {
+        return serverAddress;
+    }
+
+    public String getServerPort() {
+        return serverPort;
+    }
 }
diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java
index a5540be..ebbab85 100644
--- a/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java
+++ b/BackEnd/src/main/java/studycave/studycaverestservice/usos/AuthorizationService.java
@@ -49,6 +49,7 @@ public class AuthorizationService {
     private static final String ENC = "UTF-8";
     private static final String HMAC_SHA1 = "HmacSHA1";
     private static Base64 base64 = new Base64();
+
     @Autowired
     private PropertiesLoader propertiesLoader;
 
@@ -201,7 +202,7 @@ public class AuthorizationService {
 
     private String getAuthToken(String username, String password) throws IOException {
         HttpClient httpClient = HttpClientBuilder.create().build();
-        HttpPost request = new HttpPost("http://localhost:8080/login");
+        HttpPost request = new HttpPost("http://" + propertiesLoader.getServerAddress() + ":" + propertiesLoader.getServerPort()+ "/login");
         StringEntity params = new StringEntity("{\"username\":\"" + username + "\",\"password\":\"" + password + "\"} ");
         request.addHeader("content-type", "application/json");
         request.setEntity(params);
diff --git a/BackEnd/src/main/resources/application.properties b/BackEnd/src/main/resources/application.properties
index b4690ea..bcf377c 100644
--- a/BackEnd/src/main/resources/application.properties
+++ b/BackEnd/src/main/resources/application.properties
@@ -6,7 +6,10 @@ spring.datasource.password=L0XIcnvtWpYEnr4w
 spring.servlet.multipart.max-file-size=500KB
 spring.servlet.multipart.max-request-size=500KB
 
-#server.address=51.75.30.146
+server.address=51.75.30.146
+server.port=8080
+
+#server.address=localhost
 #server.port=8080
 
 #usos instance to use