Skip to content

Take into account the header x-gx-filename at gxobject upload service. #712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 18, 2023
Merged

Take into account the header x-gx-filename at gxobject upload service. #712

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
873b4aa
Take into account the header x-gx-filename at gxobject upload service.
iroqueta Apr 25, 2023
bffd500
Merge branch 'master' into Consider-x-gx-filename
iroqueta May 15, 2023
393a352
Merge branch 'master' into Consider-x-gx-filename
iroqueta May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions java/src/main/java/com/genexus/webpanels/GXObjectUploadServices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import json.org.json.JSONArray;
import json.org.json.JSONObject;
import com.genexus.ws.rs.core.*;
import org.apache.commons.io.FilenameUtils;


public class GXObjectUploadServices extends GXWebObjectStub
Expand Down Expand Up @@ -74,8 +75,16 @@ protected void doExecute(HttpContext context) throws Exception
{
keyId = HttpUtils.getUploadFileKey();
String contentType = context.getHeader("Content-Type");
ext = getExtension(contentType);
fileName = com.genexus.PrivateUtilities.getTempFileName("tmp");
String gxFileName = context.getHeader("x-gx-filename");
String fName = "";
if (!gxFileName.isEmpty()) {
ext = FilenameUtils.getExtension(gxFileName);
fName = FilenameUtils.getBaseName(gxFileName);
}
else {
ext = getExtension(contentType);
}
fileName = com.genexus.PrivateUtilities.getTempFileName("", fName, "tmp");
String filePath = fileDirPath + fileName;
fileName = fileName.replaceAll(".tmp", "." + ext);
FileItem fileItem = new FileItem(filePath, false, "", context.getRequest().getInputStream().getInputStream());
Expand Down