X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ac7faac8ededb8df5c708180726686f9780184f6..ac5cd5913a208c463206d2fa6cf62e42148682a4:/services/api/app/controllers/arvados/v1/users_controller.rb diff --git a/services/api/app/controllers/arvados/v1/users_controller.rb b/services/api/app/controllers/arvados/v1/users_controller.rb index 441db9947e..58661a0e9a 100644 --- a/services/api/app/controllers/arvados/v1/users_controller.rb +++ b/services/api/app/controllers/arvados/v1/users_controller.rb @@ -1,4 +1,10 @@ class Arvados::V1::UsersController < ApplicationController + skip_before_filter :find_object_by_uuid, only: + [:activate, :event_stream, :current, :system, :setup] + skip_before_filter :render_404_if_no_object, only: + [:activate, :event_stream, :current, :system, :setup] + before_filter :admin_required, only: [:setup, :unsetup] + def current @object = current_user show @@ -23,7 +29,7 @@ class Arvados::V1::UsersController < ApplicationController end end end - + def event_stream channel = current_user.andand.uuid if current_user.andand.is_admin @@ -75,11 +81,64 @@ class Arvados::V1::UsersController < ApplicationController else logger.warn "User #{@object.uuid} called users.activate " + "before signing agreements #{todo_uuids.inspect}" - raise ArgumentError.new \ + raise ArvadosModel::PermissionDeniedError.new \ "Cannot activate without user agreements #{todo_uuids.inspect}." end end end show end + + # create user object and all the needed links + def setup + @object = nil + if params[:uuid] + @object = User.find_by_uuid params[:uuid] + if !@object + return render_404_if_no_object + end + object_found = true + else + if !params[:user] + raise ArgumentError.new "Required uuid or user" + else + if params[:user]['uuid'] + @object = User.find_by_uuid params[:user]['uuid'] + if @object + object_found = true + end + end + + if !@object + if !params[:user]['email'] + raise ArgumentError.new "Require user email" + end + + if !params[:openid_prefix] + raise ArgumentError.new "Required openid_prefix parameter is missing." + end + + @object = model_class.create! resource_attrs + end + end + end + + if object_found + @response = @object.setup_repo_vm_links params[:repo_name], + params[:vm_uuid], params[:openid_prefix] + else + @response = User.setup @object, params[:openid_prefix], + params[:repo_name], params[:vm_uuid] + end + + render json: { kind: "arvados#HashList", items: @response } + end + + # delete user agreements, vm, repository, login links; set state to inactive + def unsetup + reload_object_before_update + @object.unsetup + show + end + end