fix: clean url to remove duplicate slashes

obiba · Sep 18, 2024 · 4389fa8 · 4389fa8
1 parent 0561afd
commit 4389fa8
Show file tree

Hide file tree

Showing 132 changed files with 338 additions and 324 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -48,6 +48,6 @@ URL: https://github.com/obiba/opalr/,
     https://journals.plos.org/ploscompbiol/article?id=10.1371/journal.pcbi.1008880,
     https://www.datashield.org/
 BugReports: https://github.com/obiba/opalr/issues/
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 Encoding: UTF-8
diff --git a/R/opal.R b/R/opal.R
@@ -318,7 +318,15 @@ opal.delete <- function(opal, ..., query = list(), callback = NULL) {
 #' @import utils
 #' @keywords internal
 .url <- function(opal, ...) {
-  utils::URLencode(paste(opal$url, "ws", paste(c(...), collapse = "/"), sep = "/"))
+  parts <- c(...)
+  parts <- parts[parts != ""]
+  .cleanUrl(utils::URLencode(paste(opal$url, "ws", paste(parts, collapse = "/"), sep = "/")))
+}
+
+# Function to replace duplicated slashes but preserve '://'
+.cleanUrl <- function(url) {
+  # Replace duplicated slashes only after the protocol (://)
+  gsub("(?<!:)//+", "/", url, perl = TRUE)
 }
 
 #' Constructs the value for the Authorization header
@@ -598,7 +606,7 @@ opal.delete <- function(opal, ..., query = list(), callback = NULL) {
   opal$uprofile <- .handleResponse(opal, r)
   opal$username <- opal$uprofile$principal
 
-  if (isTRUE(o$uprofile$otpRequired)) {
+  if (isTRUE(opal$uprofile$otpRequired)) {
     warning("Enabling 2FA is required, connect to Opal web page to set up your secret.", call. = FALSE)
   }
 

diff --git a/man/dsadmin.get_method.Rd b/man/dsadmin.get_method.Rd
diff --git a/man/dsadmin.get_methods.Rd b/man/dsadmin.get_methods.Rd
diff --git a/man/dsadmin.get_options.Rd b/man/dsadmin.get_options.Rd
diff --git a/man/dsadmin.install_github_package.Rd b/man/dsadmin.install_github_package.Rd
diff --git a/man/dsadmin.install_local_package.Rd b/man/dsadmin.install_local_package.Rd
diff --git a/man/dsadmin.install_package.Rd b/man/dsadmin.install_package.Rd
diff --git a/man/dsadmin.installed_package.Rd b/man/dsadmin.installed_package.Rd
diff --git a/man/dsadmin.package_description.Rd b/man/dsadmin.package_description.Rd
diff --git a/man/dsadmin.package_descriptions.Rd b/man/dsadmin.package_descriptions.Rd
diff --git a/man/dsadmin.profile.Rd b/man/dsadmin.profile.Rd
diff --git a/man/dsadmin.profile_access.Rd b/man/dsadmin.profile_access.Rd
diff --git a/man/dsadmin.profile_create.Rd b/man/dsadmin.profile_create.Rd
diff --git a/man/dsadmin.profile_delete.Rd b/man/dsadmin.profile_delete.Rd
diff --git a/man/dsadmin.profile_enable.Rd b/man/dsadmin.profile_enable.Rd
diff --git a/man/dsadmin.profile_exists.Rd b/man/dsadmin.profile_exists.Rd
diff --git a/man/dsadmin.profile_init.Rd b/man/dsadmin.profile_init.Rd
diff --git a/man/dsadmin.profile_perm.Rd b/man/dsadmin.profile_perm.Rd