Skip to content
Snippets Groups Projects
Verified Commit 08a7966d authored by Josianne Hyson's avatar Josianne Hyson :m:
Browse files

Add JWT support for internal Subscriptions API

We want to be able to authenticate with a JWT from CustomersDot when
accessing this endpoint. Migrate it to the internal API definition which
has JWT auth, and update the specs to account for this.

MR: !161552
Issue: https://gitlab.com/gitlab-org/gitlab/-/issues/466368
parent d98c63c0
No related branches found
No related tags found
2 merge requests!164749Enable parallel in test-on-omnibus,!161552Add JWT support for internal Subscriptions API
......@@ -7,9 +7,9 @@ class Subscriptions < ::API::Base
urgency :low
before do
authenticated_as_admin!
@namespace = find_namespace(params[:id])
@namespace = find_namespace!(params[:id])
not_found!('Namespace') unless @namespace
end
resource :namespaces, requirements: ::API::API::NAMESPACE_OR_PROJECT_REQUIREMENTS do
......
......@@ -74,7 +74,6 @@ module API
mount ::API::CodeSuggestions
mount ::API::Chat
mount ::API::DuoCodeReview
mount ::API::GitlabSubscriptions::Subscriptions
mount ::API::Internal::AppSec::Dast::SiteValidations
mount ::API::Internal::Search::Zoekt
......
......@@ -24,6 +24,7 @@ class API < ::API::Base
# 'internal/gitlab_subscriptions', in https://gitlab.com/gitlab-org/gitlab/-/issues/463741.
# They will then be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/473625.
mount ::API::GitlabSubscriptions::AddOnPurchases
mount ::API::GitlabSubscriptions::Subscriptions
# this API is deprecated, it will be removed in https://gitlab.com/gitlab-org/gitlab/-/issues/473625.
# Please use GitlabSubscriptions::API::Internal::UpcomingReconciliations instead.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment