Add avatar image to webfinger responses (#26558)
This commit is contained in:
		
							parent
							
								
									40b69cc1cd
								
							
						
					
					
						commit
						336ec503c2
					
				
					 2 changed files with 89 additions and 12 deletions
				
			
		|  | @ -3,6 +3,8 @@ | |||
| require 'rails_helper' | ||||
| 
 | ||||
| describe WellKnown::WebfingerController do | ||||
|   include RoutingHelper | ||||
| 
 | ||||
|   render_views | ||||
| 
 | ||||
|   describe 'GET #show' do | ||||
|  | @ -167,5 +169,67 @@ describe WellKnown::WebfingerController do | |||
|         expect(response).to have_http_status(400) | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     context 'when an account has an avatar' do | ||||
|       let(:alice) { Fabricate(:account, username: 'alice', avatar: attachment_fixture('attachment.jpg')) } | ||||
|       let(:resource) { alice.to_webfinger_s } | ||||
| 
 | ||||
|       it 'returns avatar in response' do | ||||
|         perform_show! | ||||
| 
 | ||||
|         avatar_link = get_avatar_link(body_as_json) | ||||
|         expect(avatar_link).to_not be_nil | ||||
|         expect(avatar_link[:type]).to eq alice.avatar.content_type | ||||
|         expect(avatar_link[:href]).to eq full_asset_url(alice.avatar) | ||||
|       end | ||||
| 
 | ||||
|       context 'with limited federation mode' do | ||||
|         before do | ||||
|           allow(Rails.configuration.x).to receive(:limited_federation_mode).and_return(true) | ||||
|         end | ||||
| 
 | ||||
|         it 'does not return avatar in response' do | ||||
|           perform_show! | ||||
| 
 | ||||
|           avatar_link = get_avatar_link(body_as_json) | ||||
|           expect(avatar_link).to be_nil | ||||
|         end | ||||
|       end | ||||
| 
 | ||||
|       context 'when enabling DISALLOW_UNAUTHENTICATED_API_ACCESS' do | ||||
|         around do |example| | ||||
|           ClimateControl.modify DISALLOW_UNAUTHENTICATED_API_ACCESS: 'true' do | ||||
|             example.run | ||||
|           end | ||||
|         end | ||||
| 
 | ||||
|         it 'does not return avatar in response' do | ||||
|           perform_show! | ||||
| 
 | ||||
|           avatar_link = get_avatar_link(body_as_json) | ||||
|           expect(avatar_link).to be_nil | ||||
|         end | ||||
|       end | ||||
|     end | ||||
| 
 | ||||
|     context 'when an account does not have an avatar' do | ||||
|       let(:alice) { Fabricate(:account, username: 'alice', avatar: nil) } | ||||
|       let(:resource) { alice.to_webfinger_s } | ||||
| 
 | ||||
|       before do | ||||
|         perform_show! | ||||
|       end | ||||
| 
 | ||||
|       it 'does not return avatar in response' do | ||||
|         avatar_link = get_avatar_link(body_as_json) | ||||
|         expect(avatar_link).to be_nil | ||||
|       end | ||||
|     end | ||||
|   end | ||||
| 
 | ||||
|   private | ||||
| 
 | ||||
|   def get_avatar_link(json) | ||||
|     json[:links].find { |link| link[:rel] == 'http://webfinger.net/rel/avatar' } | ||||
|   end | ||||
| end | ||||
|  |  | |||
		Reference in a new issue