modify plotly_domain env var when using API v2, fixes #441

Author: cpsievert

R/plotly_POST.R

@@ -77,7 +77,7 @@ plotly_POST <- function(x, filename, fileopt = "new",
   if (sharing[1] == "hidden") {
     bits <- strsplit(con$url, "/")[[1]]
     plot_id <- bits[length(bits)]
-    url <- paste0(get_domain("v2"), "files/", verify("username"), ":", plot_id)
+    url <- file.path(get_domain("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/utils.R

@@ -184,13 +184,14 @@ struct <- function(x, y, ...) {
 
 # TODO: what are some other common configuration options we want to support??
 get_domain <- function(type = "main") {
-  if (type == "stream") {
-    Sys.getenv("plotly_streaming_domain", "http://stream.plot.ly")
-  } else if (type == "v2") {
-    Sys.getenv("plotly_domain", "https://api.plot.ly/v2/")
-  } else {
-    Sys.getenv("plotly_domain", "https://plot.ly")
+  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)
   }
+  dom
 }
 
 # plotly's special keyword arguments in POST body