improve handling of OAuth2 tokens

RGoogleFit/DESCRIPTION

@@ -15,4 +15,4 @@ Depends:
     httr
 Imports:
     utils
-RoxygenNote: 5.0.1
+RoxygenNote: 6.0.1

RGoogleFit/NAMESPACE

@@ -3,6 +3,7 @@
 export(GetFitDataset)
 export(GetFitDatasource)
 export(GetFitDatasources)
+export(GetFitOauth2Object)
 export(GetFitOauth2Token)
 export(NanosToPOSIXct)
 import(RCurl)

RGoogleFit/NEWS

@@ -1,3 +1,8 @@
+RGoogleFit 0.3.0
+----------------------------------------------------------------
+
+* improved handling of OAuth2 tokens
+
 RGoogleFit 0.2.0
 ----------------------------------------------------------------
 

RGoogleFit/R/GetFitOAuth2Token.R

@@ -2,8 +2,10 @@
 #' @rdname GetFitOauth2Token
 #' @description
 #' Retrieves or refreshes an OAuth2 token. Two options must be set:
-#' \code{RGoogleFit.client_id}
-#' \code{RGoogleFit.client_secret}
+#' \itemize{
+#' \item \code{RGoogleFit.client_id}
+#' \item \code{RGoogleFit.client_secret}
+#' }
 #' @export
 GetFitOauth2Token <- function() {
   client_id = getOption('RGoogleFit.client_id')
@@ -14,7 +16,8 @@ GetFitOauth2Token <- function() {
   assert(!is.null(client_secret),
          'Please set \'RGoogleFit.client_secret\' option')
 
-  oauth2_token <- get0('RGoogleFit.token')
+  oauth2_token <- RGoogleFitObjects$oauth2_object
+  print(oauth2_token)
 
   if (!is.null(oauth2_token)) {
     if (!oauth2_token$validate()) {
@@ -38,10 +41,24 @@ GetFitOauth2Token <- function() {
       use_oob = FALSE,
       cache = TRUE
     )
+    if (!oauth2_token$validate()) {
+      oauth2_token$refresh()
+    }
   }
 
-  assign('RGoogleFit.token', oauth2_token)
-  
+  RGoogleFitObjects$oauth2_object <- oauth2_token
+
   return(oauth2_token$credentials$access_token)
 
-}
+}
+
+#' @title GetFitOauth2Object
+#' @rdname GetFitOauth2Object
+#' @description
+#' Returns the whole Oauth2 object. Useful for debugging purposes.
+#' @export
+GetFitOauth2Object <- function() {
+
+  return(RGoogleFitObjects$oauth2_object)
+
+}

RGoogleFit/R/RGoogleFit-package.R

@@ -11,3 +11,5 @@
 #' @import RCurl jsonlite bit64 httr
 #' @importFrom utils URLencode
 invisible(NULL)
+
+RGoogleFitObjects <- new.env()