Mosip 35404 commons cleanup

api-test/pom.xml

@@ -56,7 +56,7 @@
 		<dependency>
 			<groupId>io.mosip.testrig.apitest.commons</groupId>
 			<artifactId>apitest-commons</artifactId>
-			<version>1.3.0</version>
+			<version>1.3.1-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

api-test/src/main/java/io/mosip/testrig/apirig/resident/testrunner/MosipTestRunner.java

@@ -95,6 +95,7 @@ public static void main(String[] arg) {
 			KeycloakUserManager.removeUser();
 			KeycloakUserManager.createUsers();
 			KeycloakUserManager.closeKeycloakInstance();
+			AdminTestUtil.getRequiredField();
 
 			AdminTestUtil.getRegistrationCenterData();
 			AdminTestUtil.getLocationDataWithLocationCode(BaseTestCase.locationCode);

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/AddIdentity.java

@@ -98,9 +98,6 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
 								MediaType.APPLICATION_JSON, COOKIENAME,
 								new KernelAuthentication().getTokenByRole(testCaseDTO.getRole())).asString(),
 						"response.uin");
-
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
-
 		DateFormat dateFormatter = new SimpleDateFormat("yyyyMMddHHmmss");
 		Calendar cal = Calendar.getInstance();
 		String timestampValue = dateFormatter.format(cal.getTime());

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/DeleteWithParam.java

@@ -82,7 +82,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/GetWithParam.java

@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/GetWithParamForAutoGenId.java

@@ -86,7 +86,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/GetWithParamForDownloadCard.java

@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AdminTestException {	
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
 		}

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/GetWithQueryParamForDownloadCard.java

@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws Exception {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
 		}

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/PostWithAutogenIdWithOtpGenerate.java

@@ -97,8 +97,6 @@ public void test(TestCaseDTO testCaseDTO)
 				throw new SkipException(GlobalConstants.VID_FEATURE_NOT_SUPPORTED);
 			}
 		}
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
-
 		String inputJson = testCaseDTO.getInput().toString();
 		JSONObject req = new JSONObject(testCaseDTO.getInput());
 

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/PostWithBodyWithOtpGenerate.java

@@ -92,8 +92,6 @@ public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, Ad
 				throw new SkipException(GlobalConstants.VID_FEATURE_NOT_SUPPORTED);
 			}
 		}
-
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		auditLogCheck = testCaseDTO.isAuditLogCheck();
 		String tempUrl = ResidentConfigManager.getEsignetBaseUrl();
 		JSONObject req = new JSONObject(testCaseDTO.getInput());

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/PostWithBodyWithPdfDownload.java

@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {		
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);
 		}

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/PostWithOnlyPathParam.java

@@ -83,7 +83,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		String[] templateFields = testCaseDTO.getTemplateFields();
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/PostWithParamAndFile.java

@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(
 					GlobalConstants.TARGET_ENV_HEALTH_CHECK_FAILED + HealthChecker.healthCheckFailureMapS);

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/SimplePatch.java

@@ -83,7 +83,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		String[] templateFields = testCaseDTO.getTemplateFields();
 		if (HealthChecker.signalTerminateExecution) {
 			throw new SkipException(

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/SimplePost.java

@@ -84,7 +84,6 @@ public Object[] getTestCaseList(ITestContext context) {
 	public void test(TestCaseDTO testCaseDTO) throws AuthenticationTestException, AdminTestException {
 		testCaseName = testCaseDTO.getTestCaseName();
 		testCaseName = ResidentUtil.isTestCaseValidForExecution(testCaseDTO);
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		auditLogCheck = testCaseDTO.isAuditLogCheck();
 		String[] templateFields = testCaseDTO.getTemplateFields();
 		if (HealthChecker.signalTerminateExecution) {

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/SimplePostForAutoGenId.java

@@ -99,12 +99,12 @@ public void test(TestCaseDTO testCaseDTO)
 				throw new SkipException(GlobalConstants.VID_FEATURE_NOT_SUPPORTED);
 			}
 		}
-
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		String[] templateFields = testCaseDTO.getTemplateFields();
 		String inputJson = "";
 
 		inputJson = getJsonFromTemplate(testCaseDTO.getInput(), testCaseDTO.getInputTemplate());
+
+		inputJson = ResidentUtil.inputstringKeyWordHandeler(inputJson, testCaseName);
 
 		String outputJson = getJsonFromTemplate(testCaseDTO.getOutput(), testCaseDTO.getOutputTemplate());
 

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/SimplePostForAutoGenIdForUrlEncoded.java

@@ -100,11 +100,12 @@ public void test(TestCaseDTO testCaseDTO)
 		if (ResidentConfigManager.isInServiceNotDeployedList(GlobalConstants.ESIGNET)) {
 			throw new SkipException("esignet is not deployed hence skipping the testcase");
 		}
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		String[] templateFields = testCaseDTO.getTemplateFields();
 
 		String inputJson = getJsonFromTemplate(testCaseDTO.getInput(), testCaseDTO.getInputTemplate());
 		String outputJson = getJsonFromTemplate(testCaseDTO.getOutput(), testCaseDTO.getOutputTemplate());
+
+		inputJson = ResidentUtil.inputstringKeyWordHandeler(inputJson, testCaseName);
 
 		String jsonInput = inputJsonKeyWordHandeler(inputJson, testCaseName);
 

api-test/src/main/java/io/mosip/testrig/apirig/resident/testscripts/SimplePut.java

@@ -95,7 +95,6 @@ public void test(TestCaseDTO testCaseDTO) throws AdminTestException {
 			}
 		}
 
-		testCaseName = isTestCaseValidForExecution(testCaseDTO);
 		String[] templateFields = testCaseDTO.getTemplateFields();
 
 		if (testCaseDTO.getTemplateFields() != null && templateFields.length > 0) {

api-test/src/main/java/io/mosip/testrig/apirig/resident/utils/ResidentUtil.java

@@ -1,29 +1,213 @@
 package io.mosip.testrig.apirig.resident.utils;
 
+import java.time.Instant;
+
+import javax.ws.rs.core.MediaType;
+
 import org.apache.log4j.Logger;
+import org.json.JSONArray;
+import org.json.JSONObject;
 import org.testng.SkipException;
 
 import io.mosip.testrig.apirig.dto.TestCaseDTO;
 import io.mosip.testrig.apirig.resident.testrunner.MosipTestRunner;
+import io.mosip.testrig.apirig.testrunner.BaseTestCase;
 import io.mosip.testrig.apirig.utils.AdminTestUtil;
 import io.mosip.testrig.apirig.utils.GlobalConstants;
+import io.mosip.testrig.apirig.utils.GlobalMethods;
+import io.mosip.testrig.apirig.utils.RestClient;
 import io.mosip.testrig.apirig.utils.SkipTestCaseHandler;
+import io.restassured.response.Response;
 
 public class ResidentUtil extends AdminTestUtil {
 
 	private static final Logger logger = Logger.getLogger(ResidentUtil.class);
 
+	protected static final String ESIGNET_PAYLOAD = "config/esignetPayload.json";
+
 	public static String isTestCaseValidForExecution(TestCaseDTO testCaseDTO) {
 		String testCaseName = testCaseDTO.getTestCaseName();
 
+		int indexof = testCaseName.indexOf("_");
+		String modifiedTestCaseName = testCaseName.substring(indexof + 1);
+
+		addTestCaseDetailsToMap(modifiedTestCaseName, testCaseDTO.getUniqueIdentifier());
+
 		if (MosipTestRunner.skipAll == true) {
 			throw new SkipException(GlobalConstants.PRE_REQUISITE_FAILED_MESSAGE);
 		}
 
 		if (SkipTestCaseHandler.isTestCaseInSkippedList(testCaseName)) {
 			throw new SkipException(GlobalConstants.KNOWN_ISSUES);
 		}
+
+		if ((ResidentConfigManager.isInServiceNotDeployedList(GlobalConstants.ESIGNET))
+				&& BaseTestCase.currentModule.equalsIgnoreCase("resident") && testCaseName.contains("_SignJWT_")) {
+			throw new SkipException("esignet module is not deployed");
+		}
+
+		if ((ResidentConfigManager.isInServiceNotDeployedList(GlobalConstants.ESIGNET))
+				&& BaseTestCase.currentModule.equalsIgnoreCase("resident")
+				&& (testCaseDTO.getRole() != null && (testCaseDTO.getRole().equalsIgnoreCase("residentNew")
+						|| testCaseDTO.getRole().equalsIgnoreCase("residentNewVid")))) {
+			throw new SkipException("esignet module is not deployed");
+		}
+		if (BaseTestCase.currentModule.equalsIgnoreCase(GlobalConstants.RESIDENT)) {
+			if (testCaseDTO.getRole() != null && (testCaseDTO.getRole().equalsIgnoreCase(GlobalConstants.RESIDENTNEW)
+					|| testCaseDTO.isValidityCheckRequired())) {
+				if (testCaseName.contains("uin") || testCaseName.contains("UIN") || testCaseName.contains("Uin")) {
+					if (BaseTestCase.getSupportedIdTypesValueFromActuator().contains("UIN")
+							&& BaseTestCase.getSupportedIdTypesValueFromActuator().contains("uin")) {
+						throw new SkipException("Idtype UIN not supported skipping the testcase");
+					}
+				}
+			} else if (testCaseDTO.getRole() != null && (testCaseDTO.getRole().equalsIgnoreCase("residentNewVid")
+					|| testCaseDTO.isValidityCheckRequired())) {
+				if (testCaseName.contains("vid") || testCaseName.contains("VID") || testCaseName.contains("Vid")) {
+					if (BaseTestCase.getSupportedIdTypesValueFromActuator().contains("VID")
+							&& BaseTestCase.getSupportedIdTypesValueFromActuator().contains("vid")) {
+						throw new SkipException("Idtype VID not supported skipping the testcase");
+					}
+				}
+			}
+		}
+
 		return testCaseName;
 	}
 
+	public static String inputstringKeyWordHandeler(String jsonString, String testCaseName) {
+		if (jsonString.contains(GlobalConstants.TIMESTAMP)) {
+			jsonString = replaceKeywordValue(jsonString, GlobalConstants.TIMESTAMP, generateCurrentUTCTimeStamp());
+		}
+
+		if (jsonString.contains("$CLAIMSFROMCONFIG$")) {
+			jsonString = replaceKeywordValue(jsonString, "$CLAIMSFROMCONFIG$", getValueFromConfigActuator());
+		}
+
+		if (jsonString.contains("$OIDCCLIENT$")) {
+			jsonString = replaceKeywordValue(jsonString, "$OIDCCLIENT$",
+					getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES, "mosip.iam.module.clientID"));
+		}
+
+		if (jsonString.contains("$IDPCLIENTPAYLOAD$")) {
+			String clientId = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES,
+					"mosip.iam.module.clientID");
+			String esignetBaseURI = getValueFromActuator(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES,
+					"mosip.iam.token_endpoint");
+			int idTokenExpirySecs = Integer
+					.parseInt(getValueFromEsignetActuator(ResidentConfigManager.getEsignetActuatorPropertySection(),
+							GlobalConstants.MOSIP_ESIGNET_ID_TOKEN_EXPIRE_SECONDS));
+
+			Instant instant = Instant.now();
+
+			logger.info("Current Instant: " + instant);
+
+			long epochValue = instant.getEpochSecond();
+
+			org.json.simple.JSONObject payloadBody = getRequestJson(ESIGNET_PAYLOAD);
+			payloadBody.put("sub", clientId);
+			payloadBody.put("iss", clientId);
+			payloadBody.put("aud", esignetBaseURI);
+			payloadBody.put("exp", epochValue + idTokenExpirySecs);
+			payloadBody.put("iat", epochValue);
+
+			jsonString = replaceKeywordValue(jsonString, "$IDPCLIENTPAYLOAD$",
+					encodeBase64(payloadBody.toString()));
+		}
+
+
+		return jsonString;
+
+	}
+
+	public static String replaceKeywordValue(String jsonString, String keyword, String value) {
+		if (value != null && !value.isEmpty())
+			return jsonString.replace(keyword, value);
+		else
+			throw new SkipException("Marking testcase as skipped as required fields are empty " + keyword);
+	}
+
+	public static JSONArray esignetActuatorResponseArray = null;
+
+	public static String getValueFromEsignetActuator(String section, String key) {
+		String url = ResidentConfigManager.getEsignetBaseUrl() + ResidentConfigManager.getproperty("actuatorEsignetEndpoint");
+		String actuatorCacheKey = url + section + key;
+		String value = actuatorValueCache.get(actuatorCacheKey);
+		if (value != null && !value.isEmpty())
+			return value;
+
+		try {
+			if (esignetActuatorResponseArray == null) {
+				Response response = null;
+				JSONObject responseJson = null;
+				response = RestClient.getRequest(url, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON);
+				responseJson = new JSONObject(response.getBody().asString());
+				esignetActuatorResponseArray = responseJson.getJSONArray("propertySources");
+			}
+
+			for (int i = 0, size = esignetActuatorResponseArray.length(); i < size; i++) {
+				JSONObject eachJson = esignetActuatorResponseArray.getJSONObject(i);
+				if (eachJson.get("name").toString().contains(section)) {
+					value = eachJson.getJSONObject(GlobalConstants.PROPERTIES).getJSONObject(key)
+							.get(GlobalConstants.VALUE).toString();
+					if (ResidentConfigManager.IsDebugEnabled())
+						logger.info("Actuator: " + url + " key: " + key + " value: " + value);
+					break;
+				}
+			}
+			actuatorValueCache.put(actuatorCacheKey, value);
+
+			return value;
+		} catch (Exception e) {
+			logger.error(GlobalConstants.EXCEPTION_STRING_2 + e);
+			return value;
+		}
+
+	}
+
+	public static JSONArray configActuatorResponseArray = null;
+
+	public static String getValueFromConfigActuator() {
+
+		String url = ApplnURI + ResidentConfigManager.getproperty("actuatorEndpoint");
+
+		String actuatorCacheKey = url + "mosip.iam.module.login_flow.claims";
+
+		String claims = actuatorValueCache.get(actuatorCacheKey);
+
+		if (claims != null && !claims.isEmpty())
+			return claims;
+
+		try {
+			if (configActuatorResponseArray == null) {
+				Response response = null;
+				JSONObject responseJson = null;
+				response = RestClient.getRequest(url, MediaType.APPLICATION_JSON, MediaType.APPLICATION_JSON);
+				GlobalMethods.reportResponse(response.getHeaders().asList().toString(), url, response);
+
+				responseJson = new JSONObject(response.getBody().asString());
+				configActuatorResponseArray = responseJson.getJSONArray("propertySources");
+			}
+
+			for (int i = 0, size = configActuatorResponseArray.length(); i < size; i++) {
+				JSONObject eachJson = configActuatorResponseArray.getJSONObject(i);
+				if (eachJson.get("name").toString().contains(GlobalConstants.RESIDENT_DEFAULT_PROPERTIES)) {
+					String claimVal = eachJson.getJSONObject(GlobalConstants.PROPERTIES)
+							.getJSONObject("mosip.iam.module.login_flow.claims").getString(GlobalConstants.VALUE);
+					JSONObject claimJson = new JSONObject(claimVal);
+					claims = claimJson.getJSONObject("userinfo").toString();
+					break;
+				}
+			}
+
+			actuatorValueCache.put(actuatorCacheKey, claims);
+
+			return claims;
+		} catch (Exception e) {
+			logger.error(GlobalConstants.EXCEPTION_STRING_2 + e);
+			return claims;
+		}
+
+	}
+
 }