admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Merge pull request #10490 from nandahkrishna/fix-api-credentials-error

Browse Source 
utils/github: fix false positive API credential error
This commit is contained in:
Mike McQuaid 2021-02-03 08:58:33 +00:00 committed by GitHub
commit 8eeb838440
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/utils/github.rb
View File

@ -150,13 +150,11 @@ module GitHub
return if response_headers.empty? return if response_headers.empty?
scopes = response_headers["x-accepted-oauth-scopes"].to_s.split(", ") scopes = response_headers["x-accepted-oauth-scopes"].to_s.split(", ")
return if scopes.present? needed_scopes = Set.new(scopes || needed_scopes)
needed_human_scopes = needed_scopes.join(", ")
credentials_scopes = response_headers["x-oauth-scopes"] credentials_scopes = response_headers["x-oauth-scopes"]
return if needed_human_scopes.blank? && credentials_scopes.blank? return if needed_scopes.subset?(Set.new(credentials_scopes.to_s.split(", ")))
needed_human_scopes = "none" if needed_human_scopes.blank? needed_scopes = needed_scopes.to_a.join(", ").presence || "none"
credentials_scopes = "none" if credentials_scopes.blank? credentials_scopes = "none" if credentials_scopes.blank?
what = case api_credentials_type what = case api_credentials_type
@ -168,7 +166,7 @@ module GitHub
@api_credentials_error_message ||= onoe <<~EOS @api_credentials_error_message ||= onoe <<~EOS
Your #{what} credentials do not have sufficient scope! Your #{what} credentials do not have sufficient scope!
Scopes required: #{needed_human_scopes} Scopes required: #{needed_scopes}
Scopes present: #{credentials_scopes} Scopes present: #{credentials_scopes}
Create a personal access token: Create a personal access token:
#{ALL_SCOPES_URL} #{ALL_SCOPES_URL}