2659: load @prov_svg outside of the 'if current_user' block so that an anonymous...

[arvados.git] / apps / workbench / app / models / arvados_api_client.rb

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 4e2d964e6d81b78c306dae6394edab17059653b2..904673fe286faff21e416d4d1892c098a842961e 100644 (file)
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -120,11 +120,9 @@ class ArvadosApiClient
       query["_method"] = "GET"
     end
 
-    # Use anonymous token if available when it is a GET request
-    if ((query["_method"] == "GET") or (query[:_method] == "GET")) && !Thread.current[:user]
-      if Rails.configuration.respond_to? :anonymous_user_token
-        query["api_token"] = Rails.configuration.anonymous_user_token
-      end
+    # Use anonymous token for GET requests when no api_token is available
+    if ((query["_method"] == "GET") or (query[:_method] == "GET")) && query["api_token"].empty?
+      query['api_token'] = Rails.configuration.anonymous_user_token
     end
 
     if @@profiling_enabled