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

Jump to bottom

Fix test failures due to new APIs. #2728

Merged
merged 2 commits into from Feb 6, 2020
Merged

Fix test failures due to new APIs. #2728

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea88ec3
Fix test failures due to new APIs.
JKAUSHALYA Feb 6, 2020
788a5cf
Merge branch 'master' of https://github.com/wso2/carbon-identity-fram…
JKAUSHALYA Feb 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...src/main/java/org/wso2/carbon/identity/mgt/listener/IdentityUserNameResolverListener.java
View file
Open in desktop
Expand Up @@ -137,8 +137,6 @@ public boolean doPreAddUserWithID(String userName, Object credential, String[] r
return true;
}

// TODO: 12/19/19 This doPostAddUserWithID signature will be changed in the carbon-kernel 4.6.0-beta. This should
// be updated accordingly.
@Override
public boolean doPostAddUserWithID(User user, Object credential, String[] roleList, Map<String, String> claims,
String profile, UserStoreManager userStoreManager) throws UserStoreException {
Expand Down Expand Up @@ -1094,9 +1092,7 @@ public boolean doPreAuthenticateWithID(List<LoginIdentifier> loginIdentifiers, O
return true;
}

// TODO: 12/19/19 getUsernameByClaims(List<LoginIdentifier> loginIdentifiers) method should be used here from
// kernel 4.6.0-beta
String username = null;
String username = ((AbstractUserStoreManager) userStoreManager).getUsernameByClaims(loginIdentifiers);

for (UserOperationEventListener listener : getUserStoreManagerListeners()) {
if (isNotAResolverListener(listener)) {
Expand Down Expand Up @@ -1207,7 +1203,7 @@ private List<String> getDomainLessNamesAsList(String[] names) {

private boolean isNotAResolverListener(UserOperationEventListener listener) {

return !(listener instanceof IdentityUserIdResolverListener)
return !(listener instanceof IdentityUserIdResolverListener)
&& !(listener instanceof IdentityUserNameResolverListener);
}
}