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 0a99d662cbeaeca246379cc967c9cba6e9ec3840..904673fe286faff21e416d4d1892c098a842961e 100644 (file)
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -119,6 +119,12 @@ class ArvadosApiClient
     else
       query["_method"] = "GET"
     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
       query["_profile"] = "true"
     end
@@ -140,6 +146,7 @@ class ArvadosApiClient
     rescue Oj::ParseError
       resp = nil
     end
+
     if not resp.is_a? Hash
       raise InvalidApiResponseException.new(url, msg)
     elsif msg.status_code != 200
@@ -213,6 +220,7 @@ class ArvadosApiClient
         CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s)
       }.join('&')
     end
+    uri
   end
 
   def arvados_logout_url(params={})