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

[ES-280], [ES-281] #1094

Merged
merged 2 commits into from
Sep 15, 2023
+26 −18
Merged

[ES-280], [ES-281] #1094

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebaa603
Corrected dependency versions.
mahammedtaheer Sep 12, 2023
7c676cc
Fixed NotReadablePropertyException error and added VID or UIN in VC.
mahammedtaheer Sep 14, 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
2 changes: 2 additions & 0 deletions ...ation-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,6 +443,8 @@ public final class IdAuthCommonConstants {

public static final String VCI_EXCHANGE_SUCCESS = "VciExchange status : true";

public static final String VC_CREDENTIAL_DEF = "credentialsDefinition";

private IdAuthCommonConstants() {
}
}
2 changes: 1 addition & 1 deletion .../java/io/mosip/authentication/service/kyc/controller/IdentityWalletBindingController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public IdentityKeyBindingResponseDto processIdKeyBinding(@Validated @RequestBody
metadata != null &&
metadata.get(IdAuthCommonConstants.IDENTITY_DATA) != null &&
metadata.get(IdAuthCommonConstants.IDENTITY_INFO) != null) {
keyBindingResponseDto = keyIdentityFacade.processIdentityKeyBinding(identityKeyBindingRequestDTO, authResponseDTO,
keyBindingResponseDto = keyIdentityFacade.processIdentityKeyBinding(identityKeyBindingRequestDTO, authResponseDTO,
partnerId, oidcClientId, metadata);
}
return keyBindingResponseDto;
Expand Down
4 changes: 0 additions & 4 deletions ...ation-service/src/main/java/io/mosip/authentication/service/kyc/facade/KycFacadeImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
*/
package io.mosip.authentication.service.kyc.facade;

import java.time.LocalDateTime;
import java.util.AbstractMap.SimpleEntry;
import java.util.Collection;
import java.util.HashSet;
Expand All @@ -27,14 +26,11 @@
import io.mosip.authentication.common.service.builder.AuthTransactionBuilder;
import io.mosip.authentication.common.service.entity.AutnTxn;
import io.mosip.authentication.common.service.entity.KycTokenData;
import io.mosip.authentication.common.service.entity.OIDCClientData;
import io.mosip.authentication.common.service.helper.AuditHelper;
import io.mosip.authentication.common.service.helper.IdInfoHelper;
import io.mosip.authentication.common.service.helper.TokenValidationHelper;
import io.mosip.authentication.common.service.integration.TokenIdManager;
import io.mosip.authentication.common.service.repository.IdaUinHashSaltRepo;
import io.mosip.authentication.common.service.repository.KycTokenDataRepository;
import io.mosip.authentication.common.service.repository.OIDCClientDataRepository;
import io.mosip.authentication.common.service.transaction.manager.IdAuthSecurityManager;
import io.mosip.authentication.common.service.util.EnvUtil;
import io.mosip.authentication.common.service.util.IdaRequestResponsConsumerUtil;
Expand Down
18 changes: 14 additions & 4 deletions ...cation-service/src/main/java/io/mosip/authentication/service/kyc/impl/VciServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ public class VciServiceImpl implements VciService {
OBJECT_MAPPER.registerModule(new AfterburnerModule());
}

@Value("${ida.idp.consented.individual_id.attribute.name:individual_id}")
private String consentedIndividualAttributeName;

@Value("${mosip.ida.config.server.file.storage.uri:}")
private String configServerFileStorageUrl;

Expand Down Expand Up @@ -294,7 +297,7 @@ private JsonLDObject generateLdpVc(String credSubjectId, Map<String, List<Identi
List<String> locales, Set<String> allowedAttributes, VciExchangeRequestDTO vciExchangeRequestDTO,
String psuToken) throws IdAuthenticationBusinessException {

Map<String, Object> credSubjectMap = getCredSubjectMap(credSubjectId, idInfo, locales, allowedAttributes);
Map<String, Object> credSubjectMap = getCredSubjectMap(credSubjectId, idInfo, locales, allowedAttributes, vciExchangeRequestDTO);
try {
Map<String, Object> verCredJsonObject = new HashMap<>();

Expand Down Expand Up @@ -361,13 +364,18 @@ private JsonLDObject generateLdpVc(String credSubjectId, Map<String, List<Identi
}

private Map<String, Object> getCredSubjectMap(String credSubjectId, Map<String, List<IdentityInfoDTO>> idInfo,
List<String> locales, Set<String> allowedAttributes) throws IdAuthenticationBusinessException {
List<String> locales, Set<String> allowedAttributes, VciExchangeRequestDTO vciExchangeRequestDTO)
throws IdAuthenticationBusinessException {
Map<String, Object> credSubjectMap = new HashMap<>();

credSubjectMap.put(IdAuthCommonConstants.VC_ID, credSubjectId);

for (String attrib : allowedAttributes) {
List<String> idSchemaAttributes = idInfoHelper.getIdentityAttributesForIdName(attrib);
if (consentedIndividualAttributeName.equals(attrib)) {
credSubjectMap.put(vciExchangeRequestDTO.getIndividualIdType(), vciExchangeRequestDTO.getIndividualId());
continue;
}

if (attrib.equalsIgnoreCase(BiometricType.FACE.value())) {
Map<String, String> faceEntityInfoMap = idInfoHelper.getIdEntityInfoMap(BioMatchType.FACE, idInfo, null);
if (Objects.nonNull(faceEntityInfoMap)) {
Expand All @@ -382,7 +390,9 @@ private Map<String, Object> getCredSubjectMap(String credSubjectId, Map<String,
}

}
continue;
}
List<String> idSchemaAttributes = idInfoHelper.getIdentityAttributesForIdName(attrib);
for (String idSchemaAttribute : idSchemaAttributes) {
List<IdentityInfoDTO> idInfoList = idInfo.get(idSchemaAttribute);
if (Objects.isNull(idInfoList))
Expand Down
10 changes: 5 additions & 5 deletions .../main/java/io/mosip/authentication/service/kyc/validator/VciExchangeRequestValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public void validate(Object target, Errors errors) {
}

if (!errors.hasErrors()) {
validateCredentialType(vciExchangeRequestDTO.getCredentialsDefinition().getType(), errors, IdAuthCommonConstants.VC_CREDENTIAL_TYPE);
validateCredentialType(vciExchangeRequestDTO.getCredentialsDefinition().getType(), errors, IdAuthCommonConstants.VC_CREDENTIAL_DEF);
}

} else {
Expand Down Expand Up @@ -150,16 +150,16 @@ private void validateVCFormat(String vcFormat, Errors errors, String paramName)
private void validateCredentialType(List<String> credentialType, Errors errors, String paramName) {
if (credentialType == null || credentialType.isEmpty()) {
mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE,
MISSING_INPUT_PARAMETER + paramName);
MISSING_INPUT_PARAMETER + paramName + "/type" );
errors.rejectValue(paramName, IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorCode(),
new Object[] { paramName },
new Object[] { paramName + "/type" },
IdAuthenticationErrorConstants.MISSING_INPUT_PARAMETER.getErrorMessage());
} else {
if(!supportedCredTypes.containsAll(credentialType)) {
mosipLogger.error(SESSION_ID, this.getClass().getSimpleName(), VALIDATE,
MISSING_INPUT_PARAMETER + paramName);
MISSING_INPUT_PARAMETER + paramName + "/type" );
errors.rejectValue(paramName, IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorCode(),
new Object[] { paramName },
new Object[] { paramName + "/type" },
IdAuthenticationErrorConstants.INVALID_INPUT_PARAMETER.getErrorMessage());
}
}
Expand Down
8 changes: 4 additions & 4 deletions authentication/esignet-integration-impl/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@

<dependency>
<groupId>io.mosip.esignet</groupId>
<artifactId>esignet-integration-api</artifactId>
<version>1.2.1-SNAPSHOT</version>
<artifactId>esignet-core</artifactId>
<version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>io.mosip.esignet</groupId>
<artifactId>esignet-core</artifactId>
<version>1.2.1-SNAPSHOT</version>
<artifactId>esignet-integration-api</artifactId>
<version>1.2.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>

Expand Down