Fix service authentification when using `gcloud auth application-defa…

…ult` database. Fix #73.
meztez · Nov 3, 2024 · 73844dd · 73844dd
1 parent 5c71e2b
commit 73844dd
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: bigrquerystorage
 Type: Package
 Title: An Interface to Google's 'BigQuery Storage' API
-Version: 1.2.1
+Version: 1.2.1.9000
 Authors@R: c(
   person("Bruno", "Tremblay", role = c("aut", "cre"), email = "openr@neoxone.com"),
   person(family = "Google LLC", role = c("cph", "fnd")))

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# bigrquerystorage Development Version
+
+* Fix service authentification when using `gcloud auth application-default` database.
+
 # bigrquerystorage 1.2.1
 
 * Increment `nanoarrow` version requirement.

diff --git a/R/bqs_download.R b/R/bqs_download.R
@@ -165,12 +165,12 @@ bqs_auth <- function() {
   if (bigrquery::bq_has_token()) {
     .authcred <- asNamespace("bigrquery")[[".auth"]][["cred"]]
     if (!is.null(refresh_token <- .authcred[["credentials"]][["refresh_token"]])) {
-      .authclient <- .authcred[["client"]]
+      .authsource <- c(.authcred[["client"]], .authcred[["app"]])
       access_token <- ""
       refresh_token <- c(
         type = "authorized_user",
-        client_secret = .authclient[["secret"]],
-        client_id = .authclient[["key"]],
+        client_secret = .authsource[["secret"]],
+        client_id = .authsource[["key"]],
         refresh_token = refresh_token
       )
       refresh_token <- paste0("{", paste0(

diff --git a/README.Rmd b/README.Rmd
@@ -103,13 +103,13 @@ apt-get install -y 'libgrpc\+\+-dev'/buster-backports \
 ```
 ##### OpenSUSE
 
-In OpenSUSE 15.4 and 15.5 the version of the grpc package is tool old,
+In OpenSUSE 15.4 and 15.5 the version of the grpc package is too old,
 so installation fails. You can potentially compile a newer version of
 grpc from source.
 
 ##### Ubuntu 20.04
 
-In Ubuntu 20.04 the version of the grpc package is tool old,
+In Ubuntu 20.04 the version of the grpc package is too old,
 so installation fails. You can potentially compile a newer version of
 grpc from source.
 

diff --git a/README.md b/README.md
@@ -110,13 +110,13 @@ apt-get install -y 'libgrpc\+\+-dev'/buster-backports \
 
 ##### OpenSUSE
 
-In OpenSUSE 15.4 and 15.5 the version of the grpc package is tool old,
+In OpenSUSE 15.4 and 15.5 the version of the grpc package is too old,
 so installation fails. You can potentially compile a newer version of
 grpc from source.
 
 ##### Ubuntu 20.04
 
-In Ubuntu 20.04 the version of the grpc package is tool old, so
+In Ubuntu 20.04 the version of the grpc package is too old, so
 installation fails. You can potentially compile a newer version of grpc
 from source.