Commit d8d101a6 authored by Max Woolf's avatar Max Woolf Committed by Gabriel Mazetto

Move PAT API to CE

Moves PAT API endpoints from EE
Ultimate to CE for all users.
parent 4866577d
---
title: Move Personal Access Token API to Core
merge_request: 46145
author:
type: changed
...@@ -4,13 +4,14 @@ group: unassigned ...@@ -4,13 +4,14 @@ group: unassigned
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
--- ---
# Personal access tokens API **(ULTIMATE)** # Personal access tokens API
You can read more about [personal access tokens](../user/profile/personal_access_tokens.md#personal-access-tokens). You can read more about [personal access tokens](../user/profile/personal_access_tokens.md#personal-access-tokens).
## List personal access tokens ## List personal access tokens
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227264) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.3. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/227264) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 13.3.
> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/270200) to [GitLab Core](https://about.gitlab.com/pricing/) in 13.6.
Get a list of personal access tokens. Get a list of personal access tokens.
......
...@@ -136,7 +136,6 @@ class License < ApplicationRecord ...@@ -136,7 +136,6 @@ class License < ApplicationRecord
insights insights
issuable_health_status issuable_health_status
license_scanning license_scanning
personal_access_token_api_management
personal_access_token_expiration_policy personal_access_token_expiration_policy
enforce_pat_expiration enforce_pat_expiration
prometheus_alerts prometheus_alerts
......
...@@ -26,7 +26,6 @@ module EE ...@@ -26,7 +26,6 @@ module EE
mount ::API::Ldap mount ::API::Ldap
mount ::API::LdapGroupLinks mount ::API::LdapGroupLinks
mount ::API::License mount ::API::License
mount ::API::PersonalAccessTokens
mount ::API::ProjectMirror mount ::API::ProjectMirror
mount ::API::ProjectPushRule mount ::API::ProjectPushRule
mount ::API::GroupPushRule mount ::API::GroupPushRule
......
...@@ -236,6 +236,7 @@ module API ...@@ -236,6 +236,7 @@ module API
mount ::API::ProjectTemplates mount ::API::ProjectTemplates
mount ::API::Terraform::State mount ::API::Terraform::State
mount ::API::Terraform::StateVersion mount ::API::Terraform::StateVersion
mount ::API::PersonalAccessTokens
mount ::API::ProtectedBranches mount ::API::ProtectedBranches
mount ::API::ProtectedTags mount ::API::ProtectedTags
mount ::API::Releases mount ::API::Releases
......
...@@ -37,11 +37,6 @@ module API ...@@ -37,11 +37,6 @@ module API
def find_token(id) def find_token(id)
PersonalAccessToken.find(id) || not_found! PersonalAccessToken.find(id) || not_found!
end end
def authenticate!
unauthorized! unless ::License.feature_available?(:personal_access_token_api_management)
super
end
end end
resources :personal_access_tokens do resources :personal_access_tokens do
......
...@@ -9,23 +9,6 @@ RSpec.describe API::PersonalAccessTokens do ...@@ -9,23 +9,6 @@ RSpec.describe API::PersonalAccessTokens do
let_it_be(:current_user) { create(:user) } let_it_be(:current_user) { create(:user) }
describe 'GET /personal_access_tokens' do describe 'GET /personal_access_tokens' do
context 'when unlicensed' do
before do
stub_licensed_features(personal_access_token_api_management: false)
end
it 'responds with unauthorized' do
get api(path, current_user)
expect(response).to have_gitlab_http_status(:unauthorized)
end
end
context 'when licensed' do
before do
stub_licensed_features(personal_access_token_api_management: true)
end
context 'logged in as an Administrator' do context 'logged in as an Administrator' do
let_it_be(:current_user) { create(:admin) } let_it_be(:current_user) { create(:admin) }
...@@ -45,7 +28,6 @@ RSpec.describe API::PersonalAccessTokens do ...@@ -45,7 +28,6 @@ RSpec.describe API::PersonalAccessTokens do
expect(json_response.first['user_id']).to eq(token1.user.id) expect(json_response.first['user_id']).to eq(token1.user.id)
end end
end end
end
context 'logged in as a non-Administrator' do context 'logged in as a non-Administrator' do
let_it_be(:current_user) { create(:user) } let_it_be(:current_user) { create(:user) }
...@@ -91,23 +73,6 @@ RSpec.describe API::PersonalAccessTokens do ...@@ -91,23 +73,6 @@ RSpec.describe API::PersonalAccessTokens do
describe 'DELETE /personal_access_tokens/:id' do describe 'DELETE /personal_access_tokens/:id' do
let(:path) { "/personal_access_tokens/#{token1.id}" } let(:path) { "/personal_access_tokens/#{token1.id}" }
context 'when unlicensed' do
before do
stub_licensed_features(personal_access_token_api_management: false)
end
it 'responds with unauthorized' do
delete api(path, current_user)
expect(response).to have_gitlab_http_status(:unauthorized)
end
end
context 'when licensed' do
before do
stub_licensed_features(personal_access_token_api_management: true)
end
context 'when current_user is an administrator', :enable_admin_mode do context 'when current_user is an administrator', :enable_admin_mode do
let_it_be(:admin_user) { create(:admin) } let_it_be(:admin_user) { create(:admin) }
let_it_be(:admin_token) { create(:personal_access_token, user: admin_user) } let_it_be(:admin_token) { create(:personal_access_token, user: admin_user) }
...@@ -144,5 +109,4 @@ RSpec.describe API::PersonalAccessTokens do ...@@ -144,5 +109,4 @@ RSpec.describe API::PersonalAccessTokens do
end end
end end
end end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment