Stopped overwriting proxy_settings when using "default"

ropensci · Nov 17, 2023 · 47bb1ab · 47bb1ab
1 parent d223207
commit 47bb1ab
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/R/utils.R b/R/utils.R
@@ -145,22 +145,27 @@ fingertips_deframe <- function(data) {
 #' @noRd
 fingertips_proxy_settings <- function() {
 
+  # First try using default as proxy settings
   fingertips_proxy <- "default"
-  fingertips_proxy <- tryCatch(
+  errtext <- tryCatch(
     {
       fingertips_ensure_api_available(proxy_settings = "default")
-    }, error=function(e) {"none"}
+    }, error=function(e) {"The API is currently unavailable."}
   )
 
-  if (fingertips_proxy == "none") {
+  # Second try using "none" as proxy settings
+  if (errtext != TRUE) {
+    fingertips_proxy <- "none"
     errtext <- tryCatch(
-    {
-      fingertips_ensure_api_available(proxy_settings = "none")
-    }, error=function(e) {"The API is currently unavailable."}
-  )
+      {
+        fingertips_ensure_api_available(proxy_settings = "none")
+      }, error=function(e) {"The API is currently unavailable."}
+    )
+
+    # Stop if neither settings work
     if (errtext != TRUE) {
       stop(paste(errtext, collapse='\n  '), call. = FALSE)
     }
-}
+  }
   return(fingertips_proxy)
 }