Fix incorrectly resolved conflicts in artifacts API

lib/api/job_artifacts.rb

@@ -6,16 +6,18 @@ module API
       requires :id, type: String, desc: 'The ID of a project'
     end
     resource :projects, requirements: API::PROJECT_ENDPOINT_REQUIREMENTS do
-      desc 'Download the artifacts file from a job' do
+      desc 'Download the artifacts archive from a job' do
         detail 'This feature was introduced in GitLab 8.10'
       end
       params do
         requires :ref_name, type: String, desc: 'The ref from repository'
         requires :job,      type: String, desc: 'The name for the job'
       end
+      route_setting :authentication, job_token_allowed: true
       get ':id/jobs/artifacts/:ref_name/download',
         requirements: { ref_name: /.+/ } do
         authorize_read_builds!
+        check_cross_project_pipelines_feature!
 
         builds = user_project.latest_successful_builds_for(params[:ref_name])
         latest_build = builds.find_by!(name: params[:job])
@@ -23,14 +25,16 @@ module API
         present_artifacts!(latest_build.artifacts_file)
       end
 
-      desc 'Download the artifacts file from a job' do
+      desc 'Download the artifacts archive from a job' do
         detail 'This feature was introduced in GitLab 8.5'
       end
       params do
         requires :job_id, type: Integer, desc: 'The ID of a job'
       end
+      route_setting :authentication, job_token_allowed: true
       get ':id/jobs/:job_id/artifacts' do
         authorize_read_builds!
+        check_cross_project_pipelines_feature!
 
         build = find_build!(params[:job_id])
 
@@ -76,5 +80,13 @@ module API
         present build, with: Entities::Job
       end
     end
+
+    helpers do
+      def check_cross_project_pipelines_feature!
+        if job_token_authentication? && !@project.feature_available?(:cross_project_pipelines)
+          not_found!('Project')
+        end
+      end
+    end
   end
 end

lib/api/jobs.rb

@@ -71,41 +71,6 @@ module API
         present build, with: Entities::Job
       end
 
-      desc 'Download the artifacts file from a job' do
-        detail 'This feature was introduced in GitLab 8.5'
-      end
-      params do
-        requires :job_id, type: Integer, desc: 'The ID of a job'
-      end
-      route_setting :authentication, job_token_allowed: true
-      get ':id/jobs/:job_id/artifacts' do
-        authorize_read_builds!
-        check_cross_project_pipelines_feature!
-
-        build = get_build!(params[:job_id])
-
-        present_artifacts!(build.artifacts_file)
-      end
-
-      desc 'Download the artifacts file from a job' do
-        detail 'This feature was introduced in GitLab 8.10'
-      end
-      params do
-        requires :ref_name, type: String, desc: 'The ref from repository'
-        requires :job,      type: String, desc: 'The name for the job'
-      end
-      route_setting :authentication, job_token_allowed: true
-      get ':id/jobs/artifacts/:ref_name/download',
-        requirements: { ref_name: /.+/ } do
-        authorize_read_builds!
-        check_cross_project_pipelines_feature!
-
-        builds = user_project.latest_successful_builds_for(params[:ref_name])
-        latest_build = builds.find_by!(name: params[:job])
-
-        present_artifacts!(latest_build.artifacts_file)
-      end
-
       # TODO: We should use `present_file!` and leave this implementation for backward compatibility (when build trace
       #       is saved in the DB instead of file). But before that, we need to consider how to replace the value of
       #       `runners_token` with some mask (like `xxxxxx`) when sending trace file directly by workhorse.
@@ -211,18 +176,6 @@ module API
 
         builds.where(status: available_statuses && scope)
       end
-
-      def authorize_read_builds!
-        authorize! :read_build, user_project
-      end
-
-      def authorize_update_builds!
-        authorize! :update_build, user_project
-      end
-
-      def check_cross_project_pipelines_feature!
-        not_found!('Project') if job_token_authentication? && !@project.feature_available?(:cross_project_pipelines)
-      end
     end
   end
 end