Merge pull request #13 from ericnewkirk/develop

Develop

NAMESPACE

@@ -12,7 +12,6 @@ export(ats_post)
 export(ats_select_collars)
 export(ats_trans_dates)
 export(check_cookie)
-export(clear_cookie)
 export(cllr_add_id)
 export(cllr_remove_header)
 export(cllr_rename_id)

R/ats_auth.R

@@ -37,43 +37,6 @@ check_cookie <- function(url, cookie) {
 
 }
 
-# * 2.2 - clear_cookie ----------------------------------------------------
-
-#' @title Remove Cookie
-#'
-#' @description Remove a certain cookie from a request handle
-#'
-#' @param url http hostname (base url)
-#' @param cookie name of the cookie to remove
-#'
-#' @return named character vector for \code{httr::set_cookies}
-#'
-#' @export
-#'
-#' @keywords internal
-#'
-#' @examples
-#' \dontrun{
-#'
-#' httr::GET(
-#'   url = ats_base_url,
-#'   path = list(
-#'   "download_all_transmission",
-#'   "download_all_transmission.aspx?dw=new"
-#'   ),
-#'   httr::set_cookies(clear_cookie(ats_base_url, "cgca"))
-#' )
-#'
-#' }
-#'
-clear_cookie <- function(url, cookie) {
-
-    cookies <- httr::cookies(httr::handle_find(url)) %>%
-      dplyr::filter(.data$name != cookie) %>%
-      dplyr::pull(.data$value, name = .data$name)
-
-}
-
 # 3 - Visible Functions ---------------------------------------------------
 
 # * 3.1 - ats_login -------------------------------------------------------

R/fetch_ats.R

@@ -1312,10 +1312,11 @@ fetch_ats_positions <- function(device_id = NULL,
       }
     }
 
-    # post request only works with collars selected
-    if (!check_cookie(ats_base_url, "cgca")) {
+    if (any(missing(device_id), length(device_id) == 0)) {
+      # post request only works with collars selected
       ats_select_collars(fetch_ats_devices())
     }
+    # otherwise collars are selected in fetch_ats_transmissions
 
     # send request and parse
     ats_post(
@@ -1415,8 +1416,7 @@ fetch_ats_transmissions <- function(device_id = NULL, new = FALSE) {
         "download_all_transmission",
         paste0("download_all_transmission.aspx?dw=", type)
       ),
-      task = "download transmission data",
-      httr::set_cookies(clear_cookie(ats_base_url, "cgca"))
+      task = "download transmission data"
     ) %>%
       ats_parse_trans()