Merge branch 'kassio/fix-group-avatar-api' into 'master'

Fix Group avatar API endpoint

See merge request gitlab-org/gitlab!64804

lib/api/group_avatar.rb

@@ -18,17 +18,15 @@ module API
 
         not_found!('Avatar') if avatar.blank?
 
-        filename = File.basename(avatar.file.file)
-
         header(
           'Content-Disposition',
           ActionDispatch::Http::ContentDisposition.format(
             disposition: 'attachment',
-            filename: filename
+            filename: avatar.filename
           )
         )
 
-        present_carrierwave_file!(user_group.avatar)
+        present_carrierwave_file!(avatar)
       end
     end
   end

spec/requests/api/group_avatar_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe API::GroupAvatar do
 
   describe 'GET /groups/:id/avatar' do
     context 'when the group is public' do
-      it 'retrieves the avatar successfully' do
-        group = create(:group, :public, :with_avatar)
+      let(:group) { create(:group, :public, :with_avatar) }
 
+      it 'retrieves the avatar successfully' do
         get api(avatar_path(group))
 
         expect(response).to have_gitlab_http_status(:ok)
@@ -19,6 +19,22 @@ RSpec.describe API::GroupAvatar do
           .to eq(%(attachment; filename="dk.png"; filename*=UTF-8''dk.png))
       end
 
+      context 'when the avatar is in the object storage' do
+        before do
+          stub_uploads_object_storage(AvatarUploader)
+
+          group.avatar.migrate!(ObjectStorage::Store::REMOTE)
+        end
+
+        it 'redirects to the file in the object storage' do
+          get api(avatar_path(group))
+
+          expect(response).to have_gitlab_http_status(:found)
+          expect(response.headers['Content-Disposition'])
+            .to eq(%(attachment; filename="dk.png"; filename*=UTF-8''dk.png))
+        end
+      end
+
       context 'when the group does not have avatar' do
         it 'returns :not_found' do
           group = create(:group, :public)