Skip to content

Ensure that we always return HTTPS links. Fixes #455 #458

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
cpsievert merged 2 commits into from
Feb 11, 2016
Merged

Ensure that we always return HTTPS links. Fixes #455 #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7001361
Ensure that we always return HTTPS links. Fixes #455
cpsievert Feb 9, 2016
24ecc98
bump version; update news
cpsievert Feb 11, 2016
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
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: plotly
Title: Create Interactive Web Graphics via Plotly's JavaScript Graphing Library
Version: 2.4.2
Version: 2.4.3
Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"),
email = "cpsievert1@gmail.com"),
person("Chris", "Parmer", role = c("aut", "cph"),
Expand Down
4 changes: 4 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.4.3 -- 11 Feb 2015

Ensure that we always return HTTPS links. Fixes #455

2.4.2 -- 9 Feb 2015

Fix for on-premise domain configuration.
Expand Down
4 changes: 4 additions & 0 deletions R/process.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ process <- function(resp) {
process.clientresp <- function(resp) {
httr::stop_for_status(resp)
con <- from_JSON(httr::content(resp, as = "text"))
# make sure that we always return a HTTPS link
con$url <- sub("^http[s]?:", "https:", con$url)
if (nchar(con$error) > 0) stop(con$error, call. = FALSE)
if (nchar(con$warning) > 0) warning(con$warning, call. = FALSE)
if (nchar(con$message) > 0) message(con$message, call. = FALSE)
Expand All @@ -27,6 +29,8 @@ process.figure <- function(resp) {
con <- from_JSON(content(resp, as = "text"))
fig <- con$payload$figure
fig$url <- sub("apigetfile/", "~", resp$url)
# make sure that we always return a HTTPS link
con$url <- sub("^http[s]?:", "https:", con$url)
fig <- add_boxed(fig)
fig$data[[1]]$inherit <- FALSE
# any reasonable way to return a data frame?
Expand Down