[ARVADOS] updated: fada1a2d5776e9ea5e7555a81bf256185121cef3
git at public.curoverse.com
git at public.curoverse.com
Tue Jun 24 23:39:51 EDT 2014
Summary of changes:
.../workbench/app/assets/javascripts/log_viewer.js | 2 +-
.../app/controllers/application_controller.rb | 9 +++++++--
.../app/controllers/user_agreements_controller.rb | 1 -
apps/workbench/app/models/arvados_api_client.rb | 2 +-
apps/workbench/app/models/arvados_base.rb | 2 +-
apps/workbench/app/models/user.rb | 6 ------
.../app/views/layouts/application.html.erb | 14 ++++++-------
apps/workbench/app/views/projects/index.html.erb | 2 +-
.../test/integration/anonymous_user_test.rb | 17 ++--------------
services/fuse/bin/arv-mount | 23 +++++++++++-----------
10 files changed, 31 insertions(+), 47 deletions(-)
via fada1a2d5776e9ea5e7555a81bf256185121cef3 (commit)
via 6d9a0d858c2efd91221b1a0824c205b8dadec5f9 (commit)
via e303d8b08598c3e58055e84661ae446f360a1e65 (commit)
via bfc0b74c4f4e5b6485393827735ff9a875d4d8ac (commit)
via f055851654b1aec999c98ca65b671fe44e5197f2 (commit)
via ca4fb4305f4c881232f8f69979b207cbbedc1b2f (commit)
via f573c35a8f829ac4624f4ef9fbe0d0178a734fa3 (commit)
from b4309a917dc31e993e147df6ef778e283496acc2 (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 fada1a2d5776e9ea5e7555a81bf256185121cef3
Merge: 6d9a0d8 bfc0b74
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 24 23:39:39 2014 -0400
Merge branch 'master' into 2659-anonymous-group
commit 6d9a0d858c2efd91221b1a0824c205b8dadec5f9
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 24 23:39:06 2014 -0400
2659: do not skip permit_anonymous_browsing_for_inactive_user in user agreements
diff --git a/apps/workbench/app/controllers/user_agreements_controller.rb b/apps/workbench/app/controllers/user_agreements_controller.rb
index 0ba2b53..1ae7d22 100644
--- a/apps/workbench/app/controllers/user_agreements_controller.rb
+++ b/apps/workbench/app/controllers/user_agreements_controller.rb
@@ -1,6 +1,5 @@
class UserAgreementsController < ApplicationController
skip_before_filter :permit_anonymous_browsing_if_no_thread_token
- skip_before_filter :permit_anonymous_browsing_for_inactive_user
skip_before_filter :check_user_agreements
skip_before_filter :find_object_by_uuid
def model_class
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index b82df00..d956e66 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -183,7 +183,7 @@
</div><!-- /.navbar-collapse -->
</nav>
- <% if current_user.andand.is_active || (current_user && anonymous_browsing_enabled)%>
+ <% if current_user.andand.is_active || (current_user && anonymous_browsing_enabled) %>
<nav class="navbar navbar-default breadcrumbs" role="navigation">
<ul class="nav navbar-nav navbar-left">
<li class="dropdown">
commit e303d8b08598c3e58055e84661ae446f360a1e65
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 24 23:21:24 2014 -0400
2659: is_anonymous is converted into a helper method on the application controller
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index 643369f..23f6205 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -930,8 +930,13 @@ class ApplicationController < ActionController::Base
@objects_for
end
- helper_method :anonymous_login_enabled
- def anonymous_login_enabled
+ helper_method :is_anonymous
+ def is_anonymous
+ return Rails.configuration.anonymous_user_token && (Thread.current[:arvados_anonymous_api_token] == Thread.current[:arvados_api_token])
+ end
+
+ helper_method :anonymous_browsing_enabled
+ def anonymous_browsing_enabled
# to avoid the case where bogus anonymous token is configured,
# safer to check this object which is set after token verification
return Thread.current[:arvados_anonymous_api_token] && Rails.configuration.anonymous_user_token
diff --git a/apps/workbench/app/models/user.rb b/apps/workbench/app/models/user.rb
index 9ab9f86..b990947 100644
--- a/apps/workbench/app/models/user.rb
+++ b/apps/workbench/app/models/user.rb
@@ -48,10 +48,4 @@ class User < ArvadosBase
def self.setup params
arvados_api_client.api(self, "/setup", params)
end
-
- def is_anonymous
- return Rails.configuration.anonymous_user_token &&
- (Thread.current[:arvados_api_token] == Thread.current[:arvados_anonymous_api_token])
- end
-
end
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index fa9f1e2..b82df00 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -53,7 +53,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><%= Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %>
- <% if current_user && !current_user.is_active && anonymous_login_enabled %> You are viewing public data. <% end %>
+ <% if current_user && !current_user.is_active && anonymous_browsing_enabled %> You are viewing public data. <% end %>
</a>
</div>
@@ -77,7 +77,7 @@
-->
<% if current_user %>
- <% if !current_user.is_anonymous %>
+ <% if !is_anonymous %>
<li class="dropdown notification-menu">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" id="notifications-menu">
<span class="badge badge-alert notification-count"><%= @notification_count %></span>
@@ -90,7 +90,7 @@
<li role="presentation" class="divider"></li>
<% end %>
- <% if anonymous_login_enabled && !current_user.is_active %>
+ <% if anonymous_browsing_enabled && !current_user.is_active %>
<% if !current_user.is_invited %>
<li role="presentation"><a href="/users/welcome" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Not active </a></li>
<% else %>
@@ -117,7 +117,7 @@
</ul>
</li>
<% else %>
- <% if current_user.is_anonymous %>
+ <% if is_anonymous %>
<li><a href="<%= arvados_api_client.arvados_login_url(return_to: root_url) %>">Log in</a></li>
<% end %>
<% end %>
@@ -183,7 +183,7 @@
</div><!-- /.navbar-collapse -->
</nav>
- <% if current_user.andand.is_active || (current_user && anonymous_login_enabled)%>
+ <% if current_user.andand.is_active || (current_user && anonymous_browsing_enabled)%>
<nav class="navbar navbar-default breadcrumbs" role="navigation">
<ul class="nav navbar-nav navbar-left">
<li class="dropdown">
diff --git a/apps/workbench/app/views/projects/index.html.erb b/apps/workbench/app/views/projects/index.html.erb
index 927b53e..878eaa3 100644
--- a/apps/workbench/app/views/projects/index.html.erb
+++ b/apps/workbench/app/views/projects/index.html.erb
@@ -45,7 +45,7 @@
</div>
</div>
<% elsif current_user %>
- <% if current_user.is_anonymous %>
+ <% if is_anonymous %>
<div class="panel panel-default">
<div class="panel-body">
<p>
diff --git a/apps/workbench/test/integration/anonymous_user_test.rb b/apps/workbench/test/integration/anonymous_user_test.rb
index b9e5b6e..01cc4de 100644
--- a/apps/workbench/test/integration/anonymous_user_test.rb
+++ b/apps/workbench/test/integration/anonymous_user_test.rb
@@ -23,7 +23,7 @@ class AnonymousUserTest < ActionDispatch::IntegrationTest
assert page.has_link? "#{user['email']}"
find('a', text: "#{user['email']}").click
within('.dropdown-menu') do
- page.has_link? ('Logout')
+ page.has_link? ('Log out')
page.has_no_link? ('Not active')
page.has_no_link? ('Sign agreements')
page.has_link? ('Manage ssh keys')
@@ -38,7 +38,7 @@ class AnonymousUserTest < ActionDispatch::IntegrationTest
assert page.has_link? "#{user['email']}"
find('a', text: "#{user['email']}").click
within('.dropdown-menu') do
- page.has_link? ('Logout')
+ page.has_link? ('Log out')
if !invited
page.has_link? ('Not active')
else
@@ -130,7 +130,6 @@ class AnonymousUserTest < ActionDispatch::IntegrationTest
assert page.has_text? 'Your account is inactive'
end
- verify_logged_out_page = false
within('.navbar-fixed-top') do
assert page.has_no_text? 'You are viewing public data'
if !user
@@ -145,21 +144,9 @@ class AnonymousUserTest < ActionDispatch::IntegrationTest
page.has_no_link? ('Sign agreements')
end
page.has_link? ('Log out')
- find('a', text: "Log out").click
- verify_logged_out_page = true
end
end
end
-
- if verify_logged_out_page
- assert page.has_text? 'Goodbye'
- assert page.has_link? "Log in to #{Rails.configuration.site_name}"
- assert page.has_no_link? "Projects"
- within('.navbar-fixed-top') do
- assert page.has_no_text? 'You are viewing public data'
- assert page.has_link? "Log in"
- end
- end
end
[
commit f055851654b1aec999c98ca65b671fe44e5197f2
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 24 17:08:16 2014 -0400
2659: fix the incorrect usage of logout url
diff --git a/apps/workbench/app/models/arvados_api_client.rb b/apps/workbench/app/models/arvados_api_client.rb
index 008163a..25c54d1 100644
--- a/apps/workbench/app/models/arvados_api_client.rb
+++ b/apps/workbench/app/models/arvados_api_client.rb
@@ -175,7 +175,7 @@ class ArvadosApiClient
end
def arvados_logout_url(params={})
- "/user_sessions/logged_out"
+ arvados_login_url(params).sub('/login','/logout')
end
def arvados_v1_base
diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 700c5c2..43936a7 100644
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -300,7 +300,7 @@ class ArvadosBase < ActiveRecord::Base
end
def self.creatable?
- current_user && !current_user.is_anonymous
+ current_user && !current_user.is_active
end
def self.goes_in_projects?
diff --git a/apps/workbench/app/views/layouts/application.html.erb b/apps/workbench/app/views/layouts/application.html.erb
index 2a9eb11..fa9f1e2 100644
--- a/apps/workbench/app/views/layouts/application.html.erb
+++ b/apps/workbench/app/views/layouts/application.html.erb
@@ -104,8 +104,8 @@
<% end %>
<% end %>
<% end %>
-
- <li role="presentation"><a href="<%= logout_path %>" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Log out</a></li>
+ <% logged_out_url = root_url.chomp('/') + '/user_sessions/logged_out' %>
+ <li role="presentation"><a href="<%= arvados_api_client.arvados_logout_url(return_to: logged_out_url) %>" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Log out</a></li>
<% if current_user.is_active and
(@notifications || []).length > 0 %>
<li role="presentation" class="divider"></li>
commit ca4fb4305f4c881232f8f69979b207cbbedc1b2f
Merge: b4309a9 f573c35
Author: radhika <radhika at curoverse.com>
Date: Tue Jun 24 16:21:56 2014 -0400
Merge branch 'master' into 2659-anonymous-group
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list