Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MOSIP-31982] Enabling and disabling kafka bean #1250

Merged
merged 17 commits into from
Apr 18, 2024
Merged

[MOSIP-31982] Enabling and disabling kafka bean #1250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0438302
MOSIP-32073 design document added (#1223)
Neha2365 Mar 25, 2024
ea81dea
POM changes (#1225)
Neha2365 Mar 27, 2024
b63f18f
updated the image path
Mar 27, 2024
09dcacf
MOSIP-31982 changes done for image
Apr 3, 2024
e462d11
MOSIP-31982 changes done for image
Apr 3, 2024
948cb48
Merge remote-tracking branch 'upstream/release-1.2.1.x' into imagepath
Apr 4, 2024
0e70296
Merge branch 'release-1.2.1.x' of https://github.com/mosip/id-authent…
Apr 4, 2024
60db8fb
MOSIP-31982 added kafka config in otp application
Apr 5, 2024
48860a8
MOSIP-31982 added kafka config in otp application
Apr 5, 2024
6387a2a
MOSIP-31982 Updated the pom and push trigger file
Apr 5, 2024
2daa1f3
Merge branch 'release-1.2.1.x' of https://github.com/mosip/id-authent…
Apr 5, 2024
1959609
test case issue is resolved
Apr 16, 2024
0a7d12e
test case issue is resolved with facedata
Apr 16, 2024
7d78cdc
test case issue is resolved with facedata
Apr 16, 2024
1e5020c
Merge branch 'release-1.2.1.x' of https://github.com/mosip/id-authent…
Apr 18, 2024
8c773f6
kafka bean enable and disable
Apr 18, 2024
50b9337
kafka bean enable and disable
Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...mmon/src/main/java/io/mosip/authentication/common/service/config/KafkaProducerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
import org.apache.kafka.clients.producer.ProducerConfig;
import org.apache.kafka.common.serialization.StringSerializer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.kafka.core.DefaultKafkaProducerFactory;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.core.ProducerFactory;
import org.springframework.kafka.support.serializer.JsonSerializer;
import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED;

/**
* The Class KafkaProducerConfig.
Expand All @@ -20,6 +22,7 @@
*/

@Configuration
@ConditionalOnProperty(value = AUTHENTICATION_ERROR_EVENTING_ENABLED, havingValue = "true", matchIfMissing = false)
public class KafkaProducerConfig {

@Value(value = "${mosip.ida.kafka.bootstrap.servers}")
Expand Down
3 changes: 3 additions & 0 deletions .../mosip/authentication/common/service/kafka/impl/AuthenticationErrorEventingPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package io.mosip.authentication.common.service.kafka.impl;

import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_TOPIC;
import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED;

import java.util.HashMap;
import java.util.Map;
Expand All @@ -9,6 +10,7 @@

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Component;

Expand All @@ -31,6 +33,7 @@
* @author Neha
*/
@Component
@ConditionalOnProperty(value = AUTHENTICATION_ERROR_EVENTING_ENABLED, havingValue = "true", matchIfMissing = false)
public class AuthenticationErrorEventingPublisher {

private static final String REQUEST_SIGNATURE = "requestSignature";
Expand Down
2 changes: 2 additions & 0 deletions ...on-core/src/main/java/io/mosip/authentication/core/constant/IdAuthConfigKeyConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,4 +173,6 @@ private IdAuthConfigKeyConstants() {
public static final String KYC_EXCHANGE_DEFAULT_LANGUAGE = "mosip.ida.kyc.exchange.default.lang";

public static final String IDP_AMR_ACR_IDA_MAPPING_SOURCE = "idp.amr-acr.ida.mapping.property.source";

public static final String AUTHENTICATION_ERROR_EVENTING_ENABLED = "mosip.ida.authentication.error.eventing.enabled";
}
10 changes: 6 additions & 4 deletions ...p-service/src/main/java/io/mosip/authentication/otp/service/controller/OTPController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class OTPController {
@Autowired
private IdAuthSecurityManager securityManager;

@Autowired
@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;

@InitBinder
Expand Down Expand Up @@ -160,9 +160,11 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt
throw authTransactionHelper.createDataValidationException(authTxnBuilder, e, requestWithMetadata);
} catch (IdAuthenticationBusinessException e) {
logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText());
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(otpRequestDto, request.getHeader("signature"), partner, e,
otpRequestDto.getMetadata());
if (authenticationErrorEventingPublisher != null) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(otpRequestDto, request.getHeader("signature"),
partner, e, otpRequestDto.getMetadata());
}
}
auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE , otpRequestDto.getTransactionID(),
IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), e);
Expand Down
10 changes: 6 additions & 4 deletions ...tion-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public class AuthController {
@Autowired
private PartnerService partnerService;

@Autowired
@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;


Expand Down Expand Up @@ -162,9 +162,11 @@ public AuthResponseDTO authenticateIndividual(@Validated @RequestBody AuthReques
} catch (IdAuthenticationBusinessException e) {
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(),
"authenticateApplication", e.getErrorCode() + " : " + e.getErrorText());
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(authrequestdto, request.getHeader("signature"), partner, e,
authrequestdto.getMetadata());
if (authenticationErrorEventingPublisher != null) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(authrequestdto, request.getHeader("signature"),
partner, e, authrequestdto.getMetadata());
}
}
auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.AUTH_REQUEST_RESPONSE, authrequestdto, e);
IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e);
Expand Down
20 changes: 11 additions & 9 deletions ...rvice/src/main/java/io/mosip/authentication/service/kyc/controller/KycAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public class KycAuthController {
@Autowired
private KycExchangeRequestValidator kycExchangeValidator;

@Autowired
@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;

/**
Expand Down Expand Up @@ -197,10 +197,11 @@ public EKycAuthResponseDTO processKyc(@Validated @RequestBody EkycAuthRequestDTO
} catch (IdAuthenticationBusinessException e) {
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processEKyc",
e.getErrorTexts().isEmpty() ? "" : e.getErrorText());

if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(ekycAuthRequestDTO, request.getHeader("signature"), partner,
e, ekycAuthRequestDTO.getMetadata());
if (authenticationErrorEventingPublisher != null) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(ekycAuthRequestDTO, request.getHeader("signature"),
partner, e, ekycAuthRequestDTO.getMetadata());
}
}
auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.EKYC_REQUEST_RESPONSE, ekycAuthRequestDTO, e);
IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e);
Expand Down Expand Up @@ -279,10 +280,11 @@ public KycAuthResponseDTO processKycAuth(@Validated @RequestBody KycAuthRequestD
} catch (IdAuthenticationBusinessException e) {
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycAuth",
e.getErrorTexts().isEmpty() ? "" : e.getErrorText());

if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(authRequestDTO, request.getHeader("signature"), partner, e,
authRequestDTO.getMetadata());
if (authenticationErrorEventingPublisher != null) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(authRequestDTO, request.getHeader("signature"),
partner, e, authRequestDTO.getMetadata());
}
}
auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.KYC_REQUEST_RESPONSE, authRequestDTO, e);
IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e);
Expand Down
Loading