diff --git a/.github/workflows/apitest-push-trigger.yml b/.github/workflows/apitest-push-trigger.yml index 18210ad9f4..1f869396a9 100644 --- a/.github/workflows/apitest-push-trigger.yml +++ b/.github/workflows/apitest-push-trigger.yml @@ -24,7 +24,7 @@ on: jobs: build-maven-apitest-commons: - uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-build.yml@master with: SERVICE_LOCATION: ./apitest-commons BUILD_ARTIFACT: apitest-commons @@ -38,7 +38,7 @@ jobs: publish_to_nexus: if: "${{ !contains(github.ref, 'master') && github.event_name != 'pull_request' && github.event_name != 'release' && github.event_name != 'prerelease' && github.event_name != 'publish' }}" needs: build-maven-apitest-commons - uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-publish-to-nexus.yml@master with: SERVICE_LOCATION: ./apitest-commons secrets: @@ -53,7 +53,7 @@ jobs: sonar_analysis: needs: build-maven-apitest-commons if: "${{ github.event_name != 'pull_request' }}" - uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21 + uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master with: SERVICE_LOCATION: ./apitest-commons secrets: diff --git a/apitest-commons/pom.xml b/apitest-commons/pom.xml index c232cf9525..15894e6eec 100644 --- a/apitest-commons/pom.xml +++ b/apitest-commons/pom.xml @@ -41,45 +41,160 @@ UTF-8 - 21 - 21 - 3.8.0 + 11 + 11 + 3.7.0 3.0.2 3.1.0 + 2.9 + 0.8.1 + 3.2 + 3.0.1 + 2.3 + false 3.7.0.1746 + + 2.0.2.RELEASE + 2.0.7.RELEASE + 5.0.5.RELEASE + 2.0.0.RELEASE + + 2.0.7 + 1.5.20 + 2.9.2 + + 3.6.2 + 3.7.0 + + + + 1.2 + 3.0.0 + 1.3 + 2.2 + 2.0.1.Final + 2.2.6 + + + 1.4.197 + 5.1.46 + 42.2.2 + 2.5.0 + 6.0.12.Final + + + 1.10.19 + 1.7.4 + 2.0.0-beta.5 + + + 1.2.3 + 1.7.19 + 2.16.0 + 1.7.25 + + + 2.9.5 + 20180130 + 2.2.10 + 20180130 - 1.15 + 3.6.1 + 3.7 + 2.6 + 1.11 + 4.3 1.9.2 + 2.2 + 4.5.6 + 19.0 + 1.18.8 + 0.1.54 + 1.4.0 + 7.1.0 + 2.0.0 + 5.5.13 + 2.3.23 1.7 + 2.0 + 1.5.2 + 2.1.1 + 1.60 63.1 + 1.0.0 + 3.3.3 2.8.1 + 4.1.0-incubating 1.11.368 + 0.2.4 + 2.3.0 + 3.0.1 + 1.9.12 + 0.6.0 + 2.0.0.AM2 + + + + + + + + 0.8.2 + 2.2 + 3.2 + UTF-8 + 3.7.0 + 3.0.1 + + + 1.1.6 + 1.7.19 + 1.10.19 + + + 1.4.6 + + + 5.0.6.RELEASE 5.4.2.Final + + 2.1.1 + + + 10.13.1.1 + + + 3.4.0 + + + 1.3.5 + + + 0.3.12 + + + 0.3.0 + 1.1.2-incubating - 1.2.1-SNAPSHOT + 1.2.0.1-B1 0.4.7 3.0.0 2.41.2 + 2.4.0 3.3.9 - 7.10.1 + 3.0.7 + 6.11 1.13 - apitest-commons-1.2.1-SNAPSHOT-jar-with-dependencies + apitest-commons-1.2.0.1-SNAPSHOT-jar-with-dependencies - - - junit - junit - test - - com.opencsv opencsv @@ -97,7 +212,7 @@ com.ibm.icu icu4j - ${icu4j.version} + 68.1 org.keycloak @@ -108,6 +223,7 @@ org.javassist javassist + 3.25.0-GA com.fasterxml.jackson.core jackson-annotations + ${jackson.version} com.fasterxml.jackson.core jackson-databind + 2.10.5 com.fasterxml.jackson.dataformat jackson-dataformat-xml + ${jackson.version} org.json json + ${json.version} com.googlecode.json-simple json-simple + 1.1.1 com.google.code.gson gson + 2.8.4 org.apache.maven.plugins @@ -210,6 +337,7 @@ com.google.guava guava + ${guava.version} @@ -225,35 +353,48 @@ javax.validation validation-api + ${javax.validation-api.version} io.swagger swagger-annotations + ${swagger.annotations.version} com.fasterxml.jackson.datatype jackson-datatype-jsr310 + ${jackson.version} org.postgresql postgresql + ${postgresql.version} org.slf4j slf4j-log4j12 + 1.6.2 org.apache.logging.log4j log4j-api + 2.11.1 net.lingala.zip4j zip4j 1.3.2 - + + + com.ibm.icu + icu4j + ${icu4j.version} + + org.apache.httpcomponents httpclient + 4.5.3 runtime @@ -272,17 +413,19 @@ org.bouncycastle bcprov-jdk15on - 1.70 + 1.56 commons-codec commons-codec + ${commons-codec} commons-io commons-io + ${commons-io} com.google.zxing @@ -383,21 +526,15 @@ org.apache.activemq activemq-broker + 5.15.9 org.projectlombok lombok + ${lombok.version} compile - - org.springframework.boot - spring-boot-starter-batch - - - org.hibernate.validator - hibernate-validator - @@ -410,15 +547,7 @@ commons-codec commons-codec - ${commons-codec} - - - - io.mosip.kernel - kernel-bom - 1.2.1-SNAPSHOT - pom - import + 1.15 @@ -445,12 +574,11 @@ - org.apache.maven.plugins maven-compiler-plugin - ${maven.compiler.version} + 3.5.1 - ${maven.compiler.source} - ${maven.compiler.target} + 11 + 11 -Dfile.encoding=UTF-8 @@ -485,6 +613,7 @@ ${project.basedir}/.git + org.apache.maven.plugins maven-gpg-plugin @@ -505,104 +634,103 @@ - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - - shade - - - ${fileName} - - - - - - - io.mosip.testrig.apirig.testrunner.MosipTestRunner - - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - ${maven.jar.plugin.version} - - - - true - true - - - ${project.name} - ${project.version} - ${user.name} - ${os.name} - ${maven.build.timestamp} - ${env.BUILD_NUMBER} - ${env.BUILD_ID} - ${env.BUILD_URL} - - - - - - org.apache.maven.plugins - maven-war-plugin - ${maven.war.plugin.version} - - - - true - true - - - ${project.name} - ${project.version} - ${user.name} - ${os.name} - ${maven.build.timestamp} - ${env.BUILD_NUMBER} - ${env.BUILD_ID} - ${env.BUILD_URL} - - - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - + + + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + + shade + + + ${fileName} + + + + + + io.mosip.testrig.apirig.testrunner.MosipTestRunner + + + + + + *:* + + META-INF/*.SF + META-INF/*.DSA + META-INF/*.RSA + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + ${maven.jar.plugin.version} + + + + true + true + + + ${project.name} + ${project.version} + ${user.name} + ${os.name} + ${maven.build.timestamp} + ${env.BUILD_NUMBER} + ${env.BUILD_ID} + ${env.BUILD_URL} + + + + + + org.apache.maven.plugins + maven-war-plugin + ${maven.war.plugin.version} + + + + true + true + + + ${project.name} + ${project.version} + ${user.name} + ${os.name} + ${maven.build.timestamp} + ${env.BUILD_NUMBER} + ${env.BUILD_ID} + ${env.BUILD_URL} + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.2.1 + + + attach-sources + + jar-no-fork + + + + org.apache.maven.plugins maven-antrun-plugin diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java index 41c56a0075..b22ffd1b8d 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/testrunner/BaseTestCase.java @@ -110,7 +110,7 @@ public class BaseTestCase { public static Map residentQueries; public static Map partnerQueries; public static boolean insertDevicedata = false; - public static boolean proxy = true; + public static boolean proxy = false; public static String ApplnURI; public static String ApplnURIForKeyCloak; diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java index c8de464275..c7193e00d2 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/AdminTestUtil.java @@ -1117,7 +1117,8 @@ protected Response postWithBodyAndCookieForAutoGeneratedId(String url, String js if (BaseTestCase.currentModule.equals(GlobalConstants.MIMOTO) || BaseTestCase.currentModule.equals("auth") || BaseTestCase.currentModule.equals(GlobalConstants.ESIGNET) || BaseTestCase.currentModule.equals(GlobalConstants.RESIDENT) - || BaseTestCase.currentModule.equals(GlobalConstants.MASTERDATA)) { + || BaseTestCase.currentModule.equals(GlobalConstants.MASTERDATA) + || BaseTestCase.currentModule.equals(GlobalConstants.PREREG)) { inputJson = smtpOtpHandler(inputJson, testCaseName); } if (bothAccessAndIdToken) { @@ -6430,18 +6431,7 @@ public static String smtpOtpHandler(String inputJson, String testCaseName) { } } } - if (BaseTestCase.currentModule.equals(GlobalConstants.PREREG)) { - if (request.has(GlobalConstants.REQUEST)) { - if (request.getJSONObject(GlobalConstants.REQUEST).has("otp")) { - emailId = request.getJSONObject(GlobalConstants.REQUEST).getString("userId"); - logger.info(emailId); - otp = MockSMTPListener.getOtp(emailId); - request.getJSONObject(GlobalConstants.REQUEST).put("otp", otp); - inputJson = request.toString(); - return inputJson; - } - } - } + if (BaseTestCase.currentModule.equals("auth")) { if (testCaseName.startsWith("auth_GenerateVID") || testCaseName.startsWith("auth_AuthLock") diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/ConfigManager.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/ConfigManager.java index aa07697e7e..bd9aa6530b 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/ConfigManager.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/ConfigManager.java @@ -247,6 +247,8 @@ public class ConfigManager { public static Properties propsKernel; private static String reportExpirationInDays; + public static boolean getUsePreConfiguredOtp; + public static void setProperty(String key, String value) { // Overwrite the value with only if the key exists if (propsKernel.containsKey(key)) { diff --git a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java index 669235ba80..b053e6a726 100644 --- a/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java +++ b/apitest-commons/src/main/java/io/mosip/testrig/apirig/utils/KernelAuthentication.java @@ -7,6 +7,7 @@ import org.json.simple.JSONObject; import io.mosip.testrig.apirig.testrunner.BaseTestCase; +import io.mosip.testrig.apirig.testrunner.MockSMTPListener; import io.restassured.RestAssured; import io.restassured.response.Response; @@ -507,12 +508,14 @@ public String getPreRegToken() { ((JSONObject) actualRequest_generation.get(GlobalConstants.REQUEST)).put("langCode", BaseTestCase.getLanguageList().get(0)); ((JSONObject) actualRequest_generation.get(GlobalConstants.REQUEST)).get("userId").toString(); + String userId = ((JSONObject) actualRequest_generation.get(GlobalConstants.REQUEST)).get("userId").toString(); JSONObject actualRequest_validation = getRequestJson("config/prereg_ValidateOtp.json"); appl.postWithJson(preregSendOtp, actualRequest_generation); String otp = null; - if (proxy) + if (ConfigManager.getUsePreConfiguredOtp) otp = "111111"; else { + otp = MockSMTPListener.getOtp(userId); } ((JSONObject) actualRequest_validation.get(GlobalConstants.REQUEST)).put("otp", otp); actualRequest_validation.put(GlobalConstants.REQUESTTIME, clib.getCurrentUTCTime());