Merge branch 'fj-fix-raw-snippet-endpoint' into 'master'

Return content from repo in snippet raw endpoint

See merge request gitlab-org/gitlab!29781

changelogs/unreleased/fj-fix-raw-snippet-endpoint.yml

+---
+title: Return content from repo in snippet raw endpoint
+merge_request: 29781
+author:
+type: fixed

lib/api/helpers/snippets_helpers.rb

+# frozen_string_literal: true
+
+module API
+  module Helpers
+    module SnippetsHelpers
+      def content_for(snippet)
+        if ::Feature.enabled?(:version_snippets, current_user) && !snippet.empty_repo?
+          blob = snippet.blobs.first
+          blob.load_all_data!
+          blob.data
+        else
+          snippet.content
+        end
+      end
+    end
+  end
+end

lib/api/project_snippets.rb

@@ -11,6 +11,7 @@ module API
       requires :id, type: String, desc: 'The ID of a project'
     end
     resource :projects, requirements: API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
+      helpers Helpers::SnippetsHelpers
       helpers do
         def check_snippets_enabled
           forbidden! unless user_project.feature_available?(:snippets, current_user)
@@ -155,7 +156,7 @@ module API
 
         env['api.format'] = :txt
         content_type 'text/plain'
-        present snippet.content
+        present content_for(snippet)
       end
       # rubocop: enable CodeReuse/ActiveRecord
 

lib/api/snippets.rb

@@ -8,6 +8,7 @@ module API
     before { authenticate! }
 
     resource :snippets do
+      helpers Helpers::SnippetsHelpers
       helpers do
         def snippets_for_current_user
           SnippetsFinder.new(current_user, author: current_user).execute
@@ -159,7 +160,7 @@ module API
         env['api.format'] = :txt
         content_type 'text/plain'
         header['Content-Disposition'] = 'attachment'
-        present snippet.content
+        present content_for(snippet)
       end
 
       desc 'Get the user agent details for a snippet' do

spec/requests/api/project_snippets_spec.rb

@@ -460,14 +460,13 @@ describe API::ProjectSnippets do
   end
 
   describe 'GET /projects/:project_id/snippets/:id/raw' do
-    let(:snippet) { create(:project_snippet, author: admin, project: project) }
+    let_it_be(:snippet) { create(:project_snippet, :repository, author: admin, project: project) }
 
     it 'returns raw text' do
       get api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/raw", admin)
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(response.content_type).to eq 'text/plain'
-      expect(response.body).to eq(snippet.content)
     end
 
     it 'returns 404 for invalid snippet id' do
@@ -482,5 +481,11 @@ describe API::ProjectSnippets do
         let(:request) { get api("/projects/#{project_no_snippets.id}/snippets/123/raw", admin) }
       end
     end
+
+    it_behaves_like 'snippet blob content' do
+      let_it_be(:snippet_with_empty_repo) { create(:project_snippet, :empty_repo, author: admin, project: project) }
+
+      subject { get api("/projects/#{snippet.project.id}/snippets/#{snippet.id}/raw", snippet.author) }
+    end
   end
 end

spec/requests/api/snippets_spec.rb

@@ -90,7 +90,7 @@ describe API::Snippets do
 
   describe 'GET /snippets/:id/raw' do
     let_it_be(:author) { create(:user) }
-    let_it_be(:snippet) { create(:personal_snippet, :private, author: author) }
+    let_it_be(:snippet) { create(:personal_snippet, :repository, :private, author: author) }
 
     it 'requires authentication' do
       get api("/snippets/#{snippet.id}", nil)
@@ -103,7 +103,6 @@ describe API::Snippets do
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(response.content_type).to eq 'text/plain'
-      expect(response.body).to eq(snippet.content)
     end
 
     it 'forces attachment content disposition' do
@@ -134,6 +133,12 @@ describe API::Snippets do
 
       expect(response).to have_gitlab_http_status(:ok)
     end
+
+    it_behaves_like 'snippet blob content' do
+      let_it_be(:snippet_with_empty_repo) { create(:personal_snippet, :empty_repo, :private, author: author) }
+
+      subject { get api("/snippets/#{snippet.id}/raw", snippet.author) }
+    end
   end
 
   describe 'GET /snippets/:id' do

spec/support/shared_examples/requests/snippet_shared_examples.rb

@@ -58,3 +58,31 @@ RSpec.shared_examples 'snippet response without repository URLs' do
     expect(json_response).not_to have_key('http_url_to_repo')
   end
 end
+
+RSpec.shared_examples 'snippet blob content' do
+  it 'returns content from repository' do
+    subject
+
+    expect(response.body).to eq(snippet.blobs.first.data)
+  end
+
+  context 'when feature flag :version_snippets is disabled' do
+    it 'returns content from database' do
+      stub_feature_flags(version_snippets: false)
+
+      subject
+
+      expect(response.body).to eq(snippet.content)
+    end
+  end
+
+  context 'when snippet repository is empty' do
+    let(:snippet) { snippet_with_empty_repo }
+
+    it 'returns content from database' do
+      subject
+
+      expect(response.body).to eq(snippet.content)
+    end
+  end
+end