14287: Don't send reader_tokens="[false]".
authorTom Clegg <tclegg@veritasgenetics.com>
Thu, 16 May 2019 18:09:40 +0000 (14:09 -0400)
committerTom Clegg <tclegg@veritasgenetics.com>
Mon, 17 Jun 2019 13:54:39 +0000 (09:54 -0400)
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

apps/workbench/app/models/arvados_api_client.rb

index 5a8fd518d386ec89125552c9fe17730e0488d4c4..ce91cd3057bf4915d8e673af9c93e9ec6fbea75d 100644 (file)
@@ -113,11 +113,13 @@ class ArvadosApiClient
     # Clean up /arvados/v1/../../discovery/v1 to /discovery/v1
     url.sub! '/arvados/v1/../../', '/'
 
+    anon_tokens = [Rails.configuration.anonymous_user_token].select { |x| x && include_anon_token }
+
     query = {
       'reader_tokens' => ((tokens[:reader_tokens] ||
                            Thread.current[:reader_tokens] ||
                            []) +
-                          (include_anon_token ? [Rails.configuration.anonymous_user_token] : [])).to_json,
+                          anon_tokens).to_json,
     }
     if !data.nil?
       data.each do |k,v|