Skip to content
代码片段 群组 项目
未验证 提交 bc13a079 编辑于 作者: Drew Blessing's avatar Drew Blessing 提交者: GitLab
浏览文件

Merge branch 'eduardosanz/refactor-credentials-params' into 'master'

Fix sorting issue credential inventory

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/183076



Merged-by: default avatarDrew Blessing <drew@gitlab.com>
Approved-by: default avatarDrew Blessing <drew@gitlab.com>
Reviewed-by: default avatarDrew Blessing <drew@gitlab.com>
Co-authored-by: default avatarEduardo Sanz García <esanz-garcia@gitlab.com>
No related branches found
No related tags found
2 合并请求!3031Merge per-main-jh to main-jh by luzhiyuan,!3030Merge per-main-jh to main-jh
......@@ -54,16 +54,19 @@ def revoke
def filter_credentials
if show_personal_access_tokens?
::PersonalAccessTokensFinder.new(users: users, impersonation: false, sort: 'id_desc', owner_type: 'human', **pat_params).execute
::PersonalAccessTokensFinder.new(pat_params(users: users, owner_type: 'human')).execute
elsif show_ssh_keys?
::KeysFinder.new({ users: users, key_type: 'ssh' }).execute
elsif show_resource_access_tokens?
::PersonalAccessTokensFinder.new(users: bot_users, impersonation: false, sort: 'id_desc', **pat_params).execute.project_access_token
::PersonalAccessTokensFinder.new(pat_params(users: bot_users)).execute.project_access_token
end
end
def pat_params
params.permit(:state, :revoked, :created_before, :created_after, :expires_before, :expires_after, :last_used_before, :last_used_after, :search, :sort).to_hash.transform_keys(&:to_sym)
def pat_params(options)
{ **options,
impersonation: false,
sort: 'expires_at_asc_id_desc',
**params.permit(:state, :revoked, :created_before, :created_after, :expires_before, :expires_after, :last_used_before, :last_used_after, :search, :sort) }.with_indifferent_access
end
def notify_deleted_or_revoked_credential(credential)
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册