Skip to content

Commit

Permalink
ES-842 feature merge to develop (mosip#809)
Browse files Browse the repository at this point in the history
* [ES-1136]: Fixed - When transaction expired in login page incorrect error message is displayed. (mosip#687) (mosip#688)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* ES-1053 (mosip#691)

* [ES-1053]

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* Revert "[ES-1053]"

This reverts commit 8a27b9a.

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* [ES-1053]

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* Update AuthorizationController.java

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>

* [ES-1053]

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* updated id-token-hint api

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* updated id-token-hint api

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

---------

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>

* ES-1053 (mosip#693)

* ES-1053

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1053

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1101 (mosip#697)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1101 (mosip#698)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-842] cherry pick the chages to skip id-field while Validatio of challenge request (mosip#699)

* add logic to skip id-field check with challenge

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* added id-field into test.properties

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

---------

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>
Co-authored-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* ES-1101 (mosip#703)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1101 (mosip#708)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-675] [ES-955] [ES-947] - Claim details UI and idToken functionalities. (mosip#706)

* [ES-675]: Consent-Details UI screen and Id-token functionality.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675]: Handled endpoints for consent-details and idToken.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675]: Removed unused code.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675]: Removed unwanted logs.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

---------

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] Temporary code change for testing L2 flow. (mosip#713)

* [ES-675] Temporary code change for testing L2 flow.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] Temporary code change for testing L2 flow.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

---------

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] Reverted the temporary code. (mosip#714)

* [ES-675] Temporary code change for testing L2 flow.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] Temporary code change for testing L2 flow.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] Reverted the temporary code.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

---------

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>
Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* [ES-675] Reverted the temporary code. (mosip#715)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* ES-1043 (mosip#716)

* ES-1043

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1043

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1043] ConsentDetails service implementation   (mosip#700)

* added consentDetail endpoint and implementation

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* added testcase for consentDetetails

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* removed getConsentAction method

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* removed unwanted code from AuthorizationServiceTest class

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* added test case for getConsentDetails api

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* review changes

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

---------

Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>
Co-authored-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>

* ES-1043 Update KycAuthResult.java (mosip#719)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-675] Update ConsentDetails.js (mosip#721)

Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* ES-1101 (mosip#722)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-675] Decoding IdToken for uuid (mosip#723)

Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* ES-1115 (mosip#724)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1115]Update AuthorizationServiceImpl.java (mosip#725)

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>

* [INJIMOB-1419] Added id attribute. (mosip#726) (mosip#728)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* ES-842 updated pom version (mosip#727)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1061] (mosip#729)

* [ES-1061]

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* Updated testcases

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* Update application-test.properties

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>

---------

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>

* [ES-1033] Added id-token-hint handling (mosip#702)

* [ES-1033] Added id-token-hint handling

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-1033] review comments fixed

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

---------

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-675] UI fixes. (mosip#730)

* [ES-675] UI fixes.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] UI fixes.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

---------

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* Update Authorize.js (mosip#732)

Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* [ES-675] Handled v2 and v3 oauth-details endpoint. (mosip#733)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [MODIFIED] idTokenHint decoding (mosip#734)

Signed-off-by: Zeeshan Mehboob <zeeshan.mehboob@infosys.com>

* [FIXES] id token hint issue (mosip#735)

Signed-off-by: Zeeshan Mehboob <zeeshan.mehboob@infosys.com>

* ES-1053 ES-1043 (mosip#731)

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1053 ES-1043

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1013] Handled the functionality to redirect to the specific screen based on the claim details response (applicable to all logins). (mosip#737)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-1053] (mosip#739)

* [ES-1061]

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* Updated testcases

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* Update application-test.properties

Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>

* Added testcases for prepare signup redirect api

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

---------

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
Co-authored-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1033] added test cases (mosip#738)

* [ES-1033] added test cases

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

---------

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-675] UI fixes. (mosip#740)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* ES-842 (mosip#745)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-675] Added basic test case for claim-details component and some UI fixes. (mosip#749)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-1033] added Verified Claim Detail (mosip#741)

* [ES-1033] added Verified Claim Detail

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-1033] added fields for verified claims

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-1033] updated the reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-1033] reviewed changes

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

---------

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* ES-1033 (mosip#752)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-675] UI fixes. (mosip#755)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-675] Something went wrong page responsive fix (mosip#757)

Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* updated postman collections (mosip#754)

Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>

* [ES-1306] Implemented loading spinner during idToken redirection and some UI fixes. (mosip#766)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-1306] Prevention of browser closing on self upon clicking application tab in chrome dev tools. (mosip#767)

* [ES-1306] Implemented loading spinner during idToken redirection and some UI fixes.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-1306] Prevention of browser closing on self upon clicking application tab in chrome dev tools.

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

---------

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* [ES-1306] Empty the pathFragment for dev testing. (mosip#769)

Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* Update ClaimDetails.js (mosip#770)

Signed-off-by: Zeeshan Mehboob <82993262+zesu22@users.noreply.github.com>

* [ES-675] Update ClaimDetails.js (mosip#772)

Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>

* [ES-1033] updated the open-id configuration (mosip#753)

* [ES-1033] updated the open-id configuration

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-1033] added default values

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

---------

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* ES-1033 (mosip#774)

* ES-1033

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1033

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1043 (mosip#776)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1316] Handled all the login options with v3 authenticate endpoint that facilitates the use of a captcha token. (mosip#777)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* ES-1043 (mosip#784)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* Updated the keymanager version (mosip#788)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1091 (mosip#791)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1053 ES-1064 (mosip#792)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1043 (mosip#793)

* ES-1053

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1053

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-1053 (mosip#795)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-904] Added CaptchaHelperService (mosip#787)

* [ES-904] Added CaptchHelperService

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904] reviewed comments

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904] updated reviewed comments

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904] Added CaptchHelperService

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904]

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904] Added test cases

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

---------

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* ES-904 (mosip#797)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-1337] Fixed the text overflow issue in claim details screen (mobile view). (mosip#799)

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>

* ES-842 (mosip#800)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842 (mosip#801)

* temporary fix

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* [ES-904] (mosip#798)

* [ES-904]

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [Es-904]

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904]

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [ES-904]

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* [Es-904]

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

---------

Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>

* ES-1043 (mosip#804)

* temporary fix

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* DSD-5553 (mosip#805)

* temporary fix

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* DSD-5553

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-904 (mosip#806)

* temporary fix

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-842

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES-904

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

* ES904 (mosip#808)

Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>

---------

Signed-off-by: GurukiranP <talk2gurukiran@gmail.com>
Signed-off-by: Balaji <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Signed-off-by: ase-101 <sunkadaeanusha@gmail.com>
Signed-off-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>
Signed-off-by: Gk <76690271+GurukiranP@users.noreply.github.com>
Signed-off-by: Venkata Saidurga Polamraju <saidurgacsea@gmail.com>
Signed-off-by: Zeeshan Mehboob <zeeshan.mehboob@infosys.com>
Signed-off-by: Zeeshan Mehboob <82993262+zesu22@users.noreply.github.com>
Co-authored-by: Gk <76690271+GurukiranP@users.noreply.github.com>
Co-authored-by: Balaji Alluru <74903654+balaji-alluru@users.noreply.github.com>
Co-authored-by: Kaif Siddique <74772315+kaifk468@users.noreply.github.com>
Co-authored-by: Mohd Kaif Siddique <mohdkaif.siddique@ad.infosys.com>
Co-authored-by: pvsaidurga <132046494+pvsaidurga@users.noreply.github.com>
Co-authored-by: Zeeshan Mehboob <82993262+zesu22@users.noreply.github.com>
Co-authored-by: Gk <76690271+gk-XLVII@users.noreply.github.com>
  • Loading branch information
8 people authored Jul 15, 2024
1 parent 17b0726 commit f659d3c
Show file tree
Hide file tree
Showing 109 changed files with 17,922 additions and 9,752 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
- develop
- MOSIP*
- release*
- ES-496
- ES-842

jobs:
build-maven-esignet:
Expand Down
2 changes: 1 addition & 1 deletion binding-service-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<parent>
<groupId>io.mosip.esignet</groupId>
<artifactId>esignet-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>

<groupId>io.mosip.esignet</groupId>
Expand Down
3 changes: 1 addition & 2 deletions client-management-service-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
<parent>
<groupId>io.mosip.esignet</groupId>
<artifactId>esignet-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>

<groupId>io.mosip.esignet</groupId>
<artifactId>client-management-service-impl</artifactId>
<version>${project.parent.version}</version>

Expand Down
2 changes: 1 addition & 1 deletion consent-service-impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>io.mosip.esignet</groupId>
<artifactId>esignet-parent</artifactId>
<version>1.3.1-SNAPSHOT</version>
<version>1.5.0-SNAPSHOT</version>
</parent>

<groupId>io.mosip.esignet</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.mosip.esignet.api.dto.Claims;
import io.mosip.esignet.api.dto.claim.Claims;
import io.mosip.esignet.core.dto.ConsentDetail;
import io.mosip.esignet.core.dto.UserConsent;
import io.mosip.esignet.core.exception.EsignetException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
package io.mosip.esignet;

import com.fasterxml.jackson.databind.ObjectMapper;
import io.mosip.esignet.api.dto.ClaimDetail;
import io.mosip.esignet.api.dto.Claims;
import io.mosip.esignet.api.dto.claim.ClaimDetail;
import io.mosip.esignet.api.dto.claim.Claims;
import io.mosip.esignet.api.spi.AuditPlugin;
import io.mosip.esignet.core.dto.UserConsent;
import io.mosip.esignet.core.dto.UserConsentRequest;
Expand Down
Loading

0 comments on commit f659d3c

Please sign in to comment.