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.

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 on demand template extraction #1203

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e101f5e
MOSIP-30687 partner data changed
Feb 6, 2024
0838f41
MOSIP-30687 partner data changed
Feb 6, 2024
6f4ebd1
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 6, 2024
94f4f03
MOSIP-30687 changes done for ondemand
Feb 7, 2024
d7fb625
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 7, 2024
c123c3b
MOSIP-30687 changes done for exception
Feb 7, 2024
13a5850
Changes in error message
Feb 8, 2024
c4467f8
Changes in error message and merge resolve conflict
Feb 8, 2024
012fb36
Changes in error message
Feb 8, 2024
f01219a
REmoved the error message related changes
Feb 8, 2024
2c223ae
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 8, 2024
26cf182
MOSIP-31517 On demand changes error message removal
Feb 9, 2024
3e30320
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 9, 2024
21cda20
Changes done
Feb 9, 2024
141d835
Merge branch 'develop' of https://github.com/mosip/id-authentication.…
Feb 9, 2024
5cbcd9b
otp controller changes
Feb 9, 2024
f42e1c0
OTP repo changes
Feb 9, 2024
0e35e62
OTP repo changes
Feb 9, 2024
1ca6f06
OTP manager changes done
Feb 9, 2024
39d042c
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 9, 2024
c0c7778
encoded the encrypted data
Feb 19, 2024
e0ed9f1
merge conflict
Feb 19, 2024
257e708
ondemand changes
Feb 19, 2024
65a2401
changes in encoding
Feb 21, 2024
d291de0
changes in encoding
Feb 21, 2024
7ee8a79
logger changes
Feb 21, 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
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,8 @@ public String asymmetricEncryption(byte[] dataToEncrypt, String partnerCertifica
PublicKey publicKey = x509Certificate.getPublicKey();
byte[] encryptedData = cryptoCore.asymmetricEncrypt(publicKey, dataToEncrypt);
mosipLogger.info("AssymetricEncrypted data -- Start" + encryptedData+ " End--AssymetricEncrypted data" );
return CryptoUtil.encodeBase64Url(encryptedData);
return CryptoUtil.encodeBase64(encryptedData);

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt
String idvidHash = securityManager.hash(otpRequestDto.getIndividualId());
String idType = Objects.nonNull(otpRequestDto.getIndividualIdType()) ? otpRequestDto.getIndividualIdType()
: idTypeUtil.getIdType(otpRequestDto.getIndividualId()).getType();
logger.debug(IdAuthCommonConstants.SESSION_ID, this.getClass().getSimpleName(), GENERATE_OTP,
"IdType...."+ idType);
otpRequestDto.setIndividualIdType(idType);
otpRequestValidator.validateIdvId(otpRequestDto.getIndividualId(), idType, errors, IdAuthCommonConstants.IDV_ID);
DataValidationUtil.validate(errors);
Expand Down
Loading