[ES-180]

.github/workflows/push_trigger.yml

@@ -10,7 +10,6 @@ on:
       - 1.*
       - develop
       - main
-      - bugfix-ES-177
 
 jobs:
   call-workflow-codeql-analysis:

binding-service-impl/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>io.mosip.esignet</groupId>
 		<artifactId>esignet-parent</artifactId>
-		<version>1.1.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</parent>
 
 	<groupId>io.mosip.esignet</groupId>

client-management-service-impl/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.mosip.esignet</groupId>
         <artifactId>esignet-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
     <groupId>io.mosip.esignet</groupId>

client-management-service-impl/src/main/java/io/mosip/esignet/services/ClientManagementServiceImpl.java

@@ -12,11 +12,8 @@
 import io.mosip.esignet.api.util.ActionStatus;
 import io.mosip.esignet.core.constants.Constants;
 import io.mosip.esignet.core.constants.ErrorConstants;
-import io.mosip.esignet.core.dto.ClientDetailCreateRequest;
-import io.mosip.esignet.core.dto.ClientDetailResponse;
-import io.mosip.esignet.core.dto.ClientDetailUpdateRequest;
-import io.mosip.esignet.core.dto.ClientDetailCreateV2Request;
-import io.mosip.esignet.core.dto.ClientDetailUpdateV2Request;
+import io.mosip.esignet.core.dto.*;
+import io.mosip.esignet.core.dto.ClientDetailCreateRequestV2;
 import io.mosip.esignet.core.exception.EsignetException;
 import io.mosip.esignet.core.exception.InvalidClientException;
 import io.mosip.esignet.core.spi.ClientManagementService;
@@ -37,10 +34,7 @@
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 import static io.mosip.esignet.core.constants.Constants.CLIENT_ACTIVE_STATUS;
 
@@ -122,7 +116,7 @@ private ClientDetailResponse getClientDetailResponse(ClientDetail clientDetail)
     }
 
     private String getClientNameLanguageMapAsJsonString(Map<String, String> clientNameMap, String clientName) {
-        clientNameMap.put("@none", clientName);
+        clientNameMap.put(Constants.NONE_LANG_KEY, clientName);
         JSONObject clientNameObject = new JSONObject(clientNameMap);
         return clientNameObject.toString();
     }
@@ -179,7 +173,13 @@ public io.mosip.esignet.core.dto.ClientDetail getClientDetails(String clientId)
 
         io.mosip.esignet.core.dto.ClientDetail dto = new io.mosip.esignet.core.dto.ClientDetail();
         dto.setId(clientId);
-        dto.setName(result.get().getName());
+        try {
+            dto.setName(objectMapper.readValue(result.get().getName(), new TypeReference<Map<String, String>>() {}));
+        } catch (Exception e) {
+            log.error("Failed to parse client name as json falling back to @none");
+            dto.setName(new HashMap<>());
+            dto.getName().put(Constants.NONE_LANG_KEY, result.get().getName());
+        }
         dto.setRpId(result.get().getRpId());
         dto.setLogoUri(result.get().getLogoUri());
         dto.setStatus(result.get().getStatus());
@@ -199,20 +199,20 @@ public io.mosip.esignet.core.dto.ClientDetail getClientDetails(String clientId)
         return dto;
     }
 
-    @CacheEvict(value = Constants.CLIENT_DETAIL_CACHE, key = "#clientDetailCreateV2Request.getClientId()")
+    @CacheEvict(value = Constants.CLIENT_DETAIL_CACHE, key = "#clientDetailCreateRequestV2.getClientId()")
     @Override
-    public ClientDetailResponse createOIDCClientV2(ClientDetailCreateV2Request clientDetailCreateV2Request) throws EsignetException {
-        Optional<ClientDetail> result = clientDetailRepository.findById(clientDetailCreateV2Request.getClientId());
+    public ClientDetailResponse createOIDCClientV2(ClientDetailCreateRequestV2 clientDetailCreateRequestV2) throws EsignetException {
+        Optional<ClientDetail> result = clientDetailRepository.findById(clientDetailCreateRequestV2.getClientId());
         if (result.isPresent()) {
             log.error("Duplicate Client Id : {}", ErrorConstants.DUPLICATE_CLIENT_ID);
             throw new EsignetException(ErrorConstants.DUPLICATE_CLIENT_ID);
         }
 
-        ClientDetail clientDetail = buildClientDetailEntity(clientDetailCreateV2Request);
+        ClientDetail clientDetail = buildClientDetailEntity(clientDetailCreateRequestV2);
 
         String clientName = getClientNameLanguageMapAsJsonString(
-                clientDetailCreateV2Request.getClientNameLangMap(),
-                clientDetailCreateV2Request.getClientName()
+                clientDetailCreateRequestV2.getClientNameLangMap(),
+                clientDetailCreateRequestV2.getClientName()
         );
         clientDetail.setName(clientName);
 
@@ -224,25 +224,25 @@ public ClientDetailResponse createOIDCClientV2(ClientDetailCreateV2Request clien
         }
 
         auditWrapper.logAudit(AuditHelper.getClaimValue(SecurityContextHolder.getContext(), claimName),
-                Action.OIDC_CLIENT_CREATE, ActionStatus.SUCCESS, AuditHelper.buildAuditDto(clientDetailCreateV2Request.getClientId()), null);
+                Action.OIDC_CLIENT_CREATE, ActionStatus.SUCCESS, AuditHelper.buildAuditDto(clientDetailCreateRequestV2.getClientId()), null);
 
         return getClientDetailResponse(clientDetail);
     }
 
     @CacheEvict(value = Constants.CLIENT_DETAIL_CACHE, key = "#clientId")
     @Override
-    public ClientDetailResponse updateOIDCClientV2(String clientId, ClientDetailUpdateV2Request clientDetailUpdateV2Request) throws EsignetException {
+    public ClientDetailResponse updateOIDCClientV2(String clientId, ClientDetailUpdateRequestV2 clientDetailUpdateRequestV2) throws EsignetException {
         Optional<ClientDetail> result = clientDetailRepository.findById(clientId);
         if (!result.isPresent()) {
             log.error("Invalid Client Id : {}", ErrorConstants.INVALID_CLIENT_ID);
             throw new EsignetException(ErrorConstants.INVALID_CLIENT_ID);
         }
 
-        ClientDetail clientDetail = buildClientDetailEntity(result.get(), clientDetailUpdateV2Request);
+        ClientDetail clientDetail = buildClientDetailEntity(result.get(), clientDetailUpdateRequestV2);
 
         String clientName = getClientNameLanguageMapAsJsonString(
-                clientDetailUpdateV2Request.getClientNameLangMap(),
-                clientDetailUpdateV2Request.getClientName()
+                clientDetailUpdateRequestV2.getClientNameLangMap(),
+                clientDetailUpdateRequestV2.getClientName()
         );
         clientDetail.setName(clientName);
 

client-management-service-impl/src/test/java/io/mosip/esignet/ClientManagementServiceTest.java

@@ -97,7 +97,7 @@ public void createClient_withExistingClientId_thenFail() {
 
     @Test
     public void createClientV2_withValidDetail_thenPass() throws Exception {
-        ClientDetailCreateV2Request clientCreateV2ReqDto = new ClientDetailCreateV2Request();
+        ClientDetailCreateRequestV2 clientCreateV2ReqDto = new ClientDetailCreateRequestV2();
         Map<String, String> clientnameLangMap = new HashMap<>();
         clientnameLangMap.put("eng", "client_name_v1");
         clientCreateV2ReqDto.setClientId("mock_id_v1");
@@ -125,7 +125,7 @@ public void createClientV2_withValidDetail_thenPass() throws Exception {
     @Test
     public void createClientV2_withExistingClientId_thenFail() {
         Mockito.when(clientDetailRepository.findById("client_id_v1")).thenReturn(Optional.of(new ClientDetail()));
-        ClientDetailCreateV2Request clientCreateV2ReqDto = new ClientDetailCreateV2Request();
+        ClientDetailCreateRequestV2 clientCreateV2ReqDto = new ClientDetailCreateRequestV2();
         clientCreateV2ReqDto.setClientId("client_id_v1");
         try {
             clientManagementService.createOIDCClientV2(clientCreateV2ReqDto);
@@ -199,7 +199,7 @@ public void updateClientV2_withValidClientId_thenPass() throws EsignetException
         clientDetail.setRedirectUris("[\"https://service.com/home\",\"https://service.com/dashboard\", \"v1/idp\"]");
         Mockito.when(clientDetailRepository.findById("client_id_v1")).thenReturn(Optional.of(clientDetail));
 
-        ClientDetailUpdateV2Request updateV2Request = new ClientDetailUpdateV2Request();
+        ClientDetailUpdateRequestV2 updateV2Request = new ClientDetailUpdateRequestV2();
         updateV2Request.setClientNameLangMap(new HashMap<>());
         updateV2Request.setClientName("client_name_v1");
         updateV2Request.setLogoUri("http://service.com/logo.png");

consent-service-impl/pom.xml

@@ -9,10 +9,14 @@
     <parent>
         <groupId>io.mosip.esignet</groupId>
         <artifactId>esignet-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </parent>
 
+    <groupId>io.mosip.esignet</groupId>
     <artifactId>consent-service-impl</artifactId>
+    <version>${project.parent.version}</version>
+    <name>consent-service-impl</name>
+    <description>e-Signet Consent service Implementation</description>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>

consent-service-impl/src/main/java/io/mosip/esignet/entity/ConsentDetail.java

@@ -38,6 +38,12 @@ public class ConsentDetail {
     @Column(name = "claims")
     private String claims;
 
+    /*
+    It stores the requested authorization scopes from the relying party in a json string
+    {
+        "scope" : "boolean" (essential or optional)
+    }
+     */
     @NotNull
     @Column(name = "authorization_scopes")
     private String authorizationScopes;

db_scripts/mosip_esignet/ddl/esignet-consent.sql

@@ -37,7 +37,7 @@ COMMENT ON COLUMN consent_detail.id IS 'UUID : Unique id associated with each co
 COMMENT ON COLUMN consent_detail.client_id IS 'Client_id: associated with relying party';
 COMMENT ON COLUMN consent_detail.psu_token IS 'PSU token associated with user consent';
 COMMENT ON COLUMN consent_detail.claims IS 'Json of requested and user accepted claims';
-COMMENT ON COLUMN consent_detail.authorization_scopes IS 'Json string of user accepted authorization scope';
+COMMENT ON COLUMN consent_detail.authorization_scopes IS 'Json string of requested authorization scope';
 COMMENT ON COLUMN consent_detail.cr_dtimes IS 'Consent creation date';
 COMMENT ON COLUMN consent_detail.expire_dtimes IS 'Expiration date';
 COMMENT ON COLUMN consent_detail.signature IS 'Signature of consent object ';

db_scripts/mosip_esignet/ddl/esignet-consent_history.sql

@@ -35,7 +35,7 @@ COMMENT ON COLUMN consent_history.id IS 'UUID : Unique id associated with each c
 COMMENT ON COLUMN consent_history.client_id IS 'Client_id: associated with relying party';
 COMMENT ON COLUMN consent_history.psu_token IS 'PSU token associated with user consent';
 COMMENT ON COLUMN consent_history.claims IS 'Json of requested and user accepted claims';
-COMMENT ON COLUMN consent_history.authorization_scopes IS 'Json string of user accepted authorization scope';
+COMMENT ON COLUMN consent_history.authorization_scopes IS 'Json string of requested authorization scope';
 COMMENT ON COLUMN consent_history.cr_dtimes IS 'Consent creation date';
 COMMENT ON COLUMN consent_history.expire_dtimes IS 'Expiration date';
 COMMENT ON COLUMN consent_history.signature IS 'Signature of consent object ';

docs/postman-collections/README.md

@@ -0,0 +1,44 @@
+
+# [eSignet](https://docs.esignet.io/overview) Collection
+
+This folder contains Postman collection with requests for creating and updating OIDC clients, performing authentication using oidc flow or wallet flow using esignet.
+
+## Usage
+
+One can [import](https://learning.postman.com/docs/getting-started/importing-and-exporting/importing-and-exporting-overview/ "Postman Docs") the following collections and the corresponding environment files in postman
+
+Mock Ida flow:
+
+* [Esignet Collection](./esignet-OIDC-flow-with-mock.postman_collection.json "Postman Collection")
+* [Esignet Environment](./esignet-OIDC-flow-with-mock.postman_environment.json "Environment")
+
+Real Ida Flow
+
+* [Esignet Collection](./esignet-OIDC-flow-with-real-ida.postman_collection.json "Postman Collection")
+* [Esignet Environment](./esignet-OIDC-flow-with-real-ida.postman_environment.json "Environment")
+
+
+## Prerequisites for Real Ida Flow
+For the client creation in the above flow the user is expected to have the following details handy
+
+* relayingPartyId
+* policyId
+
+## Crypto Operations
+
+This collection utilizes the [postman util lib](https://joolfe.github.io/postman-util-lib/ "Postman Util Library") for performing crypto operations like
+
+* Key Pair Generation
+* Signing
+* Thumbprint Computation x5t#s256
+* Client Assertion
+
+
+## Overview
+
+Overview regarding esignet is [here](../../README.md "readme")
+
+## Contributing
+
+Pull requests are welcome. For major changes, please open an issue first
+to discuss what you would like to change.