[MOSIP-30363], [ES-472], [ES-497] fixed this Jira issues. (#1137)

Signed-off-by: Mahammed Taheer <[email protected]>
mosip · Dec 4, 2023 · bd7d6c2 · bd7d6c2
1 parent a9daa74
commit bd7d6c2
Show file tree

Hide file tree

Showing 15 changed files with 374 additions and 328 deletions.
diff --git a/...on-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java b/...on-common/src/main/java/io/mosip/authentication/common/service/facade/AuthFacadeImpl.java
@@ -402,7 +402,7 @@ private void processDemoAuth(AuthRequestDTO authRequestDTO, Map<String, List<Ide
 				statusInfo = demoValidationStatus;
 
 				boolean isStatus = statusInfo != null && statusInfo.isStatus();
-				auditHelper.audit(AuditModules.DEMO_AUTH, getAuditEvent(isAuth), idvidHash,
+				auditHelper.audit(AuditModules.DEMO_AUTH, getAuditEvent(isAuth), authRequestDTO.getTransactionID(),
 						idType, "authenticateApplicant status : " + isStatus);
 			} catch (IdAuthUncheckedException e) {
 				throw new IdAuthenticationBusinessException(e.getErrorCode(), e.getErrorText());
@@ -442,7 +442,7 @@ private void processOTPAuth(AuthRequestDTO authRequestDTO, String token, boolean
 				authStatusList.add(otpValidationStatus);
 
 				boolean isStatus = otpValidationStatus != null && otpValidationStatus.isStatus();
-				auditHelper.audit(AuditModules.OTP_AUTH, getAuditEvent(isAuth), idvidHash,
+				auditHelper.audit(AuditModules.OTP_AUTH, getAuditEvent(isAuth), authRequestDTO.getTransactionID(),
 						idType, "authenticateApplicant status : " + isStatus);
 			} finally {
 				boolean isStatus = otpValidationStatus != null && otpValidationStatus.isStatus();
@@ -483,16 +483,16 @@ private void saveAndAuditBioAuthTxn(AuthRequestDTO authRequestDTO, String token,
 		String status = "authenticateApplicant status : " + isStatus;
 		if (AuthTransactionHelper.isFingerAuth(authRequestDTO, env)) {
 			auditHelper.audit(AuditModules.FINGERPRINT_AUTH, getAuditEvent(!isInternal),
-				idvidHash, idType, status);
+				authRequestDTO.getTransactionID(), idType, status);
 			authTxnBuilder.addRequestType(RequestType.FINGER_AUTH);
 		}
 		if (AuthTransactionHelper.isIrisAuth(authRequestDTO, env)) {
-			auditHelper.audit(AuditModules.IRIS_AUTH, getAuditEvent(!isInternal), idvidHash,
+			auditHelper.audit(AuditModules.IRIS_AUTH, getAuditEvent(!isInternal), authRequestDTO.getTransactionID(),
 					idType, status);
 			authTxnBuilder.addRequestType(RequestType.IRIS_AUTH);
 		}
 		if (AuthTransactionHelper.isFaceAuth(authRequestDTO, env)) {
-			auditHelper.audit(AuditModules.FACE_AUTH, getAuditEvent(!isInternal), idvidHash,
+			auditHelper.audit(AuditModules.FACE_AUTH, getAuditEvent(!isInternal), authRequestDTO.getTransactionID(),
 					idType, status);
 			authTxnBuilder.addRequestType(RequestType.FACE_AUTH);
 		}
@@ -522,7 +522,7 @@ private void processTokenAuth(AuthRequestDTO authRequestDTO, Map<String, List<Id
 				authStatusList.add(tokenValidationStatus);
 
 				boolean isStatus = tokenValidationStatus != null && tokenValidationStatus.isStatus();
-				auditHelper.audit(AuditModules.TOKEN_AUTH, getAuditEvent(isAuth), idvidHash,
+				auditHelper.audit(AuditModules.TOKEN_AUTH, getAuditEvent(isAuth), authRequestDTO.getTransactionID(),
 						idType, "authenticateApplicant status : " + isStatus);
 			} finally {
 				boolean isStatus = tokenValidationStatus != null && tokenValidationStatus.isStatus();
@@ -556,7 +556,7 @@ private void processPasswordAuth(AuthRequestDTO authRequestDTO, Map<String, List
 				authStatusList.add(passwordMatchStatus);
 
 				boolean isStatus = passwordMatchStatus != null && passwordMatchStatus.isStatus();
-				auditHelper.audit(AuditModules.PASSWORD_AUTH, AuditEvents.PASSWORD_BASED_AUTH_REQUEST, idvidHash,
+				auditHelper.audit(AuditModules.PASSWORD_AUTH, AuditEvents.PASSWORD_BASED_AUTH_REQUEST, authRequestDTO.getTransactionID(),
 						idType, "authenticateApplicant status(Password) : " + isStatus);
 			} finally {
 				boolean isStatus = passwordMatchStatus != null && passwordMatchStatus.isStatus();