X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/39f5ca6f38aa5aa6b00479bcfb93e0a9a5cf511c..20abd5d545f9f1102bcd28ee4cab7a2453e28cb4:/services/api/app/controllers/arvados/v1/schema_controller.rb diff --git a/services/api/app/controllers/arvados/v1/schema_controller.rb b/services/api/app/controllers/arvados/v1/schema_controller.rb index eccee8a70b..c108fb898d 100644 --- a/services/api/app/controllers/arvados/v1/schema_controller.rb +++ b/services/api/app/controllers/arvados/v1/schema_controller.rb @@ -1,6 +1,11 @@ class Arvados::V1::SchemaController < ApplicationController + skip_before_filter :catch_redirect_hint skip_before_filter :find_objects_for_index skip_before_filter :find_object_by_uuid + skip_before_filter :load_filters_param + skip_before_filter :load_limit_offset_order_params + skip_before_filter :load_read_auths + skip_before_filter :load_where_param skip_before_filter :render_404_if_no_object skip_before_filter :require_auth_scope @@ -20,12 +25,14 @@ class Arvados::V1::SchemaController < ApplicationController title: "Arvados API", description: "The API to interact with Arvados.", documentationLink: "http://doc.arvados.org/api/index.html", + defaultCollectionReplication: Rails.configuration.default_collection_replication, protocol: "rest", baseUrl: root_url + "arvados/v1/", basePath: "/arvados/v1/", rootUrl: root_url, servicePath: "arvados/v1/", batchPath: "batch", + defaultTrashLifetime: Rails.application.config.default_trash_lifetime, parameters: { alt: { type: "string", @@ -58,10 +65,10 @@ class Arvados::V1::SchemaController < ApplicationController auth: { oauth2: { scopes: { - "https://api.clinicalfuture.com/auth/arvados" => { + "https://api.curoverse.com/auth/arvados" => { description: "View and manage objects" }, - "https://api.clinicalfuture.com/auth/arvados.readonly" => { + "https://api.curoverse.com/auth/arvados.readonly" => { description: "View objects" } } @@ -171,8 +178,8 @@ class Arvados::V1::SchemaController < ApplicationController "$ref" => k.to_s }, scopes: [ - "https://api.clinicalfuture.com/auth/arvados", - "https://api.clinicalfuture.com/auth/arvados.readonly" + "https://api.curoverse.com/auth/arvados", + "https://api.curoverse.com/auth/arvados.readonly" ] }, list: { @@ -248,8 +255,8 @@ class Arvados::V1::SchemaController < ApplicationController "$ref" => "#{k.to_s}List" }, scopes: [ - "https://api.clinicalfuture.com/auth/arvados", - "https://api.clinicalfuture.com/auth/arvados.readonly" + "https://api.curoverse.com/auth/arvados", + "https://api.curoverse.com/auth/arvados.readonly" ] }, create: { @@ -270,7 +277,7 @@ class Arvados::V1::SchemaController < ApplicationController "$ref" => k.to_s }, scopes: [ - "https://api.clinicalfuture.com/auth/arvados" + "https://api.curoverse.com/auth/arvados" ] }, update: { @@ -298,7 +305,7 @@ class Arvados::V1::SchemaController < ApplicationController "$ref" => k.to_s }, scopes: [ - "https://api.clinicalfuture.com/auth/arvados" + "https://api.curoverse.com/auth/arvados" ] }, delete: { @@ -318,7 +325,7 @@ class Arvados::V1::SchemaController < ApplicationController "$ref" => k.to_s }, scopes: [ - "https://api.clinicalfuture.com/auth/arvados" + "https://api.curoverse.com/auth/arvados" ] } } @@ -345,7 +352,7 @@ class Arvados::V1::SchemaController < ApplicationController "$ref" => (action == 'index' ? "#{k.to_s}List" : k.to_s) }, scopes: [ - "https://api.clinicalfuture.com/auth/arvados" + "https://api.curoverse.com/auth/arvados" ] } route.segment_keys.each do |key| @@ -390,6 +397,6 @@ class Arvados::V1::SchemaController < ApplicationController end discovery end - render json: discovery + send_json discovery end end