8079: Added support get using uuid and list using uuid or api_token and added tests.

[arvados.git] / services / api / app / controllers / arvados / v1 / keep_services_controller.rb

diff --git a/services/api/app/controllers/arvados/v1/keep_services_controller.rb b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
index 2cb68fdd70c01482b548b4f46055f88e56e21b07..d2a512bde75f68c790360813b47872b748481be1 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@ -10,10 +10,10 @@ class Arvados::V1::KeepServicesController < ApplicationController
   end
 
   def accessible
-    if request.headers['X-Keep-Proxy-Required']
+    if request.headers['X-External-Client'] == '1'
       @objects = model_class.where('service_type=?', 'proxy')
     else
-      @objects = model_class.where('service_type=?', 'disk')
+      @objects = model_class.where(model_class.arel_table[:service_type].not_eq('proxy'))
     end
     render_list
   end