Merge branch '2388-bogus-token-error-page'

[arvados.git] / services / api / config / routes.rb

diff --git a/services/api/config/routes.rb b/services/api/config/routes.rb
index 398645462a4b78a233ad921d910f12da02a60bfb..211701a05455edc6e3b05d03bd0823137247acec 100644 (file)
--- a/services/api/config/routes.rb
+++ b/services/api/config/routes.rb
@@ -1,4 +1,8 @@
 Server::Application.routes.draw do
+  themes_for_rails
+
+  resources :humans
+  resources :traits
   resources :repositories
   resources :virtual_machines
   resources :authorized_keys
@@ -77,15 +81,26 @@ Server::Application.routes.draw do
 
   namespace :arvados do
     namespace :v1 do
-      match '/schema' => 'schema#show'
       match '/nodes/:uuid/ping' => 'nodes#ping', :as => :ping_node
       match '/keep_disks/ping' => 'keep_disks#ping', :as => :ping_keep_disk
       match '/links/from/:tail_uuid' => 'links#index', :as => :arvados_v1_links_from
       match '/users/current' => 'users#current'
       match '/users/system' => 'users#system'
       match '/jobs/queue' => 'jobs#queue'
+      match '/jobs/:uuid/log_tail_follow' => 'jobs#log_tail_follow'
+      post '/jobs/:uuid/cancel' => 'jobs#cancel'
+      match '/users/:uuid/event_stream' => 'users#event_stream'
+      post '/users/:uuid/activate' => 'users#activate'
+      post '/users/setup' => 'users#setup'
+      post '/users/:uuid/unsetup' => 'users#unsetup'
       match '/virtual_machines/get_all_logins' => 'virtual_machines#get_all_logins'
+      match '/virtual_machines/:uuid/logins' => 'virtual_machines#logins'
+      post '/api_client_authorizations/create_system_auth' => 'api_client_authorizations#create_system_auth'
       match '/repositories/get_all_permissions' => 'repositories#get_all_permissions'
+      get '/user_agreements/signatures' => 'user_agreements#signatures'
+      post '/user_agreements/sign' => 'user_agreements#sign'
+      get '/collections/:uuid/provenance' => 'collections#provenance'
+      get '/collections/:uuid/used_by' => 'collections#used_by'
       resources :collections
       resources :links
       resources :nodes
@@ -95,12 +110,17 @@ Server::Application.routes.draw do
       resources :groups
       resources :logs
       resources :users
+      resources :api_clients
+      resources :api_client_authorizations
       resources :jobs
       resources :job_tasks
       resources :keep_disks
       resources :authorized_keys
       resources :virtual_machines
       resources :repositories
+      resources :traits
+      resources :humans
+      resources :user_agreements
     end
   end
 
@@ -112,7 +132,9 @@ Server::Application.routes.draw do
   match '/login', :to => 'user_sessions#login'
   match '/logout', :to => 'user_sessions#logout'
 
-  match '/discovery/v1/apis/arvados/v1/rest', :to => 'arvados/v1/schema#discovery_rest_description'
+  match '/discovery/v1/apis/arvados/v1/rest', :to => 'arvados/v1/schema#index'
+
+  match '/static/login_failure', :to => 'static#login_failure', :as => :login_failure
 
   # Send unroutable requests to an arbitrary controller
   # (ends up at ApplicationController#render_not_found)