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] added the condition to check bean creation #1251

Merged
merged 19 commits into from
Apr 22, 2024
Merged

[MOSIP-31982] added the condition to check bean creation #1251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 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
5f3dadd
Error eventing condition check added
Apr 19, 2024
4149e77
resolved merge conflict
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
21 changes: 20 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
@@ -1,8 +1,11 @@
package io.mosip.authentication.otp.service.controller;

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

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 +17,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 @@ -94,11 +100,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 @@ -160,7 +178,8 @@ 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 (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
20 changes: 19 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
@@ -1,11 +1,16 @@
package io.mosip.authentication.service.controller;

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

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 @@ -92,6 +97,9 @@ public class AuthController {

@Autowired(required = false)
private AuthenticationErrorEventingPublisher authenticationErrorEventingPublisher;

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


/**
Expand All @@ -102,6 +110,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 +179,8 @@ 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
24 changes: 22 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
@@ -1,13 +1,19 @@
package io.mosip.authentication.service.kyc.controller;

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

import java.util.Map;
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 @@ -102,6 +108,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 +138,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 +215,8 @@ 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 +299,8 @@ public KycAuthResponseDTO processKycAuth(@Validated @RequestBody KycAuthRequestD
} catch (IdAuthenticationBusinessException e) {
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