Merge pull request mosip#949 from mosip/release-1.2.0.1

Release 1.2.0.1-B2
tf-govstack · Jan 7, 2023 · 4ad3738 · 4ad3738
2 parents c408f26 + 726d3fc
commit 4ad3738
Show file tree

Hide file tree

Showing 114 changed files with 15,273 additions and 12,485 deletions.
diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
@@ -125,13 +125,13 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
         GPG_TTY: $(tty)
-    - uses: 8398a7/action-slack@v3
-      with:
-        status: ${{ job.status }}
-        fields: repo,message,commit,workflow,job # selectable (default: repo,message)
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required
-      if: failure() # Pick up events even if the job fails or is canceled.
+  # - uses: 8398a7/action-slack@v3
+    # with:
+    #   status: ${{ job.status }}
+    #   fields: repo,message,commit,workflow,job # selectable (default: repo,message)
+    # env:
+    #   SLACK_WEBHOOK_URL: ${{ secrets.SLACK_DEVOPS_WEBHOOK }} # required
+    # if: failure() # Pick up events even if the job fails or is canceled.
 
   docker-authentication-otp-service:
     needs: build
@@ -367,7 +367,7 @@ jobs:
           mvn -B -Dgpg.skip verify sonar:sonar -Dsonar.projectKey=mosip_${{ github.event.repository.name }} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=https://sonarcloud.io -Dsonar.login=${{ secrets.SONAR_TOKEN }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN1 }}
       - uses: 8398a7/action-slack@v3
         with:
           status: ${{ job.status }}

diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,4 @@ test.txt
 /.recommenders/
 **/*.iml
 .vscode
+.sts4-cache*
diff --git a/authentication/authentication-authtypelockfilter-impl/pom.xml b/authentication/authentication-authtypelockfilter-impl/pom.xml
@@ -4,9 +4,9 @@
 	<parent>
 		<groupId>io.mosip.authentication</groupId>
 		<artifactId>authentication-parent</artifactId>
-		<version>1.2.0.1-B1</version>
+		<version>1.2.0.1-B2</version>
 	</parent>
-	<version>1.2.0.1-B1</version>
+	<version>1.2.0.1-B2</version>
 	<artifactId>authentication-authtypelockfilter-impl</artifactId>
 	<name>authentication-authtypelockfilter-impl</name>
 	<description>ID Authentication Filter Implementation for Auth Type Lock validation</description>

diff --git a/authentication/authentication-common/pom.xml b/authentication/authentication-common/pom.xml
@@ -6,9 +6,9 @@
 	<parent>
 		<groupId>io.mosip.authentication</groupId>
 		<artifactId>authentication-parent</artifactId>
-		<version>1.2.0.1-B1</version>
+		<version>1.2.0.1-B2</version>
 	</parent>
-	<version>1.2.0.1-B1</version>
+	<version>1.2.0.1-B2</version>
 	<artifactId>authentication-common</artifactId>
 	<name>authentication-common</name>
 	<properties>

diff --git a/...src/main/java/io/mosip/authentication/common/manager/IdAuthFraudAnalysisEventManager.java b/...src/main/java/io/mosip/authentication/common/manager/IdAuthFraudAnalysisEventManager.java
@@ -135,7 +135,7 @@ private String getAuthType(List<String> pathSegments, String authType, Map<Strin
 		if (contextSuffix.contentEquals(OTP)) {
 			authType = RequestType.OTP_REQUEST.getRequestType();
 		} else if (contextSuffix.contentEquals(KYC)) {
-			authType = RequestType.KYC_AUTH_REQUEST.getRequestType();
+			authType = RequestType.EKYC_AUTH_REQUEST.getRequestType();
 		} else if (contextSuffix.contentEquals("auth")) {
 			authType = AUTH;
 		}