set scopes if necessary with gce_auth() (#97)

and update to googleAuthR 0.6.0
cloudyr · Oct 24, 2017 · 91335bb · 91335bb
1 parent 4e11e17
commit 91335bb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -19,7 +19,7 @@ Depends:
 Imports:
     assertthat,
     future (>= 1.2.0),
-    googleAuthR (>= 0.5.1),
+    googleAuthR (>= 0.6.0),
     httr (>= 1.3.1),
     jsonlite (>= 1.1),
     utils

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,6 @@
 # 0.2.0.9000
 
-* ...
+* set scopes if necessary with gce_auth() (#97)
 
 # 0.2.0
 

diff --git a/R/auth.R b/R/auth.R
@@ -25,6 +25,14 @@ gce_auth <- function(new_user = FALSE, no_auto = FALSE){
   required_scopes <- c("https://www.googleapis.com/auth/cloud-platform",
                        "https://www.googleapis.com/auth/compute")
 
+  op <- getOption("googleAuthR.scopes.selected")
+  if(is.null(op)){
+    options(googleAuthR.scopes.selected = "https://www.googleapis.com/auth/cloud-platform")
+  } else if(!any(required_scopes %in% op)){
+    options(googleAuthR.scopes.selected = c("https://www.googleapis.com/auth/cloud-platform",
+                                            op))
+  }
+
   googleAuthR::gar_auto_auth(required_scopes,
                              new_user = new_user,
                              no_auto = no_auto,