Skip to content
Snippets Groups Projects
Commit 734b67dd authored by ThanKarab's avatar ThanKarab
Browse files

Cleanup.

parent f339412d
No related branches found
No related tags found
1 merge request!8Dev merge middleware
package eu.hbp.mip.controllers;
import static org.springframework.http.MediaType.TEXT_PLAIN_VALUE;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.http.ResponseEntity;
import org.springframework.http.HttpStatus;
import eu.hbp.mip.model.User;
import eu.hbp.mip.model.UserInfo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import eu.hbp.mip.utils.JWTUtil;
import eu.hbp.mip.utils.UserActionLogging;
@RestController
@RequestMapping(value = "/jwt", produces = { TEXT_PLAIN_VALUE })
@Api(value = "/jwt", description = "the jwt API")
public class JWTApi {
@Autowired
private UserInfo userInfo;
@Value("#{'${services.workflows.jwtSecret}'}")
private String jwtSecret;
@ApiOperation(value = "Create a JSON Web Token", response = String.class)
@RequestMapping(method = RequestMethod.POST)
public ResponseEntity<String> createJWT() {
UserActionLogging.LogAction("Create a JSON Web Token", "");
User user = userInfo.getUser();
String token = JWTUtil.getJWT(jwtSecret, user.getEmail());
return ResponseEntity.status(HttpStatus.CREATED).body(token);
}
}
...@@ -48,9 +48,9 @@ public class MiningApi { ...@@ -48,9 +48,9 @@ public class MiningApi {
@Value("#{'${services.exareme.queryExaremeUrl:http://localhost:9090/mining/query}'}") @Value("#{'${services.exareme.queryExaremeUrl:http://localhost:9090/mining/query}'}")
public String queryExaremeUrl; public String queryExaremeUrl;
@ApiOperation(value = "Create an histogram on Exareme", response = String.class) @ApiOperation(value = "Create a histogram on Exareme", response = String.class)
@RequestMapping(value = "/exareme", method = RequestMethod.POST) @RequestMapping(value = "/histograms", method = RequestMethod.POST)
public ResponseEntity runExaremeMining(@RequestBody List<HashMap<String, String>> queryList) { public ResponseEntity runExaremeHistograms(@RequestBody List<HashMap<String, String>> queryList) {
UserActionLogging.LogAction("Run an histogram", ""); UserActionLogging.LogAction("Run an histogram", "");
String query = gson.toJson(queryList); String query = gson.toJson(queryList);
...@@ -66,8 +66,8 @@ public class MiningApi { ...@@ -66,8 +66,8 @@ public class MiningApi {
} }
} }
@ApiOperation(value = "Create an descriptive statistic on Exareme", response = String.class) @ApiOperation(value = "Create a descriptive statistic on Exareme", response = String.class)
@RequestMapping(value = "/exareme-stats", method = RequestMethod.POST) @RequestMapping(value = "/descriptive_stats", method = RequestMethod.POST)
public ResponseEntity runExaremeDescriptiveStats(@RequestBody List<HashMap<String, String>> queryList) { public ResponseEntity runExaremeDescriptiveStats(@RequestBody List<HashMap<String, String>> queryList) {
UserActionLogging.LogAction("Run descriptive stats", ""); UserActionLogging.LogAction("Run descriptive stats", "");
......
package eu.hbp.mip.helpers;
import org.springframework.security.core.userdetails.UserDetails;
public class LogHelper {
public static String logUser(UserDetails userDetails){
return ("User(subject)->User(" + userDetails.getUsername() + ") : ");
}
}
\ No newline at end of file
package eu.hbp.mip.utils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.auth0.jwt.algorithms.Algorithm;
import com.auth0.jwt.JWT;
public class JWTUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(JWT.class);
public static String getJWT(String secret, String subject) {
LOGGER.info("getJWT");
Algorithm algorithm = Algorithm.HMAC512(secret);
String token = JWT.create().withIssuer("mip.humanbrainproject.eu").withSubject(subject).sign(algorithm);
return token;
}
}
\ No newline at end of file
...@@ -17,7 +17,7 @@ public class UserActionLogging { ...@@ -17,7 +17,7 @@ public class UserActionLogging {
+ " info: " + actionIdInfo); + " info: " + actionIdInfo);
} }
// Used from Threads because LogAction won't wor. // Used from Threads because LogAction won't work.
public static void LogThreadAction(String actionName, String actionIdInfo) public static void LogThreadAction(String actionName, String actionIdInfo)
{ {
LOGGER.info( "Thread -->" + actionName + " info: " + actionIdInfo); LOGGER.info( "Thread -->" + actionName + " info: " + actionIdInfo);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment