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

Issue #LR-676 fix: Fixed KC multiple session remove. #1240

Merged
merged 9 commits into from
Feb 6, 2024
Merged

Issue #LR-676 fix: Fixed KC multiple session remove. #1240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
28b06a7
Issue #LR-676 fix: Support email
AmiableAnil Jan 17, 2024
62c7a58
Issue #LR-676 fix: sonar java version fix
AmiableAnil Jan 18, 2024
f006977
Issue #LR-676 fix: sonar java version fix
AmiableAnil Jan 18, 2024
b0a0414
Issue #LR-676 fix: sonar java version fix
AmiableAnil Jan 18, 2024
02c77c2
Merge branch 'release-7.0.0' of https://github.com/Sunbird-Lern/sunbi…
AmiableAnil Jan 23, 2024
b8814c2
Issue #LR-676 fix: Fixed SSO delete user
AmiableAnil Jan 30, 2024
6d224bc
Merge branch 'release-7.0.0' of https://github.com/Sunbird-Lern/sunbi…
AmiableAnil Feb 5, 2024
7fa0606
Issue #LR-676 fix: Fixed KC multiple session remove.
AmiableAnil Feb 5, 2024
e83c9a3
Issue #LR-676 test: Fixed KC multiple session remove.
AmiableAnil Feb 5, 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
4 changes: 4 additions & 0 deletions core/platform-common/src/main/java/org/sunbird/sso/impl/KeyCloakServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import java.security.PublicKey;
import java.security.spec.X509EncodedKeySpec;
import java.util.Base64;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.keycloak.RSATokenVerifier;
Expand Down Expand Up @@ -94,6 +95,9 @@ public boolean removePII(String userId, RequestContext context) {
user.setEnabled(false);
logger.info("KeyCloakServiceImpl::removePII:: userId:: " + fedUserId);
userResource.update(user);
List userSessions = userResource.getUserSessions();
for (Object userSession : userSessions)
userSessions.remove(userSession);
return true;
} catch (Exception e) {
logger.error(context, "removePII: Exception occurred: ", e);
Expand Down
5 changes: 3 additions & 2 deletions core/platform-common/src/test/java/org/sunbird/sso/impl/KeyCloakServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,11 +196,12 @@ public void testGetFederatedUserId()
@Test
public void testUpdatePassword() throws Exception {
boolean updated = keyCloakService.updatePassword(userId.get(JsonKey.USER_ID), "password", null);
Assert.assertNotNull(updated);
Assert.assertTrue(updated);
}

@Test
public void testRemovePII() {
keyCloakService.removePII(userId.get(JsonKey.USER_ID), new RequestContext());
boolean piiRemoved = keyCloakService.removePII(userId.get(JsonKey.USER_ID), new RequestContext());
Assert.assertTrue(piiRemoved);
}
}