Improve HTTP requests and non-interactive authentication

DESCRIPTION

@@ -1,24 +1,26 @@
 Package: rdrop2
 Title: Programmatic Interface to the 'Dropbox' API
-Version: 0.8.2.2
+Version: 0.10.0
 Authors@R: c(person("Karthik", "Ram", email = "karthik.ram@gmail.com", role = c("aut", "cre")),
            person("Clayton", "Yochum", role = "aut"),
            person("Caleb", "Scheidel", role = "ctb"),
-           person("Akhil", "Bhel", role = "cph")
+           person("Akhil", "Bhel", role = "cph"),
+           person("Tadhg", "Moore", role = "ctb")
            )
-Description: Provides full programmatic access to the 'Dropbox' file hosting platform <https://dropbox.com>, including support for all standard file operations.
-Depends: R (>= 3.1.1)
+Description: Provides full programmatic access to the 'Dropbox' file hosting platform <https://dropbox.com>, including support for all standard file operations. Uses the 'httr2' package for HTTP requests and the Dropbox API v2.
+Depends: R (>= 3.6.0)
 License: MIT + file LICENSE
 BugReports: https://github.com/karthik/rdrop2/issues
 LazyData: true
-Imports: digest,
+Imports: cli,
+         digest,
          dplyr,
-         httr,
+         httr2,
          jsonlite,
          magrittr,
          purrr,
          assertthat
 Suggests: testthat,
           uuid
-RoxygenNote: 7.2.3
 Encoding: UTF-8
+Config/roxygen2/version: 8.0.0

NAMESPACE

@@ -3,22 +3,37 @@
 export("%>%")
 export(drop_acc)
 export(drop_auth)
+export(drop_auth_env)
 export(drop_content_hash)
 export(drop_copy)
+export(drop_copy_batch)
 export(drop_create)
 export(drop_delete)
+export(drop_delete_batch)
 export(drop_dir)
 export(drop_download)
 export(drop_exists)
 export(drop_get)
 export(drop_get_metadata)
+export(drop_get_shared_link_file)
+export(drop_get_thumbnail)
 export(drop_history)
 export(drop_list_shared_links)
 export(drop_media)
 export(drop_move)
+export(drop_move_batch)
 export(drop_read_csv)
+export(drop_restore)
+export(drop_save_url)
 export(drop_search)
+export(drop_search_continue)
 export(drop_share)
+export(drop_space_usage)
 export(drop_upload)
-import(httr)
+export(get_dropbox_token)
+import(httr2)
+importFrom(cli,cli_abort)
+importFrom(cli,cli_alert_danger)
+importFrom(cli,cli_alert_info)
+importFrom(cli,cli_alert_success)
 importFrom(magrittr,"%>%")

NEWS.md

@@ -1,3 +1,8 @@
+# rdrop2 0.10.0
+* Switched from `httr` to `httr2` for all HTTP requests.
+* Added `cli` package for improved user-facing messages, warnings, and errors.
+* Added Tadhg Moore as a contributor.
+
 # rdrop2 0.8.2.2
 * replaced dependency package `assertive` by `assertthat`.
 

R/drop_acc.R

@@ -1,12 +1,9 @@
 #' Get information about current Dropbox account.
 #'
-#' Fields returned will vary by account;
+#' Fields returned will vary by account.
 #'
 #' @template token
 #'
-#' @import httr
-#' @export
-#'
 #' @return
 #'   Nested list with elements \code{account_id},
 #'   \code{name} (list), \code{email}, \code{email_verified}, \code{disabled},
@@ -18,6 +15,8 @@
 #'
 #' @references \href{https://www.dropbox.com/developers/documentation/http/documentation#users-get_current_account}{API documentation}
 #'
+#' @export
+#'
 #' @examples
 #' \dontrun{
 #'
@@ -29,8 +28,32 @@
 drop_acc <- function(dtoken = get_dropbox_token()) {
 
   url <- "https://api.dropbox.com/2/users/get_current_account"
+  drop_request(url, dtoken)
+}
+
+
+#' Get Dropbox storage space usage.
+#'
+#' Returns how much space the current account is using and how much is
+#' allocated.
+#'
+#' @template token
+#'
+#' @return A list with elements \code{used} (bytes used) and \code{allocation}
+#'   (a list with \code{.tag} and \code{allocated} bytes, or team-level info).
+#'
+#' @references \href{https://www.dropbox.com/developers/documentation/http/documentation#users-get_space_usage}{API documentation}
+#'
+#' @export
+#'
+#' @examples
+#' \dontrun{
+#'   usage <- drop_space_usage()
+#'   cat("Used:", usage$used, "bytes\n")
+#'   cat("Allocated:", usage$allocation$allocated, "bytes\n")
+#' }
+drop_space_usage <- function(dtoken = get_dropbox_token()) {
 
-  # make request and parse response
-  req <- httr::POST(url, httr::config(token = dtoken))
-  httr::content(req)
+  url <- "https://api.dropbox.com/2/users/get_space_usage"
+  drop_request(url, dtoken)
 }