Skip to content

Support device code flow with claims challenge #28201

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
Jul 17, 2025
Merged

Support device code flow with claims challenge #28201

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
6 changes: 5 additions & 1 deletion src/Accounts/Authentication/Authentication/Parameters/DeviceCodeParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,21 @@ public class DeviceCodeParameters : AuthenticationParameters

public string HomeAccountId { get; set; }

public string ClaimsChallenge { get; set; }

public DeviceCodeParameters(
PowerShellTokenCacheProvider tokenCacheProvider,
IAzureEnvironment environment,
IAzureTokenCache tokenCache,
string tenantId,
string resourceId,
string userId,
string homeAccountId) : base(tokenCacheProvider, environment, tokenCache, tenantId, resourceId)
string homeAccountId,
string claimsChallenge) : base(tokenCacheProvider, environment, tokenCache, tenantId, resourceId)
{
UserId = userId;
HomeAccountId = homeAccountId;
ClaimsChallenge = claimsChallenge;
}
}
}
5 changes: 1 addition & 4 deletions src/Accounts/Authentication/Authentication/Parameters/InteractiveParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public class InteractiveParameters : DeviceCodeParameters
{
public Action<string> PromptAction { get; set; }

public string ClaimsChallenge { get; set; }

public InteractiveParameters(
PowerShellTokenCacheProvider tokenCacheProvider,
IAzureEnvironment environment,
Expand All @@ -32,10 +30,9 @@ public InteractiveParameters(
string userId,
string homeAccountId,
Action<string> promptAction,
string claimsChallenge) : base(tokenCacheProvider, environment, tokenCache, tenantId, resourceId, userId, homeAccountId)
string claimsChallenge) : base(tokenCacheProvider, environment, tokenCache, tenantId, resourceId, userId, homeAccountId, claimsChallenge)
{
PromptAction = promptAction;
ClaimsChallenge = claimsChallenge;
}
}
}
5 changes: 1 addition & 4 deletions src/Accounts/Authentication/Authentication/Parameters/InteractiveWamParameters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ public class InteractiveWamParameters : DeviceCodeParameters
{
public Action<string> PromptAction { get; set; }

public string ClaimsChallenge { get; set; }

public InteractiveWamParameters(
PowerShellTokenCacheProvider tokenCacheProvider,
IAzureEnvironment environment,
Expand All @@ -32,10 +30,9 @@ public InteractiveWamParameters(
string userId,
string homeAccountId,
Action<string> promptAction,
string claimsChallenge) : base(tokenCacheProvider, environment, tokenCache, tenantId, resourceId, userId, homeAccountId)
string claimsChallenge) : base(tokenCacheProvider, environment, tokenCache, tenantId, resourceId, userId, homeAccountId, claimsChallenge)
{
PromptAction = promptAction;
ClaimsChallenge = claimsChallenge;
}
}
}
2 changes: 1 addition & 1 deletion src/Accounts/Authentication/Factories/AuthenticationFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ private AuthenticationParameters GetAuthenticationParameters(

if (account.IsPropertySet("UseDeviceAuth"))
{
return new DeviceCodeParameters(tokenCacheProvider, environment, tokenCache, tenant, resourceId, account.Id, homeAccountId);
return new DeviceCodeParameters(tokenCacheProvider, environment, tokenCache, tenant, resourceId, account.Id, homeAccountId, claimsChallenge);
}
else if (account.IsPropertySet(AzureAccount.Property.UsePasswordAuth))
{
Expand Down
3 changes: 2 additions & 1 deletion src/Accounts/Authenticators/DeviceCodeAuthenticator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,9 @@ public override Task<IAccessToken> Authenticate(AuthenticationParameters paramet
var scopes = AuthenticationHelpers.GetScope(onPremise, resource);
var clientId = Constants.PowerShellClientId;
var authority = parameters.Environment.ActiveDirectoryAuthority;
var claimsChallenge = deviceCodeParameters.ClaimsChallenge;

var requestContext = new TokenRequestContext(scopes, isCaeEnabled: true);
var requestContext = new TokenRequestContext(scopes, claims: claimsChallenge, isCaeEnabled: true);
DeviceCodeCredentialOptions options = new DeviceCodeCredentialOptions()
{
DeviceCodeCallback = DeviceCodeFunc,
Expand Down
Loading