ALS-7264: Update postJSON to be flexible with response type

hms-dbmi · Sep 6, 2024 · 9d68bce · 9d68bce
1 parent edd4981
commit 9d68bce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/R/picsure.R b/R/picsure.R
@@ -132,9 +132,9 @@ fetchResources <- function(session, resourceId = FALSE) {
 #' @param body A string of JSON data to post to the service
 #' @param responseDeserializer A function to deserialize the data returned. Default is deserializeJSON
 #' @return a string containing the response from the request, or the result of responseDeserializer, if provided
-postJSON <- function(session, path, body, responseDeserializer = deserializeJSON) {
+postJSON <- function(session, path, body, responseDeserializer = deserializeJSON, acceptContentType = httr::accept_json()) {
   full_url = paste(session$url_picsure, path, sep="")
-  response = httr::POST(full_url, body=body, httr::content_type_json(), httr::accept_json(), httr::add_headers(Authorization=paste('Bearer',session$token)))
+  response = httr::POST(full_url, body=body, httr::content_type_json(), acceptContentType, httr::add_headers(Authorization=paste('Bearer',session$token)))
 
   if (response$status_code != 200) {
     if (response$status_code == 401) {

diff --git a/R/query.R b/R/query.R
@@ -297,7 +297,7 @@ runQuery <- function(query, resultType = NULL) {
 #' @export
 getResultByQueryUUID <- function(session, queryUUID) {
   queryJSON = "{}"
-  response = postJSON(session, paste("query/", queryUUID, "/result", sep=""), queryJSON, responseDeserializer = NULL)
+  response = postJSON(session, paste("query/", queryUUID, "/result", sep=""), queryJSON, responseDeserializer = NULL, acceptContentType = httr::accept("application/octet-stream"))
   return(read.csv(text=response, sep=',', check.names=FALSE))
 }
 
@@ -365,7 +365,7 @@ getCount = function(query) {
 
 getResults = function(query) {
   queryJSON = generateQueryJSON(query, expectedResultType = 'DATAFRAME')
-  response = postJSON(query$session, "query/sync/", queryJSON, responseDeserializer = NULL)
+  response = postJSON(query$session, "query/sync/", queryJSON, responseDeserializer = NULL, acceptContentType = httr::accept("application/octet-stream"))
   return(read.csv(text=response, sep=',', check.names=FALSE))
 }