Merge pull request #52 from Microsoft/dev

Merge changes to storage API into master
microsoft · Mar 8, 2017 · 9300352 · 9300352
2 parents 5d00fc6 + 83a0507
commit 9300352
Show file tree

Hide file tree

Showing 23 changed files with 525 additions and 533 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,8 @@
 .Rproj.user
 .Rhistory
 .RData
+*.Rproj
+*.rxproj
+*.rxproj.user
+*.suo
+
diff --git a/R/AzureAuthenticate.R b/R/AzureAuthenticate.R
@@ -70,12 +70,13 @@ azureAuthenticate <- function(azureActiveContext, tenantID, clientID, authKey, v
 #' @family Resources
 #' @export
 azureCheckToken <- function(azureActiveContext) {
+  if (missing(azureActiveContext) || is.null(azureActiveContext)) return(NA)
   if (is.null(azureActiveContext$EXPIRY))
     stop("Not Authenticated: Use azureAuthenticate")
 
   if (azureActiveContext$EXPIRY < Sys.time()) {
     message("Azure Token Expired: Attempting automatic renewal")
     azureAuthenticate(azureActiveContext)
   }
-  return("OK")
+  return(TRUE)
 }