Commit baf03d1f8689da23e622b4ab087017e05841280f
1 parent
c5f8d13b
Exists in
federation-webfinger
Modifying request url for webfinger
Showing
1 changed file
with
2 additions
and
3 deletions
Show diff stats
app/models/concerns/external_user.rb
| 1 | require 'ostruct' | 1 | require 'ostruct' |
| 2 | -require 'rails/commands/server' | ||
| 3 | 2 | ||
| 4 | module ExternalUser | 3 | module ExternalUser |
| 5 | extend ActiveSupport::Concern | 4 | extend ActiveSupport::Concern |
| @@ -19,8 +18,8 @@ module ExternalUser | @@ -19,8 +18,8 @@ module ExternalUser | ||
| 19 | module ClassMethods | 18 | module ClassMethods |
| 20 | def webfinger_lookup(login, domain, environment) | 19 | def webfinger_lookup(login, domain, environment) |
| 21 | if login && domain && environment.has_federated_network?(domain) | 20 | if login && domain && environment.has_federated_network?(domain) |
| 22 | - rails = Rails::Server.new | ||
| 23 | - url = URI.parse('https://'+rails.options[:Host]+':'+rails.options[:Port].to_s+'/.well-known/webfinger?resource=acct:'+login+'@'+domain) | 21 | + url = URI.parse('https://'+ domain +'/.well-known/webfinger?resource=acct:'+ |
| 22 | + login+'@'+Environment.default.federated_networks.find_by_url(domain)) | ||
| 24 | req = Net::HTTP::Get.new(url.to_s) | 23 | req = Net::HTTP::Get.new(url.to_s) |
| 25 | res = Net::HTTP.start(url.host, url.port) { |http| http.request(req) } | 24 | res = Net::HTTP.start(url.host, url.port) { |http| http.request(req) } |
| 26 | JSON.parse(res.body) | 25 | JSON.parse(res.body) |