Merge branch 'master' into 15572-new-install-docs

[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 d2a512bde75f68c790360813b47872b748481be1..c6e8894352f4f5f147c1d8e7f7d4c6d7db331aab 100644 (file)
--- a/services/api/app/controllers/arvados/v1/keep_services_controller.rb
+++ b/services/api/app/controllers/arvados/v1/keep_services_controller.rb
@@ -1,21 +1,25 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class Arvados::V1::KeepServicesController < ApplicationController
 
-  skip_before_filter :find_object_by_uuid, only: :accessible
-  skip_before_filter :render_404_if_no_object, only: :accessible
+  skip_before_action :find_object_by_uuid, only: :accessible
+  skip_before_action :render_404_if_no_object, only: :accessible
+  skip_before_action :require_auth_scope, only: :accessible
 
   def find_objects_for_index
     # all users can list all keep services
-    @objects = model_class.where('1=1')
+    @objects = KeepService.all
     super
   end
 
   def accessible
     if request.headers['X-External-Client'] == '1'
-      @objects = model_class.where('service_type=?', 'proxy')
+      @objects = KeepService.where('service_type=?', 'proxy')
     else
-      @objects = model_class.where(model_class.arel_table[:service_type].not_eq('proxy'))
+      @objects = KeepService.where('service_type<>?', 'proxy')
     end
     render_list
   end
-
 end