projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14812: Config migration WIP
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
collections_controller.rb
diff --git
a/apps/workbench/app/controllers/collections_controller.rb
b/apps/workbench/app/controllers/collections_controller.rb
index 8d7e6ee332af5e3cf53dac674e6185626f43d413..2c8cf7e443a650f645571675a55d81c6dcd2be1e 100644
(file)
--- a/
apps/workbench/app/controllers/collections_controller.rb
+++ b/
apps/workbench/app/controllers/collections_controller.rb
@@
-10,7
+10,7
@@
class CollectionsController < ApplicationController
include ActionController::Live
skip_around_action :require_thread_api_token, if: proc { |ctrl|
include ActionController::Live
skip_around_action :require_thread_api_token, if: proc { |ctrl|
-
Rails.configuration.anonymous_user_token
and
+
!Rails.configuration.Users.AnonymousUserToken.empty?
and
'show' == ctrl.action_name
}
skip_around_action(:require_thread_api_token,
'show' == ctrl.action_name
}
skip_around_action(:require_thread_api_token,
@@
-124,7
+124,8
@@
class CollectionsController < ApplicationController
# Otherwise, it's impossible to know whether any other request succeeded
# because of the reader token.
coll = nil
# Otherwise, it's impossible to know whether any other request succeeded
# because of the reader token.
coll = nil
- tokens = [(Rails.configuration.anonymous_user_token || nil),
+ tokens = [(if !Rails.configuration.Users.AnonymousUserToken.empty? then
+ Rails.configuration.Users.AnonymousUserToken else nil end),
params[:reader_token],
Thread.current[:arvados_api_token]].compact
usable_token = find_usable_token(tokens) do
params[:reader_token],
Thread.current[:arvados_api_token]].compact
usable_token = find_usable_token(tokens) do
@@
-138,7
+139,7
@@
class CollectionsController < ApplicationController
opts = {}
if usable_token == params[:reader_token]
opts[:path_token] = usable_token
opts = {}
if usable_token == params[:reader_token]
opts[:path_token] = usable_token
- elsif usable_token == Rails.configuration.
anonymous_user_t
oken
+ elsif usable_token == Rails.configuration.
Users.AnonymousUserT
oken
# Don't pass a token at all
else
# We pass the current user's real token only if it's necessary
# Don't pass a token at all
else
# We pass the current user's real token only if it's necessary