projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18027-unmount-fuse'
[arvados.git]
/
services
/
api
/
app
/
controllers
/
arvados
/
v1
/
api_client_authorizations_controller.rb
diff --git
a/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
b/services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
index 59e359232e834fbeb1f12a9c6daec6c52168debd..22bcb6c1d5ccb1457a89fb21ba91c33b0212f9cf 100644
(file)
--- a/
services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
+++ b/
services/api/app/controllers/arvados/v1/api_client_authorizations_controller.rb
@@
-17,6
+17,7
@@
class Arvados::V1::ApiClientAuthorizationsController < ApplicationController
scopes: {type: 'array', required: false}
}
end
scopes: {type: 'array', required: false}
}
end
+
def create_system_auth
@object = ApiClientAuthorization.
new(user_id: system_user.id,
def create_system_auth
@object = ApiClientAuthorization.
new(user_id: system_user.id,
@@
-48,7
+49,12
@@
class Arvados::V1::ApiClientAuthorizationsController < ApplicationController
end
def current
end
def current
- @object = Thread.current[:api_client_authorization]
+ @object = Thread.current[:api_client_authorization].dup
+ if params[:remote]
+ # Client is validating a salted token. Don't return the unsalted
+ # secret!
+ @object.api_token = nil
+ end
show
end
show
end