Merge pull request #1721 from mohanachandran-s/release-1.3.1

MOSIP-39171 - removed auth demo service code for releasing apitest commons
mosip · Jan 23, 2025 · 6497bc1 · 6497bc1
2 parents 020ebf9 + fd0861e
commit 6497bc1
Show file tree

Hide file tree

Showing 65 changed files with 2 additions and 8,411 deletions.
diff --git a/.github/workflows/apitest-push-trigger.yml b/.github/workflows/apitest-push-trigger.yml
@@ -56,33 +56,6 @@ jobs:
     uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
     with:
       SERVICE_LOCATION: ./apitest-commons
-    secrets:
-      SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      ORG_KEY: ${{ secrets.ORG_KEY }}
-      OSSRH_USER: ${{ secrets.OSSRH_USER }}
-      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-      GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
-  build-maven-authentication-demo-service:
-    uses: mosip/kattu/.github/workflows/maven-build.yml@master-java21
-    with:
-      SERVICE_LOCATION: ./authentication-demo-service
-      BUILD_ARTIFACT: authentication-demo-service
-    secrets:
-      OSSRH_USER: ${{ secrets.OSSRH_USER }}
-      OSSRH_SECRET: ${{ secrets.OSSRH_SECRET }}
-      OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
-      GPG_SECRET: ${{ secrets.GPG_SECRET }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
-
-  sonar_analysis-authentication-demo-service:
-    needs: build-maven-authentication-demo-service
-    if: "${{  github.event_name != 'pull_request' }}"
-    uses: mosip/kattu/.github/workflows/maven-sonar-analysis.yml@master-java21
-    with:
-      SERVICE_LOCATION: ./authentication-demo-service
     secrets:
       SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
       ORG_KEY: ${{ secrets.ORG_KEY }}

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ To use this repository, ensure you have:
     <dependency>
       <groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
       <artifactId>apitest-commons</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
     </dependency>
 
 ---

diff --git a/apitest-commons/README.md b/apitest-commons/README.md
@@ -84,7 +84,7 @@ Ensure the following software is installed on the machine from where the automat
     <dependency>
       <groupId>io.mosip.testrig.apirig.apitest.commons</groupId>
       <artifactId>apitest-commons</artifactId>
-      <version>1.3.0</version>
+      <version>1.3.1</version>
     </dependency>
 
 ---

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
@@ -3343,10 +3343,6 @@ public String inputJsonKeyWordHandeler(String jsonString, String testCaseName) {
 			jsonString = replaceKeywordWithValue(jsonString, "$VCICONTEXTURL$",
 					properties.getProperty("vciContextURL"));
 		}
-		if (jsonString.contains("$IDPREDIRECTURI$")) {
-		jsonString = replaceKeywordWithValue(jsonString, "$IDPREDIRECTURI$",
-				ApplnURI.replace(GlobalConstants.API_INTERNAL, "healthservices") + "/userprofile");
-	}
 
 		if (jsonString.contains("$NAMEFORUPDATEUIN$")) {
 			String name = getValueFromAuthActuator("json-property", "name");

diff --git a/authentication-demo-service/.gitignore b/authentication-demo-service/.gitignore
diff --git a/authentication-demo-service/Dockerfile b/authentication-demo-service/Dockerfile
diff --git a/authentication-demo-service/README.md b/authentication-demo-service/README.md
diff --git a/authentication-demo-service/entrypoint.sh b/authentication-demo-service/entrypoint.sh
diff --git a/authentication-demo-service/lib/Keystore/ExportPrivateKey.java b/authentication-demo-service/lib/Keystore/ExportPrivateKey.java
diff --git a/authentication-demo-service/lib/Keystore/MosipTestCert.cer b/authentication-demo-service/lib/Keystore/MosipTestCert.cer
diff --git a/authentication-demo-service/lib/Keystore/MosipTestCert.pem b/authentication-demo-service/lib/Keystore/MosipTestCert.pem
diff --git a/authentication-demo-service/lib/Keystore/PrivateKey.p12 b/authentication-demo-service/lib/Keystore/PrivateKey.p12
diff --git a/authentication-demo-service/lib/Keystore/PrivateKey.pem b/authentication-demo-service/lib/Keystore/PrivateKey.pem
diff --git a/authentication-demo-service/lib/Keystore/PublicKey.pem b/authentication-demo-service/lib/Keystore/PublicKey.pem
diff --git a/authentication-demo-service/lib/Keystore/README.txt b/authentication-demo-service/lib/Keystore/README.txt
diff --git a/authentication-demo-service/lib/Keystore/keystore.jks b/authentication-demo-service/lib/Keystore/keystore.jks
diff --git a/authentication-demo-service/lib/Keystore/keystore.jks.old b/authentication-demo-service/lib/Keystore/keystore.jks.old