Skip to content

Commit

Permalink
update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@lashinijay
lashinijay committed Apr 3, 2024
1 parent f7698e1 commit 7d72b52
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 18 deletions.
8 changes: 4 additions & 4 deletions ...ntity/application/authenticator/iproov/common/constants/IproovAuthenticatorConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ public enum ErrorMessages {
ERROR_CODE_INVALID_FEDERATED_AUTHENTICATOR("65021", "No IDP found with the name IDP: " +
"%s in tenant: %s"),
ERROR_CODE_INVALID_FEDERATED_USER_AUTHENTICATION("65023", "Can not handle federated user " +
"authentication with TOTP as JIT Provision is not enabled for the IDP: in the tenant: %s"),
ERROR_CODE_NO_AUTHENTICATED_USER("65004", "Can not find the authenticated user"),
ERROR_CODE_NO_FEDERATED_USER("65002", "No federated user found"),
ERROR_CODE_NO_USER_TENANT("65005", "Can not find the authenticated user's tenant domain");
"authentication with TOTP as JIT Provision is not enabled for the IDP: in the tenant: %s."),
ERROR_CODE_NO_AUTHENTICATED_USER("65024", "Can not find the authenticated user."),
ERROR_CODE_NO_FEDERATED_USER("65025", "No federated user found."),
ERROR_CODE_NO_USER_TENANT("65026", "Can not find the authenticated user's tenant domain.");

private final String code;
private final String message;
Expand Down
7 changes: 3 additions & 4 deletions ...n/java/org/wso2/carbon/identity/application/authenticator/iproov/IproovAuthenticator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,7 @@ private IdentityProvider getIdentityProvider(String idpName, String tenantDomain
*
* @param authenticatedUser AuthenticatedUser.
* @param context AuthenticationContext.
* @return Provisioned username
* @return Provisioned username.
* @throws AuthenticationFailedException If an error occurred while getting the provisioned username.
*/
private String getMappedLocalUsername(AuthenticatedUser authenticatedUser, AuthenticationContext context)
Expand Down Expand Up @@ -492,16 +492,15 @@ private AuthenticatedUser getAuthenticatedUserFromContext(AuthenticationContext
USER_NOT_FOUND.getCode(),
IproovAuthenticatorConstants.ErrorMessages.USER_NOT_FOUND.getMessage());
}
AuthenticatedUser authenticatedUser = new AuthenticatedUser(user);
if (StringUtils.isBlank(authenticatedUser.toFullQualifiedUsername())) {
if (StringUtils.isBlank(user.toFullQualifiedUsername())) {
if (LOG.isDebugEnabled()) {
LOG.debug("Username can not be empty.");
}
throw new IproovAuthnFailedException(IproovAuthenticatorConstants.ErrorMessages.
USER_NOT_FOUND.getCode(),
IproovAuthenticatorConstants.ErrorMessages.USER_NOT_FOUND.getMessage());
}
return authenticatedUser;
return user;
}
}
}
Expand Down
11 changes: 10 additions & 1 deletion ...bon/identity/application/authenticator/iproov/internal/IproovAuthenticatorDataHolder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,12 +124,21 @@ public static void setAccountLockService(AccountLockService accountLockService)
IproovAuthenticatorDataHolder.accountLockService = accountLockService;
}


/**
* Get IdpManager.
*
* @return IdpManager.
*/
public static IdpManager getIdpManager() {

return idpManager;
}

/**
* Set IdpManager.
*
* @param idpManager IdpManager.
*/
public static void setIdpManager(IdpManager idpManager) {

IproovAuthenticatorDataHolder.idpManager = idpManager;
Expand Down
40 changes: 31 additions & 9 deletions ...va/org/wso2/carbon/identity/application/authenticator/iproov/IproovAuthenticatorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,17 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.carbon.identity.application.authentication.framework.AuthenticatorFlowStatus;
import org.wso2.carbon.identity.application.authentication.framework.config.model.SequenceConfig;
import org.wso2.carbon.identity.application.authentication.framework.config.model.StepConfig;
import org.wso2.carbon.identity.application.authentication.framework.context.AuthenticationContext;
import org.wso2.carbon.identity.application.authentication.framework.exception.AuthenticationFailedException;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
import org.wso2.carbon.identity.application.authenticator.iproov.common.constants.IproovAuthenticatorConstants;
import org.wso2.carbon.identity.application.common.model.Property;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down Expand Up @@ -61,6 +65,9 @@ public class IproovAuthenticatorTest {
@Mock
private HttpServletResponse httpServletResponse;

@Mock
private AuthenticatedUser mockedAuthenticatedUser;

@Spy
private AuthenticationContext context;

Expand Down Expand Up @@ -136,22 +143,38 @@ public void testGetContextIdentifier() {
public void testProcessWithStatusCompletedWithAuthentication() throws AuthenticationFailedException {

doReturn(true).when(mockedIproovAuthenticator).canHandle(httpServletRequest);
AuthenticatedUser authenticatedUser = new AuthenticatedUser();
authenticatedUser.setUserId("testUser");
when(context.getLastAuthenticatedUser()).thenReturn(authenticatedUser);

setAuthenticatedUser();
mockHttpServletRequest("authentication");
doNothing().when(spy).processAuthenticationResponse(httpServletRequest, httpServletResponse, context);
AuthenticatorFlowStatus status = spy.process(httpServletRequest, httpServletResponse, context);
Assert.assertEquals(status, AuthenticatorFlowStatus.SUCCESS_COMPLETED);
}

private void setAuthenticatedUser() {

when(mockedAuthenticatedUser.toFullQualifiedUsername()).thenReturn("testUser@testDomain");
when(mockedAuthenticatedUser.getUserName()).thenReturn("testUser");
when(mockedAuthenticatedUser.getTenantDomain()).thenReturn("testDomain");
when(mockedAuthenticatedUser.getUserStoreDomain()).thenReturn("testUserStoreDomain");

when(context.getProperty(IproovAuthenticatorConstants.AUTHENTICATED_USER)).thenReturn(mockedAuthenticatedUser);
when(context.getLastAuthenticatedUser()).thenReturn(mockedAuthenticatedUser);
StepConfig stepConfig = new StepConfig();
stepConfig.setAuthenticatedUser(mockedAuthenticatedUser);
stepConfig.setSubjectAttributeStep(true);
Map<Integer, StepConfig> stepConfigMap = new HashMap<>();
stepConfigMap.put(1, stepConfig);
SequenceConfig sequenceConfig = new SequenceConfig();
sequenceConfig.setStepMap(stepConfigMap);
when(context.getSequenceConfig()).thenReturn(sequenceConfig);
}
@Test(description = "Test for initiateAuthenticationRequest method")
public void testProcessWithStatusCompletedWithVerification() throws AuthenticationFailedException {

doReturn(true).when(mockedIproovAuthenticator).canHandle(httpServletRequest);
AuthenticatedUser authenticatedUser = new AuthenticatedUser();
authenticatedUser.setUserId("testUser");
when(context.getLastAuthenticatedUser()).thenReturn(authenticatedUser);

setAuthenticatedUser();
mockHttpServletRequest("enrollment");
doNothing().when(spy).processAuthenticationResponse(httpServletRequest, httpServletResponse, context);
AuthenticatorFlowStatus status = spy.process(httpServletRequest, httpServletResponse, context);
Expand All @@ -162,9 +185,8 @@ public void testProcessWithStatusCompletedWithVerification() throws Authenticati
public void testProcessWithStatusIncompleteWithRetry() throws Exception {

doReturn(true).when(mockedIproovAuthenticator).canHandle(httpServletRequest);
AuthenticatedUser authenticatedUser = new AuthenticatedUser();
authenticatedUser.setUserId("testUser");
when(context.getLastAuthenticatedUser()).thenReturn(authenticatedUser);

setAuthenticatedUser();
mockHttpServletRequest("retry");
doNothing().when(spy).initiateIproovAuthenticationRequest(httpServletRequest, httpServletResponse, context);
AuthenticatorFlowStatus status = spy.process(httpServletRequest, httpServletResponse, context);
Expand Down

0 comments on commit 7d72b52

Please sign in to comment.