projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 14946-ruby-2.5
[arvados.git]
/
services
/
api
/
lib
/
current_api_client.rb
diff --git
a/services/api/lib/current_api_client.rb
b/services/api/lib/current_api_client.rb
index 97348d5fb4b7a9458089016dc280778559365185..c7b48c0cdd6ff1ed0056a32e49f65c106afc100c 100644
(file)
--- a/
services/api/lib/current_api_client.rb
+++ b/
services/api/lib/current_api_client.rb
@@
-1,3
+1,7
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
$system_user = nil
$system_group = nil
$all_users_group = nil
$system_user = nil
$system_group = nil
$all_users_group = nil
@@
-38,25
+42,25
@@
module CurrentApiClient
end
def system_user_uuid
end
def system_user_uuid
- [
Server::Application.config.uuid_prefix
,
+ [
Rails.configuration.ClusterID
,
User.uuid_prefix,
'000000000000000'].join('-')
end
def system_group_uuid
User.uuid_prefix,
'000000000000000'].join('-')
end
def system_group_uuid
- [
Server::Application.config.uuid_prefix
,
+ [
Rails.configuration.ClusterID
,
Group.uuid_prefix,
'000000000000000'].join('-')
end
def anonymous_group_uuid
Group.uuid_prefix,
'000000000000000'].join('-')
end
def anonymous_group_uuid
- [
Server::Application.config.uuid_prefix
,
+ [
Rails.configuration.ClusterID
,
Group.uuid_prefix,
'anonymouspublic'].join('-')
end
def anonymous_user_uuid
Group.uuid_prefix,
'anonymouspublic'].join('-')
end
def anonymous_user_uuid
- [
Server::Application.config.uuid_prefix
,
+ [
Rails.configuration.ClusterID
,
User.uuid_prefix,
'anonymouspublic'].join('-')
end
User.uuid_prefix,
'anonymouspublic'].join('-')
end
@@
-101,7
+105,7
@@
module CurrentApiClient
end
def all_users_group_uuid
end
def all_users_group_uuid
- [
Server::Application.config.uuid_prefix
,
+ [
Rails.configuration.ClusterID
,
Group.uuid_prefix,
'fffffffffffffff'].join('-')
end
Group.uuid_prefix,
'fffffffffffffff'].join('-')
end
@@
-130,18
+134,12
@@
module CurrentApiClient
end
def act_as_user user
end
def act_as_user user
- #auth_was = Thread.current[:api_client_authorization]
user_was = Thread.current[:user]
Thread.current[:user] = user
user_was = Thread.current[:user]
Thread.current[:user] = user
- #Thread.current[:api_client_authorization] = ApiClientAuthorization.
- # where('user_id=? and scopes is null', user.id).
- # order('expires_at desc').
- # first
begin
yield
ensure
Thread.current[:user] = user_was
begin
yield
ensure
Thread.current[:user] = user_was
- #Thread.current[:api_client_authorization] = auth_was
end
end
end
end