Instead of inferring api domain, add a new env var

Author: cpsievert

R/figure.R

@@ -18,7 +18,7 @@
 get_figure <- function(username, id) {
   if (missing(username)) username <- verify("username")
   if (missing(id)) stop("Please provide a figure id number")
-  base_url <- file.path(get_domain(), "apigetfile", username, id)
+  base_url <- file.path("https://plot.ly/apigetfile", username, id)
   resp <- httr::GET(base_url, plotly_headers(), httr::config(ssl_verifypeer=FALSE))
   process(struct(resp, "figure"))
 }

R/plotly_IMAGE.R

@@ -32,7 +32,7 @@ plotly_IMAGE <- function(x, width = 1000, height = 500, format = "png",
     scale = scale,
     encoded = FALSE
   )
-  base_url <- paste0(get_domain("v2"), "images")
+  base_url <- file.path(get_domain("api"), "v2", "images")
   resp <- httr::POST(base_url, plotly_headers("v2"), body = to_JSON(bod), 
                      if (!missing(out_file)) write_disk(out_file, overwrite = TRUE), 
                      ...)

R/plotly_POST.R

@@ -71,13 +71,14 @@ plotly_POST <- function(x, filename, fileopt = "new",
     args = to_JSON(x$data),
     kwargs = to_JSON(x[get_kwargs()])
   )
-  base_url <- file.path(get_domain(), "clientresp")
+  base_url <- "https://plot.ly/clientresp"
   resp <- httr::POST(base_url, body = bod)
   con <- process(struct(resp, "clientresp"))
   if (sharing[1] == "hidden") {
     bits <- strsplit(con$url, "/")[[1]]
     plot_id <- bits[length(bits)]
-    url <- file.path(get_domain("v2"), "files", paste0(verify("username"), ":", plot_id))
+    url <- file.path(get_domain("api"), "v2", "files", 
+                     paste0(verify("username"), ":", plot_id))
     bod <- list(share_key_enabled = TRUE)
     con2 <- httr::PATCH(url, plotly_headers("v2"), body = bod, encode = "json")
     con$url <- paste0(con$url, "?share_key=", content(con2)$share_key)

R/signup.R

@@ -43,7 +43,7 @@ signup <- function(username, email, save = TRUE) {
     platform = "R",
     version = as.character(packageVersion("plotly"))
   )
-  base_url <- file.path(get_domain(), "apimkacct")
+  base_url <- "https://plot.ly/apimkacct"
   resp <- httr::POST(base_url, body = bod)
   con <- process(struct(resp, "signup"))
   if (save) {

R/utils.R

@@ -183,15 +183,12 @@ struct <- function(x, y, ...) {
 } 
 
 # TODO: what are some other common configuration options we want to support??
-get_domain <- function(type = "main") {
-  dom <- Sys.getenv("plotly_domain", "https://plot.ly")
-  if (type == "v2") {
-    u <- httr::parse_url(dom)
-    u$hostname <- paste0("api.", u$hostname)
-    u$path <- "v2"
-    dom <- httr::build_url(u)
+get_domain <- function(type = "") {
+  if (type == "api") {
+    Sys.getenv("plotly_api_domain", "https://api.plot.ly")
+  } else {
+    Sys.getenv("plotly_domain", "https://plot.ly")
   }
-  dom
 }
 
 # plotly's special keyword arguments in POST body