actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-11 12:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

more fallback

Browse Source
This commit is contained in:
Luke Tomlinson
2025-04-07 15:07:41 -07:00
parent 08b22bff1d
commit a755837bc8
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Runner.Listener/Configuration/ConfigurationManager.cs
View File

@@ -135,7 +135,8 @@ namespace GitHub.Runner.Listener.Configuration
runnerSettings.GitHubUrl = inputUrl;
registerToken = await GetRunnerTokenAsync(command, inputUrl, "registration");
GitHubAuthResult authResult = await GetTenantCredential(inputUrl, registerToken, Constants.RunnerEvent.Register);
runnerSettings.ServerUrl = authResult.LegacyUrl ?? authResult.TenantUrl;
var hasLegacyUrl = !string.IsNullOrEmpty(authResult.LegacyUrl);
runnerSettings.ServerUrl = hasLegacyUrl ? authResult.LegacyUrl : authResult.TenantUrl;
runnerSettings.UseV2Flow = authResult.UseV2Flow;
Trace.Info($"Using V2 flow: {runnerSettings.UseV2Flow}");
creds = authResult.ToVssCredentials();

8
src/Runner.Listener/Configuration/CredentialManager.cs
View File

@@ -99,14 +99,20 @@ namespace GitHub.Runner.Listener.Configuration
[DataMember(Name = "legacy_url")]
public string LegacyUrl { get; set; }
[DataMember(Name = "legacy_token")]
public string LegacyToken { get; set; }
public VssCredentials ToVssCredentials()
{
ArgUtil.NotNullOrEmpty(TokenSchema, nameof(TokenSchema));
ArgUtil.NotNullOrEmpty(Token, nameof(Token));
var hasLegacyToken = !string.IsNullOrEmpty(LegacyToken);
var token = hasLegacyToken ? LegacyToken : Token;
if (string.Equals(TokenSchema, "OAuthAccessToken", StringComparison.OrdinalIgnoreCase))
{
return new VssCredentials(new VssOAuthAccessTokenCredential(Token), CredentialPromptType.DoNotPrompt);
return new VssCredentials(new VssOAuthAccessTokenCredential(token), CredentialPromptType.DoNotPrompt);
}
else
{