Mosip 30293 getting auth token value in response even if authenticati…

…on fails (#1217) * Added changes to set authtoken Signed-off-by: Neha Farheen <[email protected]> * Changes in test class Signed-off-by: Neha Farheen <[email protected]> * changes in test class Signed-off-by: Neha Farheen <[email protected]> --------- Signed-off-by: Neha Farheen <[email protected]> Co-authored-by: Neha Farheen <[email protected]>
mosip · Mar 14, 2024 · 7f4c2d8 · 7f4c2d8
1 parent d367b28
commit 7f4c2d8
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 13 deletions.
diff --git a/...mon/src/main/java/io/mosip/authentication/common/service/builder/AuthResponseBuilder.java b/...mon/src/main/java/io/mosip/authentication/common/service/builder/AuthResponseBuilder.java
@@ -119,7 +119,9 @@ public AuthResponseDTO build(String tokenID) {
 		boolean status = !authStatusInfos.isEmpty() && authStatusInfos.stream().allMatch(AuthStatusInfo::isStatus);
 		ResponseDTO res = new ResponseDTO();
 		res.setAuthStatus(status);
-		res.setAuthToken(tokenID);
+		if(status) {
+			res.setAuthToken(tokenID);
+		}
 		responseDTO.setResponse(res);
 		responseDTO.setResponseTime(DateUtils.getUTCCurrentDateTimeString(IdAuthCommonConstants.UTC_DATETIME_PATTERN));
 		AuthError[] authErrors = authStatusInfos.stream().flatMap(statusInfo -> Optional.ofNullable(statusInfo.getErr())

diff --git a/.../test/java/io/mosip/authentication/service/kyc/validator/KycAuthRequestValidatorTest.java b/.../test/java/io/mosip/authentication/service/kyc/validator/KycAuthRequestValidatorTest.java
@@ -22,6 +22,7 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestContext;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -34,10 +35,10 @@
 import io.mosip.authentication.common.service.integration.MasterDataManager;
 import io.mosip.authentication.common.service.util.EnvUtil;
 import io.mosip.authentication.common.service.validator.AuthRequestValidator;
+import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO;
 import io.mosip.authentication.core.indauth.dto.IdType;
 import io.mosip.authentication.core.indauth.dto.IdentityDTO;
 import io.mosip.authentication.core.indauth.dto.IdentityInfoDTO;
-import io.mosip.authentication.core.indauth.dto.EkycAuthRequestDTO;
 import io.mosip.authentication.core.indauth.dto.RequestDTO;
 import io.mosip.kernel.logger.logback.appender.RollingFileAppender;
 import io.mosip.kernel.pinvalidator.impl.PinValidatorImpl;
@@ -51,6 +52,7 @@
 @WebMvcTest
 @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class })
 @Import(EnvUtil.class)
+@TestPropertySource(locations="classpath:application.properties")
 public class KycAuthRequestValidatorTest {
 
 	@Mock

diff --git a/...t/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidatorTest.java b/...t/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidatorTest.java
@@ -1,9 +1,13 @@
 package io.mosip.authentication.service.kyc.validator;
 
-import io.mosip.authentication.common.service.util.EnvUtil;
-import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO;
-import io.mosip.authentication.core.indauth.dto.VciCredentialsDefinitionRequestDTO;
-import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -13,24 +17,23 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestContext;
+import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.web.context.WebApplicationContext;
 
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import io.mosip.authentication.common.service.util.EnvUtil;
+import io.mosip.authentication.core.indauth.dto.KycAuthRequestDTO;
+import io.mosip.authentication.core.indauth.dto.VciCredentialsDefinitionRequestDTO;
+import io.mosip.authentication.core.indauth.dto.VciExchangeRequestDTO;
 
 @RunWith(SpringRunner.class)
 @WebMvcTest
 @ContextConfiguration(classes = { TestContext.class, WebApplicationContext.class })
 @Import(EnvUtil.class)
+@TestPropertySource(locations="classpath:application.properties")
 public class VciExchangeRequestValidatorTest {
 
     @InjectMocks