From 4949e6976a033e6dbb58e5d2c7a8dd6c36548bfe Mon Sep 17 00:00:00 2001
From: Manuel Spuhler <manuel.spuhler@chuv.ch>
Date: Fri, 11 Oct 2019 15:34:09 +0200
Subject: [PATCH] Moved JWT outside http thread
---
.../eu/hbp/mip/controllers/ExperimentApi.java | 25 ++++++++++---------
1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
index cfe23806b..f48d4d8e2 100644
--- a/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ExperimentApi.java
@@ -113,24 +113,25 @@ public class ExperimentApi {
String algoCode = expQuery.getAlgorithms().get(0).getCode();
List<AlgorithmParam> params = expQuery.getAlgorithms().get(0).getParameters();
- new Thread(() -> {
- HashMap<String, String> queryMap = new HashMap<String, String>();
- if (params != null) {
- for (AlgorithmParam p : params) {
- queryMap.put(p.getName(), p.getValue());
- }
+ User user = userInfo.getUser();
+ String token = JWTUtil.getJWT(jwtSecret, user.getEmail());
+
+ HashMap<String, String> queryMap = new HashMap<String, String>();
+
+ if (params != null) {
+ for (AlgorithmParam p : params) {
+ queryMap.put(p.getName(), p.getValue());
}
+ }
- String query = gson.toJson(queryMap);
- String url = workflowUrl + "/runWorkflow/" + algoCode;
- // Results are stored in the experiment object
+ String query = gson.toJson(queryMap);
+ String url = workflowUrl + "/runWorkflow/" + algoCode;
+ // Results are stored in the experiment object
-
+ new Thread(() -> {
try {
StringBuilder results = new StringBuilder();
- User user = userInfo.getUser();
- String token = JWTUtil.getJWT(jwtSecret, user.getEmail());
int code = HTTPUtil.sendAuthorizedHTTP(url, query, results, "POST", "Bearer " + token);
experiment.setResult("[" + results.toString() + "]");
experiment.setHasError(code >= 400);
--
GitLab