Not providing creds now throws an error.

andodet · Mar 31, 2020 · 15ee2d1 · 15ee2d1
1 parent e51d590
commit 15ee2d1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -9,7 +9,7 @@ Description: More about what it does (maybe more than one line)
 License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.0.2
+RoxygenNote: 7.1.0
 Imports:
  magrittr,
  httr,

diff --git a/R/citymappr_setup.R b/R/citymappr_setup.R
@@ -28,7 +28,7 @@
 #'
 #' @export
 citymappr_setup <- function(config_file = "~/.citymappr",
- api_token = "",
+ api_token = NULL,
  echo = FALSE) {
 
  if (file.exists(config_file)) {
@@ -38,11 +38,13 @@ citymappr_setup <- function(config_file = "~/.citymappr",
 
  Sys.setenv(CITYMAPPER_API_TOKEN = config[,"api_token"])
 
- } else {
-
+ } else if(!is.null(api_token)) {
  Sys.setenv(CITYMAPPER_API_TOKEN = api_token)
+ } else {
+ stop("No config file or token provided. Please provide one. Use `?citymappr_setup` for help")
  }
 
+ # Print token if verbose
  if (echo) {
  print(toJSON(as.list(Sys.getenv(c("CITYMAPPER_API_TOKEN")))))
  }

diff --git a/man/citymappr_setup.Rd b/man/citymappr_setup.Rd