diff options
author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-17 13:58:03 -0400 |
---|---|---|
committer | Eugen <eugen@zeonfederated.com> | 2017-04-17 19:58:03 +0200 |
commit | 21a767dcfa2fba35a6bd641d7d7933f8734d41ee (patch) | |
tree | 5d1e9e18bf5338a99996d6a54ac9f9fdf50d2652 /config | |
parent | 3399dd7a666d755288cabf55fbb71b7276f6ffb7 (diff) |
Improve handling of HTTP_ACCEPT for webfinger (#2008)
This change includes: - Improve the spec coverage for incoming request to the webfinger action - For requests without an accept header (ie, what a browser might look like), return a JSON response. - For requests with an explicit format of xml or json, return that format. - For requests using an accept header, return that format. Also adds failing spec showing webfinger does not return xml, which covers the issue described in: https://github.com/tootsuite/mastodon/issues/1983
Diffstat (limited to 'config')
-rw-r--r-- | config/routes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes.rb b/config/routes.rb index fd186c320..4bb3393b8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,7 +16,7 @@ Rails.application.routes.draw do end get '.well-known/host-meta', to: 'well_known/host_meta#show', as: :host_meta, defaults: { format: 'xml' } - get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger, defaults: { format: 'json' } + get '.well-known/webfinger', to: 'well_known/webfinger#show', as: :webfinger devise_for :users, path: 'auth', controllers: { sessions: 'auth/sessions', |