improved OANDA error handling

shikokuchuo · Oct 27, 2023 · ee0a1b8 · ee0a1b8
1 parent c2a3b8e
commit ee0a1b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 # ichimoku 1.4.9.9000 (development)
 
+* Improved handling for OANDA API errors.
+
 # ichimoku 1.4.9
 
 * Internal performance enhancements.

diff --git a/R/switch.R b/R/switch.R
@@ -121,6 +121,9 @@ do_ <- function() {
         resp <- ncurl(url, convert = FALSE, follow = TRUE,
                       headers = c("Authorization" = paste0("Bearer ", apikey),
                                   "User-Agent" = .user_agent))
+        resp[["status"]] == 200L ||
+          stop("status code ", resp[["status"]], " - ",
+               deserialize_json(resp[["data"]]), call. = FALSE)
         parsed <- deserialize_json(resp[["data"]])
         length(parsed[["accounts"]]) || stop(parsed, call. = FALSE)
         account <<- parsed[["accounts"]][[1L]][["id"]]
@@ -137,11 +140,9 @@ do_ <- function() {
         resp <- ncurl(url, convert = FALSE, follow = TRUE,
                       headers = c("Authorization" = paste0("Bearer ", apikey),
                                   "User-Agent" = .user_agent))
-        if (resp[["status"]] != 200L) {
-          resp <- ncurl(url, convert = FALSE, follow = TRUE,
-                        headers = c("Authorization" = paste0("Bearer ", apikey),
-                                    "User-Agent" = .user_agent))
-        }
+        resp[["status"]] == 200L ||
+          stop("status code ", resp[["status"]], " - ",
+               deserialize_json(resp[["data"]]), call. = FALSE)
         parsed <- deserialize_json(resp[["data"]])
         length(parsed[["instruments"]]) || {
           warning(parsed,