diff --git a/build.sh b/build.sh index 998db65551e95df3684d84995e3455e0bea6cf8a..9f9ce7941897e9bf07c7190e18803a2d4e1aaac8 100755 --- a/build.sh +++ b/build.sh @@ -35,8 +35,11 @@ docker build --build-arg BUILD_DATE=$(date -Iseconds) \ --build-arg VERSION=$VERSION \ --tag "$IMAGE:latest" \ --tag "$IMAGE:$VERSION" \ + --tag kkech/portal_backend:latest . +docker push kkech/portal_backend:latest + BUGSNAG_KEY="" eval $(grep -e "^\\s*BUGSNAG_KEY" Dockerfile | tr '\\' ' ') diff --git a/src/main/java/eu/hbp/mip/controllers/JWTApi.java b/src/main/java/eu/hbp/mip/controllers/JWTApi.java index 4118a8c54464c575fa1c4f187dc7ca050e1ce564..a3d939bbba3eb5c5a8666497be9f5c6d6414e446 100644 --- a/src/main/java/eu/hbp/mip/controllers/JWTApi.java +++ b/src/main/java/eu/hbp/mip/controllers/JWTApi.java @@ -38,4 +38,4 @@ public class JWTApi { return ResponseEntity.status(HttpStatus.CREATED).body(token); } -} \ No newline at end of file +} diff --git a/src/main/java/eu/hbp/mip/controllers/RequestsApi.java b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java index 8c3537527a07c1313370eed024118b1c42a1365a..84a869730d392eb24db6778f7089bf1d7d0d25c1 100644 --- a/src/main/java/eu/hbp/mip/controllers/RequestsApi.java +++ b/src/main/java/eu/hbp/mip/controllers/RequestsApi.java @@ -10,18 +10,18 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import eu.hbp.mip.model.Dataset; import eu.hbp.mip.model.Query; +import eu.hbp.mip.model.StringDtoResponse; import eu.hbp.mip.utils.DataUtil; import io.swagger.annotations.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Base64; import java.util.Date; import java.util.LinkedList; import java.util.List; @@ -121,4 +121,19 @@ public class RequestsApi { return prefix + memId; } + /** + * Get Galaxy Reverse Proxy basic access token. + * + * @return Return a @{@link ResponseEntity} with the token. + */ + @RequestMapping(method = RequestMethod.GET, produces = "application/json") + @ResponseStatus(value = HttpStatus.OK) + public ResponseEntity getGalaxyBasicAccessToken(){ + String username = "admin"; + String password = "admin"; + + String stringEncoded = Base64.getEncoder().encodeToString((username + ":" + password).getBytes()); + return ResponseEntity.ok(new StringDtoResponse(stringEncoded)); + } + } diff --git a/src/main/java/eu/hbp/mip/controllers/SecurityApi.java b/src/main/java/eu/hbp/mip/controllers/SecurityApi.java index 6fcb4c400d804ad4652c4f33f6da699a84a10c5c..1902f84532eb79d75a900544ef2ef1ce8ec8a074 100644 --- a/src/main/java/eu/hbp/mip/controllers/SecurityApi.java +++ b/src/main/java/eu/hbp/mip/controllers/SecurityApi.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.gson.Gson; import eu.hbp.mip.configuration.SecurityConfiguration; +import eu.hbp.mip.model.StringDtoResponse; import eu.hbp.mip.model.User; import eu.hbp.mip.model.UserInfo; import eu.hbp.mip.repositories.UserRepository; @@ -14,10 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletResponse; @@ -25,6 +23,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.security.Principal; +import java.util.Base64; @RestController public class SecurityApi { diff --git a/src/main/java/eu/hbp/mip/model/StringDtoResponse.java b/src/main/java/eu/hbp/mip/model/StringDtoResponse.java new file mode 100644 index 0000000000000000000000000000000000000000..272174d69049155915f0c78476912e882bae2b74 --- /dev/null +++ b/src/main/java/eu/hbp/mip/model/StringDtoResponse.java @@ -0,0 +1,21 @@ +package eu.hbp.mip.model; + +public class StringDtoResponse { + + private String response; + + public StringDtoResponse() { + } + + public StringDtoResponse(String response) { + this.response = response; + } + + public String getResponse() { + return response; + } + + public void setResponse(String response) { + this.response = response; + } +}