Merge remote-tracking branch 'upstream/develop' into MOSIP-31314-otp-…

…validation-security-fix

authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/config/IDAMappingConfig.java

@@ -8,6 +8,7 @@
 import org.springframework.context.annotation.PropertySource;
 
 import io.mosip.authentication.common.service.factory.IDAMappingFactory;
+import io.mosip.authentication.core.indauth.dto.KeyBindedTokenDTO;
 import io.mosip.authentication.core.spi.indauth.match.MappingConfig;
 import lombok.Data;
 
@@ -128,5 +129,4 @@ public class IDAMappingConfig implements MappingConfig {
 
 	/** The password. */
 	private List<String> password;
-
 }

authentication/authentication-common/src/main/java/io/mosip/authentication/common/service/impl/IdInfoFetcherImpl.java

@@ -571,7 +571,9 @@ public List<String> getUserPreferredLanguages(Map<String, List<IdentityInfoDTO>>
 		if (userPreferredLangAttribute != null) {
 			List<IdentityInfoDTO> identityInfoList = idInfo.get(userPreferredLangAttribute);
 			if (identityInfoList != null) {
-				return identityInfoList.stream().map(IdentityInfoDTO::getValue).collect(Collectors.toList());
+				return identityInfoList.stream().map(info -> info.getValue().split(","))
+				                                .flatMap(java.util.Arrays::stream)
+												.collect(Collectors.toList());
 			}
 			return Collections.emptyList();
 		}