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

Merge code from release to develop. #1121

Merged
merged 98 commits into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
c178b61
[MOSIP-21002] Updated kyc error response to have kycStatus and update…
manojsp12 Apr 7, 2022
cc41b10
[MOSIP-20020] Update release_changes.yml
ckm007 May 12, 2022
5505226
Merge pull request #885 from mosip/ckm007-patch-2
syedsalman3753 May 12, 2022
d29fb16
[ MOSIP-20021 ] updated release_changes.yml to update README.md badges
May 19, 2022
d4ca773
Merge pull request #886 from syed-salman-technoforte/release-1.2.0.1
ckm007 May 20, 2022
81681ea
[MOSIP-20028] added action for tagging
ckm007 Jul 18, 2022
bf2185a
Added pre-expire-days & access-allowed values in DB release script. (…
mahammedtaheer Aug 1, 2022
b411952
release file name changes.
kameshsr Aug 17, 2022
b915c28
MOSIP-23611- Added flag to enable missing credential retrigger. Disab…
Aug 18, 2022
246477d
Added logger
Aug 18, 2022
aa7305b
release file name changes.
kameshsr Aug 18, 2022
591ac84
Merge pull request #901 from LoganathanSekar7627/MOSIP-23611-config-s…
ckm007 Aug 18, 2022
f77e175
release file name changes.
kameshsr Aug 18, 2022
5d3de20
Merge pull request #898 from kameshsr/release-1.2.0.1
ckm007 Aug 18, 2022
5f319ae
Test case fix
Aug 18, 2022
678aa1b
Merge pull request #903 from LoganathanSekar7627/MOSIP-23611-config-s…
ckm007 Aug 18, 2022
2c4dfce
Release Bot Pre-release changes
pramod444 Sep 29, 2022
2807e6c
Update README.md
ckm007 Sep 29, 2022
c408f26
Merge pull request #908 from mosip/release-branch
ckm007 Sep 29, 2022
dbf8a9a
Merged code from develop to 1.2.0.1-B2
mahammedtaheer Jan 3, 2023
df4ed66
Merge pull request #939 from mahammedtaheer/1.2.0.1-B2
mahammedtaheer Jan 3, 2023
2025c3d
updated snapshot url in push_trigger.yaml
syedsalman3753 Jan 3, 2023
07dbb30
Merge pull request #940 from syedsalman3753/patch-1
mahammedtaheer Jan 3, 2023
4710232
Added auth context class in internal and otp service, renamed the db …
mahammedtaheer Jan 4, 2023
1b14b57
Merge pull request #941 from mahammedtaheer/1.2.0.1-B2
mahammedtaheer Jan 4, 2023
fc14c88
Removed not null constraint to policy id and added kycexchange except…
mahammedtaheer Jan 4, 2023
f39d12b
Merge pull request #944 from mahammedtaheer/1.2.0.1-B2
mahammedtaheer Jan 4, 2023
a62723e
[DSD-1944] updated keymanager version
ckm007 Jan 6, 2023
4132b40
Merge pull request #945 from mosip/ckm007-patch-2
ckm007 Jan 6, 2023
1789a2d
updated sonar token
ckm007 Jan 7, 2023
e5e738f
Merge pull request #947 from mosip/ckm007-patch-2
ckm007 Jan 7, 2023
a328701
Release Bot Pre-release changes
ckm007 Jan 7, 2023
f6d33b4
Update README.md
ckm007 Jan 7, 2023
726d3fc
Merge pull request #948 from mosip/release-branch
ckm007 Jan 7, 2023
4973f0c
Code from develop branch. (#1000)
mahammedtaheer Mar 29, 2023
d3b9a5a
updated snapshot url (#1001)
syedsalman3753 Mar 29, 2023
2d898a0
Corrected the upgrade scripts name (#1002)
ase-101 Apr 2, 2023
8021c58
Release changes (#1004)
ckm007 Apr 14, 2023
1b8de17
[DSD-2478] (#1005)
ckm007 Apr 14, 2023
60a96ca
MOSIP-26742 hash logic compatibility release 1201 (#1007)
loganathan-sekaran Apr 18, 2023
35279cb
Mosip 26742 hash logic compatibility 1 (#1008)
loganathan-sekaran Apr 19, 2023
57f1210
Merge pull request #1010 from LoganathanSekar7627/MOSIP-26742-hash-lo…
vishwa-vyom Apr 19, 2023
488af0d
[MOSIP-23422] updated db_release scripts (#1022)
ckm007 May 15, 2023
25306f4
[MOSIP-27964] updated upgrade sql's
ckm007 Jun 13, 2023
3dc12a9
[MOSIP-27964] Update 1.1.5.5_to_1.2.0.1-B1_upgrade.sql (#1032)
ckm007 Jun 13, 2023
dca45ed
[MOSIP-27964]
ckm007 Jun 13, 2023
37d6c58
Merge pull request #1033 from mosip/ckm007-patch-2
vishwa-vyom Jun 14, 2023
9058c48
[MOSIP-27996] updated rollback sql
ckm007 Jun 15, 2023
b09c4db
[MOSIP-23218] Updated Pom.xml versions. (#1035)
Mohanraj209 Jun 21, 2023
9b81c92
Merge remote-tracking branch 'upstream/develop' into merge-develop-2-…
Jun 28, 2023
0f10035
Updated versions to -SNAPSHOT
Jun 28, 2023
6ba93e3
Updated version to 1.2.0.1-SNAPSHOT
Jun 28, 2023
7a80a3f
Merge remote-tracking branch 'origin/merge-develop-2-release-1.2.0.1'…
Jun 28, 2023
916d8fd
Test fix
Jun 30, 2023
2dee6c1
Merge pull request #1043 from LoganathanSekar7627/fix-test-failure-re…
vishwa-vyom Jun 30, 2023
8661278
[MOSIP-28175]Fixed publish to nexus failure
Rakshitha650 Jun 30, 2023
a62191a
Merge pull request #1044 from Rakshitha650/release-1.2.0.1
vishwa-vyom Jun 30, 2023
9e29fdb
Merge remote-tracking branch 'upstream/release-1.2.0.1' into merge-de…
Jun 30, 2023
0c1b50a
Fix to salt caching issue
Jul 3, 2023
ad21e7a
Revert "Include new class from keymanager in imports."
Jul 3, 2023
e775a3b
Revert "Added functionality in kyc-exchange API to return response in…
Jul 3, 2023
f5027c4
Removed sysadmin
Jul 4, 2023
6dfb760
Corrected user
Jul 4, 2023
2b286cf
Merge pull request #1042 from LoganathanSekar7627/merge-develop-2-rel…
vishwa-vyom Jul 4, 2023
4008145
MOSIP-28227 Moved ddl script into upgrade scripts, corrections to upg…
Jul 7, 2023
1577560
Added placeholder scripts for upgrade
Jul 10, 2023
cb027ab
Merge pull request #1052 from LoganathanSekar7627/MOSIP-28227-release…
vishwa-vyom Jul 10, 2023
02433c1
Merge pull request #1034 from mosip/ckm007-patch-3
vishwa-vyom Jul 14, 2023
e899246
Jira No. MOSIP-28227, removed the truncate previledge for 3 tables an…
mahammedtaheer Jul 17, 2023
50f576f
[MOSIP-28622] fixed firstname, lastname not populating in e-signet is…
mahammedtaheer Jul 27, 2023
dc07b68
Merge pull request #1057 from mahammedtaheer/release-1.2.0.1
vishwa-vyom Jul 31, 2023
74f117c
Reverted dependencies snapshot versions (#1059)
loganathan-sekaran Aug 3, 2023
f82bc6a
Fix compilation issue after snapshot version revert. (#1060)
loganathan-sekaran Aug 3, 2023
a4c3675
Release changes (#1063)
ckm007 Aug 18, 2023
5060833
Release 1.2.0.1 b4 (#1064)
ckm007 Aug 21, 2023
346410d
[MOSIP-29044] (#1067)
ckm007 Aug 21, 2023
9498f50
[MOSIP-28484] Added error handling for deploy.sh script (#1065)
akilalakshmanan Aug 22, 2023
4504575
Update push_trigger.yml
ckm007 Aug 22, 2023
6a13ab4
WIP-Changes to allow available otp channel
Aug 18, 2023
111f8b7
PSA-171 fix for allowing one of the available channels when both chan…
Aug 21, 2023
48577e6
Updated the pom versions
Aug 22, 2023
1caf8d3
Merge pull request #1071 from LoganathanSekar7627/PSA-171-IDA-allow-a…
mahammedtaheer Aug 22, 2023
96fbe42
Fix to have case insensitive check for channel attribute
Aug 24, 2023
301d42d
Merge pull request #1072 from LoganathanSekar7627/PSA-171-IDA-allow-a…
mahammedtaheer Aug 24, 2023
8ba1ea0
Merge pull request #1086 from mosip/release-1.2.0.1-B5
mahammedtaheer Sep 8, 2023
9775014
Merge develop to Release 1.2.0.1 (#1090)
mahammedtaheer Sep 11, 2023
8417ed8
Code merge from develop to Release 1.2.0.1 (#1099)
ase-101 Sep 20, 2023
d706589
[MOSIP-29163] updated secret in reusable workflows (#1101)
bhumi46 Sep 25, 2023
1f50301
[ES-313] fixes merged from develop to release branch (#1106)
mahammedtaheer Oct 3, 2023
8773f50
ES-261 (#1107)
ase-101 Oct 6, 2023
003ea10
[MOSIP-29888]Update pom.xml (#1110)
Mahesh-Binayak Oct 19, 2023
e576655
fixed reliability bugs (#1112)
pvsaidurga Oct 19, 2023
d4f91c5
Test cases added (#1113)
ase-101 Oct 19, 2023
2eaf408
Fixed authControllerTest (#1116)
ase-101 Oct 23, 2023
f0d008f
added test case for VCITransactionHelper.class and AuthTransactionHel…
kaifk468 Oct 25, 2023
5cdb93f
Added test case for IdentityWalletBindingController, IdentityKeyBindi…
kaifk468 Oct 27, 2023
af4f45e
Release 1.2.0.1 (#1120)
mahammedtaheer Oct 30, 2023
47db324
Merged code from release 1.2.0.1 branch to develop.
mahammedtaheer Oct 31, 2023
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
@@ -1,27 +1,17 @@
package io.mosip.authentication.common.service.helper;

import java.time.LocalDateTime;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

import io.mosip.authentication.common.service.entity.KycTokenData;
import io.mosip.authentication.common.service.entity.OIDCClientData;
import io.mosip.authentication.common.service.repository.KycTokenDataRepository;
import io.mosip.authentication.common.service.repository.OIDCClientDataRepository;
import io.mosip.authentication.common.service.util.EnvUtil;
import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil;
import io.mosip.authentication.core.constant.IdAuthCommonConstants;
import io.mosip.authentication.core.constant.IdAuthenticationErrorConstants;
import io.mosip.authentication.core.constant.KycTokenStatusType;
import io.mosip.authentication.core.exception.IdAuthenticationBusinessException;
import io.mosip.authentication.core.indauth.dto.BaseRequestDTO;
import io.mosip.authentication.core.logger.IdaLogger;
import io.mosip.authentication.core.spi.indauth.service.KycService;
import io.mosip.kernel.core.logger.spi.Logger;
Expand Down

Large diffs are not rendered by default.

Loading