wip

dewittpe · Sep 19, 2024 · 3994769 · 3994769
1 parent 0e38a5c
commit 3994769
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 1 deletion.
diff --git a/R/keyring.R b/R/keyring.R
@@ -52,7 +52,9 @@ REDCapExporter_keyring_check <- function(keyring = "REDCapExporter", password =
   } else {
     message(sprintf("File based keyring %s exists", keyring))
   }
+
   invisible(TRUE)
+
 }
 
 #' @rdname REDCapExporter_keyring
@@ -82,7 +84,9 @@ REDCapExporter_add_api_token <- function(project, keyring = "REDCapExporter", us
 
   # lock the keyring
   kr$keyring_lock(keyring = keyring)
+
   invisible(TRUE)
+
 }
 
 #' @rdname REDCapExporter_keyring
@@ -95,7 +99,9 @@ REDCapExporter_get_api_token <- function(project, keyring = "REDCapExporter", us
   kr <- keyring::backend_file$new()
   kr$keyring_unlock(keyring = keyring, password = password)
   token <- kr$get(service = project, username = user, keyring = keyring)
-  kr$keyring_unlock(keyring = keyring, password = password)
+  kr$keyring_lock(keyring = keyring)
+
   invisible(token)
+
 }
 
diff --git a/data/avs_raw_core.rda b/data/avs_raw_core.rda
diff --git a/data/avs_raw_core_json.rda b/data/avs_raw_core_json.rda
diff --git a/data/avs_raw_metadata.rda b/data/avs_raw_metadata.rda
diff --git a/data/avs_raw_metadata_json.rda b/data/avs_raw_metadata_json.rda
diff --git a/data/avs_raw_project.rda b/data/avs_raw_project.rda
diff --git a/data/avs_raw_project_json.rda b/data/avs_raw_project_json.rda
diff --git a/data/avs_raw_record.rda b/data/avs_raw_record.rda
diff --git a/data/avs_raw_record_json.rda b/data/avs_raw_record_json.rda
diff --git a/data/avs_raw_user.rda b/data/avs_raw_user.rda
diff --git a/data/avs_raw_user_json.rda b/data/avs_raw_user_json.rda
diff --git a/tests/test-keyring.R b/tests/test-keyring.R
@@ -8,6 +8,7 @@ x <- tryCatch(REDCapExporter_keyring_check("testingring"), message = function(m)
 stopifnot(identical(x$message, "File based keyring testingring has been created\n"))
 x <- tryCatch(REDCapExporter_keyring_check("testingring"), message = function(m) {m})
 stopifnot(identical(x$message, "File based keyring testingring exists\n"))
+stopifnot(isTRUE(REDCapExporter_keyring_check("testingring")))
 
 # Expect that this will error because we are not interactive and a password
 # prompt cannot be filled in