projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18323-cwl-gpu2' refs #18323
[arvados.git]
/
apps
/
workbench
/
app
/
models
/
arvados_api_client.rb
diff --git
a/apps/workbench/app/models/arvados_api_client.rb
b/apps/workbench/app/models/arvados_api_client.rb
index 3f619c9740387d94a5493830f6c933b12b3e9bd6..3c9bfa793daa5a8ba143cbbf8fc40122654b6fff 100644
(file)
--- a/
apps/workbench/app/models/arvados_api_client.rb
+++ b/
apps/workbench/app/models/arvados_api_client.rb
@@
-61,7
+61,7
@@
class ArvadosApiClient
404 => NotFoundException,
}
404 => NotFoundException,
}
- @@profiling_enabled = Rails.configuration.
profiling_e
nabled
+ @@profiling_enabled = Rails.configuration.
Workbench.ProfilingE
nabled
@@discovery = nil
# An API client object suitable for handling API requests on behalf
@@discovery = nil
# An API client object suitable for handling API requests on behalf
@@
-101,7
+101,7
@@
class ArvadosApiClient
.select { |ca_path| File.readable?(ca_path) }
.each { |ca_path| @api_client.ssl_config.add_trust_ca(ca_path) }
end
.select { |ca_path| File.readable?(ca_path) }
.each { |ca_path| @api_client.ssl_config.add_trust_ca(ca_path) }
end
- if Rails.configuration.
api_response_c
ompression
+ if Rails.configuration.
Workbench.APIResponseC
ompression
@api_client.transparent_gzip_decompression = true
end
end
@api_client.transparent_gzip_decompression = true
end
end
@@
-235,15
+235,13
@@
class ArvadosApiClient
end
def arvados_login_url(params={})
end
def arvados_login_url(params={})
- if Rails.configuration.respond_to? :arvados_login_base
- uri = Rails.configuration.Services.Controller.ExternalURL.to_s + "/login"
+ uri = URI.parse(Rails.configuration.Services.Controller.ExternalURL.to_s)
+ if Rails.configuration.testing_override_login_url
+ uri = URI(Rails.configuration.testing_override_login_url)
end
end
- if params.size > 0
- uri += '?' << params.collect { |k,v|
- CGI.escape(k.to_s) + '=' + CGI.escape(v.to_s)
- }.join('&')
- end
- uri
+ uri.path = "/login"
+ uri.query = URI.encode_www_form(params)
+ uri.to_s
end
def arvados_logout_url(params={})
end
def arvados_logout_url(params={})
@@
-251,7
+249,11
@@
class ArvadosApiClient
end
def arvados_v1_base
end
def arvados_v1_base
- Rails.configuration.Services.Controller.ExternalURL.to_s + "/arvados/v1"
+ # workaround Ruby 2.3 bug, can't duplicate URI objects
+ # https://github.com/httprb/http/issues/388
+ u = URI.parse(Rails.configuration.Services.Controller.ExternalURL.to_s)
+ u.path = "/arvados/v1"
+ u.to_s
end
def discovery
end
def discovery