Mosip 27701 ida handle lock unlock of authentication channel email mo…

…bile (#1036)

* MOSIP-27701 changes made to send otp

* Resolved build failure

* MOSIP-27701 resolved

* Exception handled

---------

Co-authored-by: Neha Farheen <m1092365@mindtree.com>

authentication/authentication-authtypelockfilter-impl/src/main/java/io/mosip/authentication/authtypelockfilter/impl/AuthTypeLockFilterImpl.java

@@ -101,18 +101,21 @@ else if (AuthTypeUtil.isBio(authRequestDTO)
 
 			else if (AuthTypeUtil.isOtp(authRequestDTO))
 				if (authTypeStatus.getAuthType().equalsIgnoreCase(MatchType.Category.OTP.getType())
-						&& (authTypeStatus.getAuthSubType().isEmpty() || authTypeStatus.getAuthSubType() == null)) {
+						&& (authTypeStatus.getAuthSubType() == null || authTypeStatus.getAuthSubType().isEmpty())) {
 					throw new IdAuthenticationFilterException(
 							IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorCode(),
 							String.format(IdAuthenticationErrorConstants.AUTH_TYPE_LOCKED.getErrorMessage(),
 									MatchType.Category.OTP.getType()));
 				} else {
-					if ((authTypeStatus.getAuthSubType().equalsIgnoreCase(IdAuthCommonConstants.PHONE_NUMBER)
-							|| authTypeStatus.getAuthSubType().equalsIgnoreCase(IdAuthCommonConstants.EMAIL))
+					if ((authTypeStatus.getAuthSubType() == null || authTypeStatus.getAuthSubType().isEmpty())
+							&& (authTypeStatus.getAuthSubType().equalsIgnoreCase(IdAuthCommonConstants.PHONE_NUMBER)
+									|| authTypeStatus.getAuthSubType().equalsIgnoreCase(IdAuthCommonConstants.EMAIL))
 							&& authTypeStatus.getLocked().equals(true)) {
 						Optional<AuthtypeStatus> otherSubOtpTypeLocked = authtypeStatusList.stream()
-								.filter(authTypeStatus1 -> authTypeStatus1.getAuthType()
-										.equalsIgnoreCase(MatchType.Category.OTP.getType())
+								.filter(authTypeStatus1 -> authTypeStatus1.getAuthType() != null
+										&& authTypeStatus1.getAuthType()
+												.equalsIgnoreCase(MatchType.Category.OTP.getType())
+										&& authTypeStatus1.getAuthSubType() != null
 										&& !authTypeStatus1.getAuthSubType()
 												.equalsIgnoreCase(authTypeStatus.getAuthSubType())
 										&& authTypeStatus1.getLocked())