Skip to content

For MSAL CPP flows, match exact claims when deleting AT with intersecting scopes, Fixes AB#3095218 #2548

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
sansrivastav merged 7 commits into from
Nov 25, 2024
Merged

For MSAL CPP flows, match exact claims when deleting AT with intersecting scopes, Fixes AB#3095218 #2548

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
de57369
Merge amgusain/release/18.2.0 to release/18.2.0 (#2534)
iamgusain Nov 12, 2024
ec44661
For MSALCPP flows, match exact calims when deleting AT with intersect…
sansrivastav Nov 22, 2024
57fa18c
Merge branch 'dev' into sansrivastav/MatchClaimsWhenDeletingATWithInt…
sansrivastav Nov 22, 2024
1f81b28
Remove unwanted changes
sansrivastav Nov 22, 2024
7941773
Changelog entry
sansrivastav Nov 22, 2024
c651abf
Add parameter to saveCredential + Add test
sansrivastav Nov 23, 2024
70a2981
Merge branch 'dev' into sansrivastav/MatchClaimsWhenDeletingATWithInt…
sansrivastav Nov 23, 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
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
vNext
----------
- [PATCH] Translate MFA token error to UIRequiredException instead of ServiceException (#2538)
- [MINOR] For MSAL CPP flows, match exact claims when deleting AT with intersecting scopes (#2548)

Version 18.2.2
----------
Expand Down
2 changes: 1 addition & 1 deletion common4j/src/main/com/microsoft/identity/common/java/cache/MsalCppOAuth2TokenCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public synchronized void saveCredentials(@NonNull final Credential... credential
}
}

saveCredentialsInternal(credentials);
saveCredentialsInternal(true, credentials);
}

/**
Expand Down
9 changes: 7 additions & 2 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 @@ -1635,13 +1635,17 @@ private void saveAccounts(final AccountRecord... accounts) {
}

void saveCredentialsInternal(final Credential... credentials) {
saveCredentialsInternal(false, credentials);
}

void saveCredentialsInternal(boolean mustMatchExactClaims, final Credential... credentials) {
for (final Credential credential : credentials) {
if (credential == null) {
continue;
}

if (credential instanceof AccessTokenRecord) {
deleteAccessTokensWithIntersectingScopes((AccessTokenRecord) credential);
deleteAccessTokensWithIntersectingScopes((AccessTokenRecord) credential, mustMatchExactClaims);
}

mAccountCredentialCache.saveCredential(credential);
Expand Down Expand Up @@ -1707,7 +1711,7 @@ void validateCacheArtifacts(
}

private void deleteAccessTokensWithIntersectingScopes(
final AccessTokenRecord referenceToken) {
final AccessTokenRecord referenceToken, boolean mustMatchExactClaims) {
final String methodName = "deleteAccessTokensWithIntersectingScopes";

final List<Credential> accessTokens = mAccountCredentialCache.getCredentialsFilteredBy(
Expand All @@ -1721,6 +1725,7 @@ private void deleteAccessTokensWithIntersectingScopes(
null, // Wildcard (*)
referenceToken.getAccessTokenType(),
referenceToken.getRequestedClaims(),
mustMatchExactClaims,
mAccountCredentialCache.getCredentials()
);

Expand Down