projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '9804-drop-activity-pane'
[arvados.git]
/
services
/
api
/
config
/
routes.rb
diff --git
a/services/api/config/routes.rb
b/services/api/config/routes.rb
index c2cffd4e04627fd63aa35fa45690363277dfef8d..7bf75800b4af909e9537e845a1d40a43187fea9b 100644
(file)
--- a/
services/api/config/routes.rb
+++ b/
services/api/config/routes.rb
@@
-15,6
+15,7
@@
Server::Application.routes.draw do
namespace :v1 do
resources :api_client_authorizations do
post 'create_system_auth', on: :collection
namespace :v1 do
resources :api_client_authorizations do
post 'create_system_auth', on: :collection
+ get 'current', on: :collection
end
resources :api_clients
resources :authorized_keys
end
resources :api_clients
resources :authorized_keys
@@
-28,6
+29,10
@@
Server::Application.routes.draw do
end
resources :humans
resources :job_tasks
end
resources :humans
resources :job_tasks
+ resources :containers do
+ get 'auth', on: :member
+ end
+ resources :container_requests
resources :jobs do
get 'queue', on: :collection
get 'queue_size', on: :collection
resources :jobs do
get 'queue', on: :collection
get 'queue_size', on: :collection
@@
-47,6
+52,7
@@
Server::Application.routes.draw do
end
resources :pipeline_instances
resources :pipeline_templates
end
resources :pipeline_instances
resources :pipeline_templates
+ resources :workflows
resources :repositories do
get 'get_all_permissions', on: :collection
end
resources :repositories do
get 'get_all_permissions', on: :collection
end
@@
-71,9
+77,15
@@
Server::Application.routes.draw do
end
end
end
end
+ if Rails.env == 'test'
+ post '/database/reset', to: 'database#reset'
+ end
+
# omniauth
match '/auth/:provider/callback', :to => 'user_sessions#create'
match '/auth/failure', :to => 'user_sessions#failure'
# omniauth
match '/auth/:provider/callback', :to => 'user_sessions#create'
match '/auth/failure', :to => 'user_sessions#failure'
+ # not handled by omniauth provider -> 403 with no CORS headers.
+ get '/auth/*a', :to => 'user_sessions#cross_origin_forbidden'
# Custom logout
match '/login', :to => 'user_sessions#login'
# Custom logout
match '/login', :to => 'user_sessions#login'