Merge branch 'master' into 14930-arvput-trash-at

[arvados.git] / services / api / app / models / api_client_authorization.rb

diff --git a/services/api/app/models/api_client_authorization.rb b/services/api/app/models/api_client_authorization.rb
index 69d2945fc1cac5bfab95cd346fa545ae153e8dc3..7645d1597ca726579dd91ead5285a9f0253c3873 100644 (file)
--- a/services/api/app/models/api_client_authorization.rb
+++ b/services/api/app/models/api_client_authorization.rb
@@ -87,7 +87,7 @@ class ApiClientAuthorization < ArvadosModel
   end
 
   def self.remote_host(uuid_prefix:)
-    Rails.configuration.RemoteClusters[uuid_prefix].Host ||
+    (Rails.configuration.RemoteClusters[uuid_prefix].andand.Host) ||
       (Rails.configuration.RemoteClusters["*"].Proxy &&
        uuid_prefix+".arvadosapi.com")
   end