Remove key param

R/modify.R

@@ -43,6 +43,5 @@ mm_req_params <- function(req, ..., allfields = TRUE) {
   check_bool(allfields)
   params <- format_params(...)
   if (allfields) params <- c(params, "ALLFIELDS" = 1)
-
-  req <- req |> httr2::req_url_query(!!!params)
+  httr2::req_url_query(req, !!!params)
 }

R/perform.R

@@ -18,9 +18,5 @@
 #' }
 mm_req_perform <- function(req) {
   check_request(req)
-
-  req |>
-    httr2::req_perform_iterative(
-      next_req = function(resp, req) mm_next_req(resp, req)
-    )
+  httr2::req_perform_iterative(req, next_req = mm_next_req)
 }

R/request.R

@@ -19,23 +19,20 @@
 #' `"timecard"` for employee transactions, and `"workorder"`
 #' for work orders. All endpoints are listed at
 #' https://apidocs.megamation.com/.
-#' @param .url API base URL for request.
-#' @param .key API key for request.
 #' @returns An object of class `httr2_request`.
 #' @export
 #' @examplesIf httr2::secret_has_key("HTTR2_KEY_MEGAMATION")
 #' mm_request("timecard")
 #' mm_request("trade")
-mm_request <- function(endpoint, .url = get_env_url(), .key = get_env_key()) {
+mm_request <- function(endpoint) {
+  check_creds()
   check_string(endpoint)
-  check_key(.key)
-
-  httr2::request(.url) |>
+  agent <- "megamation (https://github.com/asadow/megamation)"
+  user <- "APIDL"
+  httr2::request(get_env_url()) |>
     httr2::req_url_path_append(endpoint) |>
-    httr2::req_user_agent(
-      "megamation (https://github.com/asadow/megamation)"
-    ) |>
-    httr2::req_auth_basic("APIDL", .key) |>
+    httr2::req_user_agent(agent) |>
+    httr2::req_auth_basic(user, get_env_key()) |>
     httr2::req_error(body = mm_error_body) |>
     httr2::req_cache(tempdir(), debug = TRUE)
 }

R/utils-check.R

@@ -37,22 +37,6 @@ check_request <- function(x,
   return()
 }
 
-# Warn when .key is not same as MEGAMATION_KEY
-check_key <- function(.key) {
-  if(.key != get_env_key()) {
-    cli::cli_warn(c(
-      "The {.arg .key} you provided is not your
-        MEGAMATION_KEY environment variable.",
-      "i" = "It is highly recommended that you run {.fun mm_set_creds}, or
-      `Sys.setenv('MEGAMATION_KEY' = '<your-key>')`,
-        and {.emph do not} supply {.arg .key}.",
-      "i" = 'A typo like `kee = <your-secret>`
-        will end up in the request URL as a filter.'
-    ))
-  }
-  return()
-}
-
 # Are credentials present
 check_creds <- function() {
   creds <- c(