projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '13076-r-autogen-api'
[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 1d7dc417da7eb0891037811772abd57ced8b5d81..49638677b18cddaeb9f27501c9d02f58d34a93f2 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
@@
-91,9
+95,7
@@
module CurrentApiClient
User.all.collect(&:uuid).each do |user_uuid|
Link.create!(link_class: 'permission',
name: 'can_manage',
User.all.collect(&:uuid).each do |user_uuid|
Link.create!(link_class: 'permission',
name: 'can_manage',
- tail_kind: 'arvados#group',
tail_uuid: system_group_uuid,
tail_uuid: system_group_uuid,
- head_kind: 'arvados#user',
head_uuid: user_uuid)
end
end
head_uuid: user_uuid)
end
end
@@
-132,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