Merge pull request #151 from Appsilon/feature/#124-shinyProxyUserRetr…

…ieval shinyproxy user retrival
Appsilon · Mar 12, 2024 · e0549f1 · e0549f1
2 parents 67dc7ed + 00f346b
commit e0549f1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,7 @@
 
 ### New Features
 
+- Updated `get_user` method to retrieve user in `shinyproxy` environment (#124).
 - Added flexibility to select between [`RPostgreSQL`, `RPostgres`] drivers (#147).
 
 # shiny.telemetry 0.2.0

diff --git a/R/telemetry.R b/R/telemetry.R
@@ -721,8 +721,13 @@ Telemetry <- R6::R6Class( # nolint object_name_linter
       force_username = NULL
     ) {
       if (!is.null(force_username)) return(force_username)
-      if (is.null(session) || is.null(session$user)) return(NULL)
-      session$user
+      if (isFALSE(is.null(session)) && isFALSE(is.null(session$user))) {
+        return(session$user) # POSIT Connect
+      } else if (nzchar(Sys.getenv("SHINYPROXY_USERNAME"))) {
+        return(Sys.getenv("SHINYPROXY_USERNAME"))
+      } else {
+        return(NULL)
+      }
     }
   )
 )