diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 15:14:27 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-01 15:14:27 +0000 |
commit | afbaf78b0d819326741a01b093bdbc4702570417 (patch) | |
tree | a16a6f2a8fcc18e60f25ac72df6ab22cfe0eae79 /lib/api | |
parent | 38b3003b67db3f2eadfa81fd28b13d168f665766 (diff) | |
download | gitlab-ce-afbaf78b0d819326741a01b093bdbc4702570417.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-ee
Diffstat (limited to 'lib/api')
-rw-r--r-- | lib/api/composer_packages.rb | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/api/composer_packages.rb b/lib/api/composer_packages.rb index ec7585363e2..bd8d9b68858 100644 --- a/lib/api/composer_packages.rb +++ b/lib/api/composer_packages.rb @@ -47,8 +47,12 @@ module API end end + def composer_v2? + headers['User-Agent'].to_s.include?('Composer/2') + end + def presenter - @presenter ||= ::Packages::Composer::PackagesPresenter.new(user_group, packages) + @presenter ||= ::Packages::Composer::PackagesPresenter.new(user_group, packages, composer_v2?) end end @@ -66,33 +70,25 @@ module API end desc 'Composer packages endpoint at group level' - route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true - get ':id/-/packages/composer/packages' do presenter.root end desc 'Composer packages endpoint at group level for packages list' - params do requires :sha, type: String, desc: 'Shasum of current json' end - route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true - get ':id/-/packages/composer/p/:sha' do presenter.provider end - desc 'Composer packages endpoint at group level for package versions metadata' - + desc 'Composer v2 packages p2 endpoint at group level for package versions metadata' params do requires :package_name, type: String, file_path: true, desc: 'The Composer package name' end - route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true - get ':id/-/packages/composer/p2/*package_name', requirements: COMPOSER_ENDPOINT_REQUIREMENTS, file_path: true do not_found! if packages.empty? @@ -100,13 +96,10 @@ module API end desc 'Composer packages endpoint at group level for package versions metadata' - params do requires :package_name, type: String, file_path: true, desc: 'The Composer package name' end - route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true - get ':id/-/packages/composer/*package_name', requirements: COMPOSER_ENDPOINT_REQUIREMENTS, file_path: true do not_found! if packages.empty? not_found! if params[:sha].blank? @@ -125,7 +118,6 @@ module API end desc 'Composer packages endpoint for registering packages' - namespace ':id/packages/composer' do route_setting :authentication, job_token_allowed: true, basic_auth_personal_access_token: true @@ -134,7 +126,6 @@ module API optional :tag, type: String, desc: 'The name of the tag' exactly_one_of :tag, :branch end - post do authorize_create_package!(authorized_user_project) @@ -159,7 +150,6 @@ module API requires :sha, type: String, desc: 'Shasum of current json' requires :package_name, type: String, file_path: true, desc: 'The Composer package name' end - get 'archives/*package_name' do metadata = unauthorized_user_project .packages |