Skip to content

🩹 [Patch]: Minor refactor and docs #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2024
Merged

🩹 [Patch]: Minor refactor and docs #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 1 addition & 18 deletions src/GitHub/public/API/Invoke-GitHubAPI.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,23 +101,6 @@
$URI = ("$ApiBaseUri/" -replace '/$', '') + ("/$ApiEndpoint" -replace '^/', '')
}

# $AccessTokenAsPlainText = ConvertFrom-SecureString $AccessToken -AsPlainText
# # Swap out this by using the -Authentication Bearer -Token $AccessToken
# switch -Regex ($AccessTokenAsPlainText) {
# '^ghp_|^github_pat_' {
# $headers.authorization = "token $AccessTokenAsPlainText"
# }
# '^ghu_|^gho_' {
# $headers.authorization = "Bearer $AccessTokenAsPlainText"
# }
# default {
# $tokenPrefix = $AccessTokenAsPlainText -replace '_.*$', '_*'
# $errorMessage = "Unexpected AccessToken format: $tokenPrefix"
# Write-Error $errorMessage
# throw $errorMessage
# }
# }

$APICall = @{
Uri = $URI
Method = $Method
Expand Down Expand Up @@ -166,7 +149,7 @@ Request:
$($APICall | ConvertFrom-HashTable | Format-List | Out-String)
----------------------------------
ResponseHeaders:
$($responseHeaders.PSObject.Properties | Foreach-Object { $_ | Format-List | Out-String })
$($responseHeaders.PSObject.Properties | ForEach-Object { $_ | Format-List | Out-String })
----------------------------------

"@
Expand Down
26 changes: 16 additions & 10 deletions src/GitHub/public/Auth/Connect-GitHubAccount.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@
Connects to GitHub using a device flow login.
If the user has already logged in, the access token will be refreshed.

.EXAMPLE
$env:GH_TOKEN = 'ghx_1234567890'
Connect-GitHubAccount

Connects to GitHub using the access token from environment variable, assuming unattended mode.

.EXAMPLE
Connect-GitHubAccount -AccessToken
! Enter your personal access token: *************
Expand Down Expand Up @@ -93,14 +99,14 @@
)

$envVars = Get-ChildItem -Path 'Env:'
Write-Verbose "Environment variables:"
Write-Verbose 'Environment variables:'
Write-Verbose ($envVars | Format-Table -AutoSize | Out-String)
$systemToken = $envVars | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1
Write-Verbose "System token: [$systemToken]"
$systemTokenPresent = $systemToken.count -gt 0
Write-Verbose "System token present: [$systemTokenPresent]"
$AuthType = $systemTokenPresent ? 'sPAT' : $PSCmdlet.ParameterSetName
WRite-Verbose "AuthType: [$AuthType]"
$gitHubToken = $envVars | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1
Write-Verbose "GitHub token: [$gitHubToken]"
$gitHubTokenPresent = $gitHubToken.count -gt 0
Write-Verbose "GitHub token present: [$gitHubTokenPresent]"
$AuthType = $gitHubTokenPresent ? 'sPAT' : $PSCmdlet.ParameterSetName
Write-Verbose "AuthType: [$AuthType]"
switch ($AuthType) {
'DeviceFlow' {
Write-Verbose 'Logging in using device flow...'
Expand Down Expand Up @@ -197,11 +203,11 @@
break
}
'sPAT' {
Write-Verbose 'Logging in using system access token...'
Write-Verbose 'Logging in using GitHub access token...'
Reset-GitHubConfig -Scope 'Auth'
$prefix = $systemToken.Value -replace '_.*$', '_*'
$prefix = $gitHubToken.Value -replace '_.*$', '_*'
$settings = @{
AccessToken = ConvertTo-SecureString -AsPlainText $systemToken.Value
AccessToken = ConvertTo-SecureString -AsPlainText $gitHubToken.Value
AccessTokenType = $prefix
ApiBaseUri = 'https://api.github.com'
ApiVersion = '2022-11-28'
Expand Down