[ARVADOS] created: 1.1.0-187-g3d0daf1

[Git user]

        at  3d0daf1adcbdf863ae59ea5bb154c216c46b356a (commit)


commit 3d0daf1adcbdf863ae59ea5bb154c216c46b356a
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Nov 28 16:42:11 2017 -0300

    12662: Ignore anonymous user token when getting the current user
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index ac2fe3a..5a8fd51 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -82,7 +82,7 @@ class ArvadosApiClient
     @client_mtx = Mutex.new
   end
 
-  def api(resources_kind, action, data=nil, tokens={})
+  def api(resources_kind, action, data=nil, tokens={}, include_anon_token=true)
 
     profile_checkpoint
 
@@ -117,7 +117,7 @@ class ArvadosApiClient
       'reader_tokens' => ((tokens[:reader_tokens] ||
                            Thread.current[:reader_tokens] ||
                            []) +
-                          [Rails.configuration.anonymous_user_token]).to_json,
+                          (include_anon_token ? [Rails.configuration.anonymous_user_token] : [])).to_json,
     }
     if !data.nil?
       data.each do |k,v|
diff --git a/apps/workbench/app/models/user.rb b/apps/workbench/app/models/user.rb
index 10da22d..1f102db 100644
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -10,7 +10,7 @@ class User < ArvadosBase
   end
 
   def self.current
-    res = arvados_api_client.api self, '/current'
+    res = arvados_api_client.api self, '/current', nil, {}, false
     arvados_api_client.unpack_api_response(res)
   end
 

-----------------------------------------------------------------------


hooks/post-receive
--