Skip to content

partial revert to fix failing tests in broker FixesAB#3397557, Fixes AB#3397557 #2797

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
siddhijain merged 1 commit into from
Oct 28, 2025
Merged

partial revert to fix failing tests in broker FixesAB#3397557, Fixes AB#3397557 #2797

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
15 changes: 8 additions & 7 deletions common4j/src/main/com/microsoft/identity/common/java/cache/MsalOAuth2TokenCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,6 @@ public AccountRecord getAccountByLocalAccountId(@Nullable final String environme

for (final AccountRecord accountRecord: accountRecordList) {
if (accountRecord.getLocalAccountId().equals(localAccountId)
&& accountRecord.getEnvironment().equals(environment)
&& accountHasCredential(accountRecord, appCredentials)) {
return accountRecord;
}
Expand Down Expand Up @@ -1373,9 +1372,8 @@ private CredentialType getAccessTokenCredentialTypeForAuthenticationScheme(
}

/**
* Evaluates the supplied list of Credentials. Returns true if the provided Account's
* homeAccountId matches with any of the credentials' homeAccountId.
* This does not filter on environment, as that is expected to be pre-filtered.
* Evaluates the supplied list of Credentials. Returns true if the provided Account
* 'owns' any one of these tokens.
*
* @param account The Account whose credential ownership should be evaluated.
* @param appCredentials The Credentials to evaluate.
Expand All @@ -1384,17 +1382,20 @@ private CredentialType getAccessTokenCredentialTypeForAuthenticationScheme(
private boolean accountHasCredential(@NonNull final AccountRecord account,
@NonNull final List<Credential> appCredentials) {
final String methodName = ":accountHasCredential";

final String accountHomeId = account.getHomeAccountId();
final String accountEnvironment = account.getEnvironment();

Logger.verbosePII(
TAG + methodName,
"HomeAccountId: [" + accountHomeId + "]"
+ "\n"
+ "Environment: [" + accountEnvironment + "]"
);

// Since we already filtered accounts and credentials by environment, there is no need to check
// environment again
for (final Credential credential : appCredentials) {
if (accountHomeId.equals(credential.getHomeAccountId())) {
if (accountHomeId.equals(credential.getHomeAccountId())
&& accountEnvironment.equals(credential.getEnvironment())) {
Logger.verbose(
TAG + methodName,
"Credentials located for account."
Expand Down
Loading