X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ec836ed648758619ed35153e52016079adce99b7..9bb169138470dbb176af7e891d6da2089950354b:/sdk/R/R/HttpRequest.R

diff --git a/sdk/R/R/HttpRequest.R b/sdk/R/R/HttpRequest.R
index a1e1f61275..149ec0db7a 100644
--- a/sdk/R/R/HttpRequest.R
+++ b/sdk/R/R/HttpRequest.R
@@ -1,3 +1,5 @@
+source("./R/util.R")
+
 HttpRequest <- R6::R6Class(
 
     "HttrRequest",
@@ -5,145 +7,54 @@ HttpRequest <- R6::R6Class(
     public = list(
 
         validContentTypes = NULL,
+        validVerbs = NULL,
 
         initialize = function() 
         {
             self$validContentTypes <- c("text", "raw")
+            self$validVerbs <- c("GET", "POST", "PUT", "DELETE", "PROPFIND", "MOVE")
         },
 
-        GET = function(url, headers = NULL, queryFilters = NULL, limit = NULL, offset = NULL)
-        {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
-
-            serverResponse <- httr::GET(url = url, config = headers)
-        },
-
-        PUT = function(url, headers = NULL, body = NULL,
-                       queryFilters = NULL, limit = 100, offset = 0)
+        exec = function(verb, url, headers = NULL, body = NULL, queryParams = NULL,
+                        retryTimes = 0)
         {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
+            if(!(verb %in% self$validVerbs))
+                stop("Http verb is not valid.")
 
-            serverResponse <- httr::PUT(url = url, config = headers, body = body)
-        },
+            urlQuery <- self$createQuery(queryParams)
+            url      <- paste0(url, urlQuery)
 
-        POST = function(url, headers = NULL, body = NULL,
-                        queryFilters = NULL, limit = 100, offset = 0)
-        {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
+            config <- httr::add_headers(unlist(headers))
+            if(toString(Sys.getenv("ARVADOS_API_HOST_INSECURE") == "TRUE"))
+               config$options = list(ssl_verifypeer = FALSE)
 
-            serverResponse <- httr::POST(url = url, config = headers, body = body)
+            print(config)
+            # times = 1 regular call + numberOfRetries
+            response <- httr::RETRY(verb, url = url, body = body,
+                                    config = config, times = retryTimes + 1)
         },
 
-        DELETE = function(url, headers = NULL, body = NULL,
-                          queryFilters = NULL, limit = NULL, offset = NULL)
-        {
-            headers <- httr::add_headers(unlist(headers))
-            query <- private$createQuery(queryFilters, limit, offset)
-            url <- paste0(url, query)
-
-            serverResponse <- httr::DELETE(url = url, config = headers)
-        },
-
-        PROPFIND = function(url, headers = NULL)
-        {
-            h <- curl::new_handle()
-            curl::handle_setopt(h, customrequest = "PROPFIND")
-            curl::handle_setheaders(h, .list = headers)
-
-            propfindResponse <- curl::curl_fetch_memory(url, h)
-        },
-
-        MOVE = function(url, headers = NULL)
-        {
-            h <- curl::new_handle()
-            curl::handle_setopt(h, customrequest = "MOVE")
-            curl::handle_setheaders(h, .list = headers)
-
-            propfindResponse <- curl::curl_fetch_memory(url, h)
-        }
-    ),
-
-    private = list(
-
-        createQuery = function(filters, limit, offset)
+        createQuery = function(queryParams)
         {
-            finalQuery <- NULL
+            queryParams <- Filter(Negate(is.null), queryParams)
 
-            if(!is.null(filters))
+            query <- sapply(queryParams, function(param)
             {
-                filters <- sapply(filters, function(filter)
-                {
-                    if(length(filter) != 3)
-                        stop("Filter list must have exactly 3 elements.")
-
-                    attributeAndOperator = filter[c(1, 2)]
-                    filterList = filter[[3]]
-                    filterListIsPrimitive = TRUE
-                    if(length(filterList) > 1)
-                        filterListIsPrimitive = FALSE
-
-                    attributeAndOperator <- sapply(attributeAndOperator, function(component) {
-                        component <- paste0("\"", component, "\"")
-                    })
-
-                    filterList <- sapply(unlist(filterList), function(filter) {
-                        filter <- paste0("\"", filter, "\"")
-                    })
-
-                    filterList <- paste(filterList, collapse = ",+")
-
-                    if(!filterListIsPrimitive)
-                        filterList <- paste0("[", filterList, "]")
-
-                    filter <- c(attributeAndOperator, filterList)
-
-                    queryParameter <- paste(filter, collapse = ",+")
-                    queryParameter <- paste0("[", queryParameter, "]")
-        
-                })
-
-                filters <- paste(filters, collapse = ",+")
-                filters <- paste0("[", filters, "]")
+                if(is.list(param) || length(param) > 1)
+                    param <- RListToPythonList(param, ",")
 
-                encodedQuery <- URLencode(filters, reserved = T, repeated = T)
+                URLencode(as.character(param), reserved = T, repeated = T)
 
-                encodedQuery <- stringr::str_replace_all(encodedQuery, "%2B", "+")
+            }, USE.NAMES = TRUE)
 
-                finalQuery <- c(finalQuery, paste0("filters=", encodedQuery))
-
-                finalQuery
-            }
-
-            if(!is.null(limit))
+            if(length(query) > 0)
             {
-                if(!is.numeric(limit))
-                    stop("Limit must be a numeric type.")
-                
-                finalQuery <- c(finalQuery, paste0("limit=", limit))
-            }
+                query <- paste0(names(query), "=", query, collapse = "&")
 
-            if(!is.null(offset))
-            {
-                if(!is.numeric(offset))
-                    stop("Offset must be a numeric type.")
-                
-                finalQuery <- c(finalQuery, paste0("offset=", offset))
+                return(paste0("/?", query))
             }
 
-            if(length(finalQuery) > 1)
-            {
-                finalQuery <- paste0(finalQuery, collapse = "&")
-            }
-
-            finalQuery <- paste0("/?", finalQuery)
-
-            finalQuery
+            return("")
         }
     ),