Skip to content

🩹 [Patch]: Improve handling of Host #137

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 5 commits into from
Nov 6, 2024
Merged

🩹 [Patch]: Improve handling of Host #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6e6c850
Update login prompts to use dynamic hostnames for GitHub login processes
MariusStorhaug Nov 5, 2024
416c71b
Merge branch 'main' of https://github.com/PSModule/GitHub into hostfix
MariusStorhaug Nov 6, 2024
e741767
Add normalization of $HostName
MariusStorhaug Nov 6, 2024
c8811bd
Send $env:GITHUB_SERVER_URL as server when signing in on GHA
MariusStorhaug Nov 6, 2024
25328bd
Fix hostname fix
MariusStorhaug Nov 6, 2024
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
3 changes: 1 addition & 2 deletions src/functions/private/Commands/Initialize-RunnerEnvironment.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
$tokenVar = Get-ChildItem -Path 'Env:' | Where-Object Name -In 'GH_TOKEN', 'GITHUB_TOKEN' | Select-Object -First 1 -ExpandProperty Value
$tokenVarPresent = $tokenVar.count -gt 0 -and -not [string]::IsNullOrEmpty($tokenVar)
if ($tokenVarPresent) {
$HostName = $env:GITHUB_SERVER_URL -replace '^https?://'
Connect-GitHubAccount -Repo $env:GITHUB_REPOSITORY_NAME -Owner $env:GITHUB_REPOSITORY_OWNER -Host $HostName
Connect-GitHubAccount -Repo $env:GITHUB_REPOSITORY_NAME -Owner $env:GITHUB_REPOSITORY_OWNER -Server $env:GITHUB_SERVER_URL
}
}
7 changes: 5 additions & 2 deletions src/functions/public/Auth/Connect-GitHubAccount.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,12 @@
[Parameter()]
[string] $ApiVersion = '2022-11-28',

# The host to connect to.
# The host to connect to. Can use $env:GITHUB_SERVER_URL to set the host, as the protocol is removed automatically.
# Example: github.com, github.enterprise.com, msx.ghe.com
[Parameter()]
[Alias('Host')]
[uri] $HostName = 'github.com',
[Alias('Server')]
[string] $HostName = 'github.com',

# Suppresses the output of the function.
[Parameter()]
Expand All @@ -122,6 +124,7 @@
[switch] $Silent
)

$HostName = $HostName -replace '^https?://'
$ApiBaseUri = "https://api.$HostName"

$envVars = Get-ChildItem -Path 'Env:'
Expand Down