libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

[KEYCLOAK-6376] Fix NPE and test setup

Browse source
This commit is contained in:
Martin Reinhardt 2019-08-08 07:20:36 +02:00 committed by Stian Thorgersen
parent f18c8b9da5
commit 28748ebf3f
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
services/src/main/java/org/keycloak/authentication/authenticators/browser/ConditionalOtpFormAuthenticator.java
View file

@ -278,8 +278,10 @@ public class ConditionalOtpFormAuthenticator extends OTPFormAuthenticator {
}
RoleModel role = getRoleFromString(realm, roleName);
return user.hasRole(role);
if (role != null) {
return user.hasRole(role);
}
return false;
}
private boolean isOTPRequired(KeycloakSession session, RealmModel realm, UserModel user) {

12
testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/account/custom/CustomAuthFlowOTPTest.java
View file

@ -340,11 +340,11 @@ public class CustomAuthFlowOTPTest extends AbstractCustomAccountManagementTest {
setConditionalOTPForm(config);
//create role
//create otp group with role included
GroupRepresentation group = getOrCreateOTPRoleInGroup();
//add group to user
testRealmResource().users().get(testUser.getId()).groups().add(group);
testRealmResource().users().get(testUser.getId()).joinGroup(group.getId());
//test OTP is required
testRealmAccountManagementPage.navigateTo();
@ -374,12 +374,14 @@ public class CustomAuthFlowOTPTest extends AbstractCustomAccountManagementTest {
try {
return testRealmResource().groups().groups("otp_group",0,1).get(0);
} catch (NotFoundException | IndexOutOfBoundsException ex ) {
RoleRepresentation role = this.getOrCreateOTPRole();
GroupRepresentation group = new GroupRepresentation();
group.setName("otp_group");
group.setRealmRoles(Arrays.asList("otp_role"));
testRealmResource().groups().add(group);
RoleRepresentation role = getOrCreateOTPRole();
testRealmResource().groups().add(group);
//obtain id
GroupRepresentation groupRep = testRealmResource().groups().groups("otp_group",0,1).get(0);
testRealmResource().groups().group(groupRep.getId()).roles().realmLevel().add(Arrays.asList(role));
//reread
return testRealmResource().groups().groups("otp_group",0,1).get(0);
}
}