Skip to content
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

Changes to getAMR() method #2736

Draft
wants to merge 5 commits into
base: feature-amr
Choose a base branch
from
+15 −0
Draft

Changes to getAMR() method #2736

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b62dcc0
Changes to getAMRValues method
Eranda2001 Feb 14, 2025
6d5cb32
Merge conflict
Eranda2001 Feb 20, 2025
9a04e81
Add-amr conflict resolve
Eranda2001 Feb 20, 2025
008f9a6
update getAmrValues to getAmrValue
Eranda2001 Feb 25, 2025
9ba2619
Merge conflicts
Eranda2001 Feb 25, 2025
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: 15 additions & 0 deletions ...oint/src/main/java/org/wso2/carbon/identity/oauth/endpoint/authz/OAuth2AuthzEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4206,6 +4206,21 @@ private void associateAuthenticationHistory(SessionDataCacheEntry resultFromLogi
*/
private List<String> getAMRValues(List<String> authMethods, Map<String, AuthenticatedIdPData> authenticatedIdPs) {

boolean authenticatorAMREnabled = true;
if (authenticatorAMREnabled) {
Comment on lines +4209 to +4210
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since the variable is hardcoded to true the if statement is redundant.

List<String> resultantAuthMethods = new ArrayList<>();
for (Map.Entry<String, AuthenticatedIdPData> entry : authenticatedIdPs.entrySet()) {
if (entry.getValue() != null && entry.getValue().getAuthenticators() != null) {
for (AuthenticatorConfig authenticatorConfig : entry.getValue().getAuthenticators()) {
if (authenticatorConfig != null && authenticatorConfig.getAmrValue() != null) {
resultantAuthMethods.addAll(Arrays.asList(authenticatorConfig.getAmrValue()));
}
}
}
}
return resultantAuthMethods;
}

boolean readAMRValueFromIdp = Boolean.parseBoolean(IdentityUtil.getProperty(
OAuthConstants.READ_AMR_VALUE_FROM_IDP));
if (readAMRValueFromIdp) {
Expand Down
Loading