[ARVADOS] updated: 96326e988977cd5147dcd4962d6c02bb43e7b330

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/controllers/application_controller.rb | 13 -------------
 apps/workbench/app/models/arvados_api_client.rb          |  8 +++-----
 apps/workbench/app/views/layouts/body.html.erb           |  2 +-
 3 files changed, 4 insertions(+), 19 deletions(-)

       via  96326e988977cd5147dcd4962d6c02bb43e7b330 (commit)
       via  d487907328f3581cd7c93f73729b1e089430523d (commit)
       via  16e6df55c039d4986cdf789b94c62840819beba7 (commit)
      from  7f2c45b1312014831e2efd8aa0fb8a116085b036 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 96326e988977cd5147dcd4962d6c02bb43e7b330
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 2 15:50:29 2015 -0500

    2659: anonymous token handling in api client updated

diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 4e2d964..904673f 100644
--- 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

commit d487907328f3581cd7c93f73729b1e089430523d
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 2 15:20:22 2015 -0500

    2659: no need for permit_anonymous_browsing_for_public_data filter; instead, directly use the anonymous token in arvados_api_client.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 3f36a31..02ae656 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -8,7 +8,6 @@ class ApplicationController < ActionController::Base
   ERROR_ACTIONS = [:render_error, :render_not_found]
 
   around_filter :thread_clear
-  before_filter :permit_anonymous_browsing_for_public_data
   around_filter :set_thread_api_token
   # Methods that don't require login should
   #   skip_around_filter :require_thread_api_token
@@ -530,7 +529,6 @@ class ApplicationController < ActionController::Base
   def setup_user_session
     return false unless params[:api_token]
     Thread.current[:arvados_api_token] = params[:api_token]
-    Thread.current[:arvados_anonymous_api_token] = nil
     begin
       user = User.current
     rescue ArvadosApiClient::NotLoggedInException
@@ -566,12 +564,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def permit_anonymous_browsing_for_public_data
-    if !Thread.current[:arvados_api_token] && !params[:api_token] && !session[:arvados_api_token]
-      Thread.current[:arvados_anonymous_api_token] = Rails.configuration.anonymous_user_token
-    end
-  end
-
   # Save the session API token in thread-local storage, and yield.
   # This method also takes care of session setup if the request
   # provides a valid api_token parameter.
diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index e596edd..4e2d964 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -122,8 +122,8 @@ class ArvadosApiClient
 
     # Use anonymous token if available when it is a GET request
     if ((query["_method"] == "GET") or (query[:_method] == "GET")) && !Thread.current[:user]
-      if Thread.current[:arvados_anonymous_api_token]
-        query["api_token"] = Thread.current[:arvados_anonymous_api_token]
+      if Rails.configuration.respond_to? :anonymous_user_token
+        query["api_token"] = Rails.configuration.anonymous_user_token
       end
     end
 

commit 16e6df55c039d4986cdf789b94c62840819beba7
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 2 15:06:31 2015 -0500

    2659: is_anonymous helper method is not needed anymore.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 7b36d7b..3f36a31 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -1089,9 +1089,4 @@ class ApplicationController < ActionController::Base
   def wiselinks_layout
     'body'
   end
-
-  helper_method :is_anonymous
-  def is_anonymous
-    return Thread.current[:arvados_anonymous_api_token]
-  end
 end
diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 06b373c..687dcfc 100644
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -51,7 +51,7 @@
                   <li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
                 <% end %>
                 <% end %>
-                <% if !is_anonymous %>
+                <% if current_user %>
                   <li role="menuitem"><a href="<%= logout_path %>" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Log out</a></li>
                 <% else %>
                   <li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>

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


hooks/post-receive
--