Commit 74a6e629 by Daniel Bawag

Revert "Merge remote-tracking branch 'origin/feature-wg-134' into feature-latest-sqa-ticket"

This reverts commit 56274544
parent 56274544
......@@ -62,8 +62,3 @@ var REASON_LIST = "Reason1,Reason2,Reason3,Reason4"
//KEYCLOAK CONFIG
const REDIRECT_URL = 'http://auth-server/auth/realms/GFS/protocol/openid-connect/logout?redirect_uri=encodedRedirectUri';
//Temporary variables for dev
var LOCAL_DOMAIN = "http://localhost:8080"
var LOCAL_FETCH_URL = LOCAL_DOMAIN + "/WebGde/svc/gfs-rest/fetch-local"
var LOCAL_FETCH_TEST_URL = "http://localhost:8080/Sample_API/testservice/file"
......@@ -172,21 +172,6 @@ async function accessFile() {
if (img != null ? img.startsWith("http") : false) {
response = await fetch(img);
gfsFileName = getGfsFileName(response.headers.get("content-disposition"));
} else if (img != null ? img.startsWith("file") : false){
console.log('file');
const payload = {
dir: img
};
response = await fetch(`${GFS_URL}/fetch-local`, {
method: 'POST',
headers: {
'Content-Type': 'application/json'
},
body: JSON.stringify(payload)
})
gfsFileName = getGfsFileName(response.headers.get("content-disposition"));
} else {
let formData = new FormData();
formData.append("data", JSON.stringify({
......
package com.svi.webgde.restservice.object;
public class Request {
private String dir;
public String getDir() {
return dir;
}
public void setDir(String dir) {
this.dir = dir;
}
}
......@@ -32,7 +32,6 @@ import org.json.simple.JSONArray;
import com.opencsv.CSVReader;
import com.opencsv.CSVWriter;
import com.svi.template.restservice.globals.AppConfig;
import com.svi.training.services.Request;
import com.svi.webgde.restservice.object.XMLContents;
import com.svi.webgde.restservice.utils.XMLUtil;
......@@ -247,9 +246,9 @@ public class GDEWebServices {
try {
File file = new File(xml.getOutputDir());
if (file.exists()) {
if(file.exists()) {
XMLUtil.updateExceptionRmrk(xml);
} else {
}else {
XMLUtil.generateXML(xml);
}
......@@ -261,23 +260,5 @@ public class GDEWebServices {
return Response.ok("Success").build();
}
@POST
@Path("/fetch-local")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_OCTET_STREAM)
public Response getFile(Request request) {
// extract file path from file:// URL format
String filePath = request.getDir().substring("file://".length());
// read file from local file system
File file = new File(filePath);
if (!file.exists()) {
return Response.status(Response.Status.NOT_FOUND).build();
}
// return file contents in blob format with filename in content-disposition header
ResponseBuilder response = Response.ok(file);
response.header("content-disposition", "attachment; filename = " + file.getName());
return response.build();
}
}
Markdown is supported
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