Merge branch 'dm-pat-revoke' into 'master'
Set default scope on PATs that don't have one set to allow them to be revoked Closes #38650 See merge request gitlab-org/gitlab-ce!14660
This commit is contained in:
commit
ec40f74e0e
|
@ -1,6 +1,7 @@
|
|||
class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
|
||||
def index
|
||||
set_index_vars
|
||||
@personal_access_token = finder.build
|
||||
end
|
||||
|
||||
def create
|
||||
|
@ -40,7 +41,6 @@ class Profiles::PersonalAccessTokensController < Profiles::ApplicationController
|
|||
def set_index_vars
|
||||
@scopes = Gitlab::Auth.available_scopes
|
||||
|
||||
@personal_access_token = finder.build
|
||||
@inactive_personal_access_tokens = finder(state: 'inactive').execute
|
||||
@active_personal_access_tokens = finder(state: 'active').execute.order(:expires_at)
|
||||
end
|
||||
|
|
|
@ -17,6 +17,8 @@ class PersonalAccessToken < ActiveRecord::Base
|
|||
validates :scopes, presence: true
|
||||
validate :validate_scopes
|
||||
|
||||
after_initialize :set_default_scopes, if: :persisted?
|
||||
|
||||
def revoke!
|
||||
update!(revoked: true)
|
||||
end
|
||||
|
@ -32,4 +34,8 @@ class PersonalAccessToken < ActiveRecord::Base
|
|||
errors.add :scopes, "can only contain available scopes"
|
||||
end
|
||||
end
|
||||
|
||||
def set_default_scopes
|
||||
self.scopes = Gitlab::Auth::DEFAULT_SCOPES if self.scopes.empty?
|
||||
end
|
||||
end
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
- type = impersonation ? "impersonation" : "personal access"
|
||||
|
||||
%h5.prepend-top-0
|
||||
Add a #{type} Token
|
||||
Add a #{type} token
|
||||
%p.profile-settings-content
|
||||
Pick a name for the application, and we'll give you a unique #{type} Token.
|
||||
Pick a name for the application, and we'll give you a unique #{type} token.
|
||||
|
||||
= form_for token, url: path, method: :post, html: { class: 'js-requires-input' } do |f|
|
||||
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Set default scope on PATs that don't have one set to allow them to be revoked
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in New Issue