#14 fix auth & keyring support

eblondel · Sep 8, 2021 · d91028a · d91028a
1 parent 44e4705
commit d91028a
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 42 deletions.
diff --git a/R/ocsApiSharingManager.R b/R/ocsApiSharingManager.R
@@ -85,8 +85,8 @@ ocsApiSharingManager <-  R6Class("ocsApiSharingManager",
       request <- "ocs/v1.php/apps/files_sharing/api/v1/shares"
       get_req <- ocsRequest$new(
         type = "HTTP_GET", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         namedParams = list(
           path = path,
           reshares = reshares,
@@ -175,8 +175,8 @@ ocsApiSharingManager <-  R6Class("ocsApiSharingManager",
       request <- "ocs/v1.php/apps/files_sharing/api/v1/shares"
       post_req <- ocsRequest$new(
         type = "HTTP_POST", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         namedParams = list(
           name = name,
           path = path,

diff --git a/R/ocsApiUserProvisioningManager.R b/R/ocsApiUserProvisioningManager.R
@@ -109,8 +109,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- "ocs/v1.php/cloud/users"
       post_req <- ocs4R::ocsRequest$new(
         type = "HTTP_POST", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = list(
           userid = userid,
           email = email,
@@ -130,8 +130,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
     getUsers = function(){
       get_users <- ocs4R::ocsRequest$new(
         type = "HTTP_GET", private$url, "ocs/v1.php/cloud/users",
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")),
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")),
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       get_users$execute()
@@ -144,8 +144,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
     getUser = function(userid, pretty = FALSE){
       get_user <- ocs4R::ocsRequest$new(
         type = "HTTP_GET", private$url, sprintf("ocs/v1.php/cloud/users/%s", userid),
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       get_user$execute()
@@ -171,8 +171,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/users/%s", userid)
       put_req <- ocsRequest$new(
         type = "HTTP_PUT", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = list(key = key, value = value),
         logger = self$loggerType
       )
@@ -210,8 +210,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/users/%s/enable", userid)
       put_req <- ocsRequest$new(
         type = "HTTP_PUT", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = "",
         logger = self$loggerType
       )
@@ -224,8 +224,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/users/%s/disable", userid)
       put_req <- ocsRequest$new(
         type = "HTTP_PUT", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = "",
         logger = self$loggerType
       )
@@ -238,8 +238,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/users/%s", userid)
       delete_req <- ocsRequest$new(
         type = "HTTP_DELETE", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       delete_req$execute()
@@ -250,8 +250,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
     getUserGroups = function(userid){
       get_usergroups <- ocs4R::ocsRequest$new(
         type = "HTTP_GET", private$url, sprintf("ocs/v1.php/cloud/users/%s/groups", userid),
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       get_usergroups$execute()
@@ -265,8 +265,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/users/%s/groups", userid)
       post_req <- ocs4R::ocsRequest$new(
         type = "HTTP_POST", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = list(groupid = groupid),
         contentType = NULL,
         logger = self$loggerType
@@ -282,8 +282,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/users/%s/groups", userid)
       delete_req <- ocsRequest$new(
         type = "HTTP_DELETE", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = list(groupid = groupid),
         logger = self$loggerType
       )
@@ -313,8 +313,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
     getGroups = function(search = NULL, limit = NULL, offset = NULL){
       get_groups <- ocs4R::ocsRequest$new(
         type = "HTTP_GET", private$url, "ocs/v1.php/cloud/groups",
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         namedParams = list(search = search, limit = limit, offset = offset),
         logger = self$loggerType
       )
@@ -329,8 +329,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- "ocs/v1.php/cloud/groups"
       post_req <- ocs4R::ocsRequest$new(
         type = "HTTP_POST", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         content = list(groupid = groupid),
         contentType = NULL,
         logger = self$loggerType
@@ -345,8 +345,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
     getGroup = function(groupid){
       get_group <- ocs4R::ocsRequest$new(
         type = "HTTP_GET", private$url, sprintf("ocs/v1.php/cloud/groups/%s", groupid),
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       get_group$execute()
@@ -360,8 +360,8 @@ ocsApiUserProvisioningManager <-  R6Class("ocsApiUserProvisioningManager",
       request <- sprintf("ocs/v1.php/cloud/groups/%s", groupid)
       delete_req <- ocsRequest$new(
         type = "HTTP_DELETE", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       delete_req$execute()

diff --git a/R/ocsApiWebdavManager.R b/R/ocsApiWebdavManager.R
@@ -73,8 +73,8 @@ ocsApiWebdavManager <-  R6Class("ocsApiWebdavManager",
       request <- paste0(self$getWebdavRoot(), relPath)
       list_req <- ocsRequest$new(
         type = "WEBDAV_PROPFIND", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         logger = self$loggerType
       )
       list_req$execute()
@@ -89,8 +89,8 @@ ocsApiWebdavManager <-  R6Class("ocsApiWebdavManager",
         request <- paste0(self$getWebdavRoot(), relPath, name)
         mkcol_req <- ocsRequest$new(
           type = "WEBDAV_MKCOL", private$url, request,
-          private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-          token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+          private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+          token = private$getToken(), cookies = private$cookies,
           logger = self$loggerType
         )
         mkcol_req$execute()
@@ -120,8 +120,8 @@ ocsApiWebdavManager <-  R6Class("ocsApiWebdavManager",
                         filename, paste(private$url, request, sep="/")))
       upload_req <- ocsRequest$new(
         type = "HTTP_PUT", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         filename = filename,
         logger = self$loggerType
       )
@@ -148,8 +148,8 @@ ocsApiWebdavManager <-  R6Class("ocsApiWebdavManager",
                         filename, paste(private$url, request, sep="/")))
       upload_req <- ocsRequest$new(
         type = "HTTP_DELETE", private$url, request,
-        private$user, pwd = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_pwd")), 
-        token = private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token")), cookies = private$cookies,
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        token = private$getToken(), cookies = private$cookies,
         filename = filename,
         logger = self$loggerType
       )

diff --git a/R/ocsManager.R b/R/ocsManager.R
@@ -145,6 +145,16 @@ ocsManager <-  R6Class("ocsManager",
     keyring_backend = keyring::backend_env$new(),
     keyring_service = NULL,
 
+    #getToken (if existing)
+    getToken = function(){
+      token <- NULL
+      if(!is.null(private$keyring_service)){
+        keyring_token <- suppressWarnings(try(private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user, "_token")), silent = TRUE))
+        if(!is(keyring_token, "try-error")) token <- keyring_token
+      }
+      return(token)
+    },
+
     #checkAPIAvailability
     checkAPIAvailability = function(name, element){
       if(!private$capabilities[[element]]$api_enabled){
@@ -200,7 +210,8 @@ ocsManager <-  R6Class("ocsManager",
     connect = function(){
       caps_req <- ocsRequest$new(
         type = "HTTP_GET", private$url, "ocs/v1.php/cloud/capabilities",
-        private$user, logger = self$loggerType
+        private$user, pwd = private$keyring_backend$get(service = private$keyring_service, username = paste0(private$user,"_pwd")), 
+        logger = self$loggerType
       )
       caps_req$execute()
       caps_resp <- caps_req$getResponse()
@@ -215,7 +226,7 @@ ocsManager <-  R6Class("ocsManager",
       cookies <- unlist(cookies[names(cookies)!="XSRF-TOKEN"])
       private$cookies <- paste0(sapply(names(cookies), function(cookiename){paste0(cookiename,"=",cookies[[cookiename]])}),collapse=";")
 
-      keyring_token <- private$keyring_backend$get(private$keyring_service, username = paste0(private$user,"_token"))
+      keyring_token <- private$getToken()
       if(!is.null(keyring_token)){
         caps_req <- ocsRequest$new(
           type = "HTTP_GET", private$url, "ocs/v1.php/cloud/capabilities",