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-30687] Bean creation handled #1252

Merged
merged 14 commits into from
Apr 19, 2024
Merged

[MOSIP-30687] Bean creation handled #1252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d9a5334
MOSIP-30687 changes done to from websub to kafka
Apr 3, 2024
c56c99a
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 3, 2024
86c9ff5
logger added
Apr 4, 2024
d24c804
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 4, 2024
bf09d1a
test case resolved
Apr 4, 2024
72fd462
MOSIP-30687 add class in config
Apr 5, 2024
db526dc
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 5, 2024
0ad3444
added extra space to check the docker build
Apr 5, 2024
15e3300
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 5, 2024
7785c34
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 5, 2024
3657ca6
kafka bean enable and disable
Apr 17, 2024
ae056ff
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 19, 2024
18aadf6
kafka bean creation condition
Apr 19, 2024
f98699e
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Apr 19, 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: 2 additions & 1 deletion ...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 @@ -16,6 +16,7 @@

import io.mosip.authentication.core.logger.IdaLogger;
import io.mosip.kernel.core.logger.spi.Logger;
import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED;

/**
* The Class KafkaProducerConfig.
Expand All @@ -24,7 +25,7 @@
*/

@Configuration
@ConditionalOnProperty(value = "mosip.ida.authentication.error.eventing.enabled", havingValue = "true", matchIfMissing = false)
@ConditionalOnProperty(value = AUTHENTICATION_ERROR_EVENTING_ENABLED, havingValue = "true", matchIfMissing = false)
public class KafkaProducerConfig {
private static final Logger logger = IdaLogger.getLogger(KafkaProducerConfig.class);

Expand Down
3 changes: 2 additions & 1 deletion .../mosip/authentication/common/service/kafka/impl/AuthenticationErrorEventingPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package io.mosip.authentication.common.service.kafka.impl;

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

import java.util.HashMap;
Expand Down Expand Up @@ -32,7 +33,7 @@
* @author Neha
*/
@Component
@ConditionalOnProperty(value = "mosip.ida.authentication.error.eventing.enabled", havingValue = "true", matchIfMissing = false)
@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 @@ -174,4 +174,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";
}
19 changes: 18 additions & 1 deletion ...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 @@ -3,6 +3,7 @@
import java.util.Objects;
import java.util.Optional;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;

Expand All @@ -14,7 +15,10 @@
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.security.SecurityScheme;
import io.swagger.v3.oas.annotations.tags.Tag;

import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.validation.Errors;
import org.springframework.web.bind.WebDataBinder;
Expand Down Expand Up @@ -54,6 +58,7 @@
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import springfox.documentation.annotations.ApiIgnore;
import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED;

/**
* The {@code OTPAuthController} use to send request to generate otp.
Expand Down Expand Up @@ -94,11 +99,23 @@ public class OTPController {

@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;

@Value("${"+ AUTHENTICATION_ERROR_EVENTING_ENABLED +":false}")
private boolean isEventingEnabled;

@InitBinder
private void initBinder(WebDataBinder binder) {
binder.setValidator(otpRequestValidator);
}

@PostConstruct
public void init() {
if (isEventingEnabled) {
if (Objects.isNull(authenticationErrorEventingPublisher)) {
throw new BeanCreationException(AuthenticationErrorEventingPublisher.class.getName(), "Failed to create a bean");
}
}
}

/**
* send OtpRequestDTO request to generate OTP and received OtpResponseDTO as
Expand Down Expand Up @@ -163,7 +180,7 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt
} catch (IdAuthenticationBusinessException e) {
logger.error(IdAuthCommonConstants.SESSION_ID, e.getClass().toString(), e.getErrorCode(), e.getErrorText());

if (authenticationErrorEventingPublisher != null) {
if (isEventingEnabled) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(otpRequestDto, request.getHeader("signature"),
partner, e, otpRequestDto.getMetadata());
Expand Down
18 changes: 17 additions & 1 deletion ...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 @@ -3,9 +3,12 @@
import java.util.Objects;
import java.util.Optional;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;

import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.validation.Errors;
import org.springframework.validation.annotation.Validated;
Expand Down Expand Up @@ -54,6 +57,7 @@
import io.swagger.v3.oas.annotations.security.SecurityScheme;
import io.swagger.v3.oas.annotations.tags.Tag;
import springfox.documentation.annotations.ApiIgnore;
import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED;

/**
* The {@code AuthController} used to handle all the authentication requests.
Expand Down Expand Up @@ -92,6 +96,9 @@ public class AuthController {

@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;

@Value("${"+ AUTHENTICATION_ERROR_EVENTING_ENABLED +":false}")
private boolean isEventingEnabled;


/**
Expand All @@ -102,6 +109,15 @@ public class AuthController {
private void initAuthRequestBinder(WebDataBinder binder) {
binder.setValidator(authRequestValidator);
}

@PostConstruct
public void init() {
if (isEventingEnabled) {
if (Objects.isNull(authenticationErrorEventingPublisher)) {
throw new BeanCreationException(AuthenticationErrorEventingPublisher.class.getName(), "Failed to create a bean");
}
}
}

/**
* authenticateRequest - method to authenticate request.
Expand Down Expand Up @@ -162,7 +178,7 @@ public AuthResponseDTO authenticateIndividual(@Validated @RequestBody AuthReques
} catch (IdAuthenticationBusinessException e) {
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(),
"authenticateApplication", e.getErrorCode() + " : " + e.getErrorText());
if (authenticationErrorEventingPublisher != null) {
if (isEventingEnabled) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(authrequestdto, request.getHeader("signature"),
partner, e, authrequestdto.getMetadata());
Expand Down
21 changes: 19 additions & 2 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 @@ -4,10 +4,14 @@
import java.util.Objects;
import java.util.Optional;

import javax.annotation.PostConstruct;
import javax.servlet.http.HttpServletRequest;

import io.mosip.authentication.core.indauth.dto.*;

import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
import org.springframework.validation.Errors;
import org.springframework.validation.annotation.Validated;
Expand Down Expand Up @@ -56,6 +60,7 @@
import io.swagger.v3.oas.annotations.security.SecurityScheme;
import io.swagger.v3.oas.annotations.tags.Tag;
import springfox.documentation.annotations.ApiIgnore;
import static io.mosip.authentication.core.constant.IdAuthConfigKeyConstants.AUTHENTICATION_ERROR_EVENTING_ENABLED;

/**
* The {@code AuthController} used to handle all the authentication requests.
Expand Down Expand Up @@ -102,6 +107,9 @@ public class KycAuthController {

@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;

@Value("${"+ AUTHENTICATION_ERROR_EVENTING_ENABLED +":false}")
private boolean isEventingEnabled;

/**
*
Expand Down Expand Up @@ -129,6 +137,15 @@ private void initEKycBinder(WebDataBinder binder) {
private void initKycExchangeBinder(WebDataBinder binder) {
binder.setValidator(kycExchangeValidator);
}

@PostConstruct
public void init() {
if (isEventingEnabled) {
if (Objects.isNull(authenticationErrorEventingPublisher)) {
throw new BeanCreationException(AuthenticationErrorEventingPublisher.class.getName(), "Failed to create a bean");
}
}
}


/**
Expand Down Expand Up @@ -197,7 +214,7 @@ public EKycAuthResponseDTO processKyc(@Validated @RequestBody EkycAuthRequestDTO
} catch (IdAuthenticationBusinessException e) {
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processEKyc",
e.getErrorTexts().isEmpty() ? "" : e.getErrorText());
if (authenticationErrorEventingPublisher != null) {
if (isEventingEnabled) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(ekycAuthRequestDTO, request.getHeader("signature"),
partner, e, ekycAuthRequestDTO.getMetadata());
Expand Down Expand Up @@ -280,7 +297,7 @@ public KycAuthResponseDTO processKycAuth(@Validated @RequestBody KycAuthRequestD
mosipLogger.error(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), "processKycAuth",
e.getErrorTexts().isEmpty() ? "" : e.getErrorText());

if (authenticationErrorEventingPublisher != null) {
if (isEventingEnabled) {
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
authenticationErrorEventingPublisher.notify(authRequestDTO, request.getHeader("signature"),
partner, e, authRequestDTO.getMetadata());
Expand Down
Loading