#54 set keyring default backend to env

eblondel · Sep 7, 2021 · 3fbaa1d · 3fbaa1d
1 parent e7f0ff2
commit 3fbaa1d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: zen4R
 Version: 0.4-3
-Date: 2021-07-23
+Date: 2021-09-07
 Title: Interface to 'Zenodo' REST API
 Authors@R: c(
   person("Emmanuel", "Blondel", role = c("aut", "cre"), email = "emmanuel.blondel1@gmail.com", comment = c(ORCID = "0000-0002-5870-5762")),

diff --git a/R/ZenodoManager.R b/R/ZenodoManager.R
@@ -206,6 +206,7 @@
 ZenodoManager <-  R6Class("ZenodoManager",
   inherit = zen4RLogger,
   private = list(
+    keyring_backend = keyring::backend_env$new(),
     keyring_service = NULL,
     url = "https://zenodo.org/api"
   ),
@@ -228,7 +229,7 @@ ZenodoManager <-  R6Class("ZenodoManager",
       private$url = url
       if(!is.null(token)) if(nzchar(token)){
         private$keyring_service = paste0("zen4R@", url)
-        keyring::key_set_with_value(private$keyring_service, username = "zen4R", password = token)
+        private$keyring_backend$set_with_value(private$keyring_service, username = "zen4R", password = token)
         deps <- self$getDepositions(size = 1, quiet = TRUE)
         if(!is.null(deps$status)) {
           if(deps$status == 401){
@@ -248,7 +249,7 @@ ZenodoManager <-  R6Class("ZenodoManager",
     getToken = function(){
       token <- NULL
       if(!is.null(private$keyring_service)){
-        token <- suppressWarnings(keyring::key_get(private$keyring_service, username = "zen4R"))
+        token <- suppressWarnings(private$keyring_backend$get(private$keyring_service, username = "zen4R"))
       }
       return(token)
     },

diff --git a/R/zen4R.R b/R/zen4R.R
@@ -22,7 +22,7 @@
 #'    Package: \tab zen4R\cr
 #'    Type: \tab Package\cr
 #'    Version: \tab 0.4-3\cr
-#'    Date: \tab 2021-07-23\cr
+#'    Date: \tab 2021-09-07\cr
 #'    License: \tab MIT\cr
 #'    LazyLoad: \tab yes\cr
 #'  }

diff --git a/man/zen4R.Rd b/man/zen4R.Rd
diff --git a/tests/test-all.R b/tests/test-all.R
@@ -4,7 +4,7 @@ library(zen4R)
 
 #test environment
 zenodo_url <- "https://sandbox.zenodo.org/api"
-zenodo_token <- "<token>"
+zenodo_token <- "m9OjWbtoB7pWqHzbUbGXX4WtFqB4XezKgMsNp1ppegMwc9SVIUjgKEG8Vx1z"
 zenodo_logger <- "DEBUG"
 ZENODO <- try(ZenodoManager$new(url = zenodo_url, token = zenodo_token, logger = zenodo_logger))