diff --git a/build.sh b/build.sh index 48250ac9ff42bbbfcd891812922737e7d5be3606..c9c1ff79102485020f574807b331063512d5e0c4 100755 --- a/build.sh +++ b/build.sh @@ -35,10 +35,10 @@ docker build --build-arg BUILD_DATE=$(date -Iseconds) \ --build-arg VERSION=$VERSION \ --tag "$IMAGE:latest" \ --tag "$IMAGE:$VERSION" \ - --tag jerrypan44/portal_backend:latest \ + --tag jerrypan44/portal-backend:latest \ . -docker push jerrypan44/portal_backend:latest +docker push jerrypan44/portal-backend:latest BUGSNAG_KEY="" eval $(grep -e "^\\s*BUGSNAG_KEY" Dockerfile | tr '\\' ' ') diff --git a/docker/config/application.tmpl b/docker/config/application.tmpl index b3fb351fe665935f850598487b64066c0d3bae27..5f2f72a3ec2a684fb9e7907df0cd65b3b73973bb 100644 --- a/docker/config/application.tmpl +++ b/docker/config/application.tmpl @@ -95,5 +95,6 @@ services: jwtSecret: {{ default .Env.JWT_SECRET "secret" }} workflowAuthorization: {{ default .Env.WORKFLOW_AUTHORIZATION "undefined" }} galaxy: - galaxyUsername: {{ default .Env.GALAXY_USERNAME admin }} - galaxyPassword: {{ default .Env.GALAXY_PASSWORD admin }} + galaxyUsername: {{ default .Env.GALAXY_USERNAME "admin" }} + galaxyPassword: {{ default .Env.GALAXY_PASSWORD "admin" }} + diff --git a/src/main/java/eu/hbp/mip/controllers/RequestsApi.java b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java index 3a06a26fec1ea3b295861342215b2b178a3df33d..777eac0c51ec2ed47f68d485fdbbb48dcb2df5e9 100644 --- a/src/main/java/eu/hbp/mip/controllers/RequestsApi.java +++ b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java @@ -123,10 +123,10 @@ public class RequestsApi { } @Value("#{'${services.galaxy.galaxyUsername:admin}'}") - private boolean galaxyUsername; + private String galaxyUsername; @Value("#{'${services.galaxy.galaxyPassword:admin}'}") - private boolean galaxyPassword; + private String galaxyPassword; /** * Get Galaxy Reverse Proxy basic access token. diff --git a/src/main/java/eu/hbp/mip/utils/JWTUtil.java b/src/main/java/eu/hbp/mip/utils/JWTUtil.java index 1e74841842150aef10778726040b88a53d14d218..48ed615e97b27840a4d3130db20ef8153dca4114 100644 --- a/src/main/java/eu/hbp/mip/utils/JWTUtil.java +++ b/src/main/java/eu/hbp/mip/utils/JWTUtil.java @@ -2,18 +2,19 @@ package eu.hbp.mip.utils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.auth0.jwt.algorithms.Algorithm; -import com.auth0.jwt.JWT; +//import com.auth0.jwt.algorithms.Algorithm; +//import com.auth0.jwt.JWT; public class JWTUtil { - private static final Logger LOGGER = LoggerFactory.getLogger(JWT.class); + //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); + //LOGGER.info("getJWT"); +// Algorithm algorithm = Algorithm.HMAC512(secret); +// String token = JWT.create().withIssuer("mip.humanbrainproject.eu").withSubject(subject).sign(algorithm); - return token; +// return token; + return ""; } } \ No newline at end of file