From c5047c4a77ef8959d9318f66369fde78ed22a2f5 Mon Sep 17 00:00:00 2001 From: Manish Choudhary Date: Tue, 24 Oct 2023 15:00:57 +0530 Subject: [PATCH] reverted changes --- .../AuthenticationContextClassRefUtil.java | 8 +-- .../src/main/resources/application.properties | 69 +------------------ 2 files changed, 2 insertions(+), 75 deletions(-) diff --git a/esignet-core/src/main/java/io/mosip/esignet/core/util/AuthenticationContextClassRefUtil.java b/esignet-core/src/main/java/io/mosip/esignet/core/util/AuthenticationContextClassRefUtil.java index b539dd52f..6fcb64e21 100644 --- a/esignet-core/src/main/java/io/mosip/esignet/core/util/AuthenticationContextClassRefUtil.java +++ b/esignet-core/src/main/java/io/mosip/esignet/core/util/AuthenticationContextClassRefUtil.java @@ -12,8 +12,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import java.nio.file.Files; -import java.nio.file.Path; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -53,11 +51,7 @@ public class AuthenticationContextClassRefUtil { private String getMappingJson() { if(StringUtils.isEmpty(mappingJson)) { log.info("Fetching AMR-ACR mapping json from : {}", mappingFileUrl); - try { - mappingJson = Files.readString(Path.of(mappingFileUrl)); - } catch (IOException e) { - e.printStackTrace(); - } + mappingJson = restTemplate.getForObject(mappingFileUrl, String.class); } return mappingJson; } diff --git a/esignet-service/src/main/resources/application.properties b/esignet-service/src/main/resources/application.properties index c5af988d3..3efc51882 100644 --- a/esignet-service/src/main/resources/application.properties +++ b/esignet-service/src/main/resources/application.properties @@ -17,24 +17,7 @@ softhsm.mock.identity.system.security.pin=e4c954e96ae5b625ca800b78f9fee5e2cc4534 ## ------------------------------------------------- e-Signet ---------------------------------------------------------- mosip.esignet.misp.license.key=idp-dev-misp-lic-key -mosip.esignet.amr-acr-mapping-file-url=amr-acr-mapping.json - - - - - - - - Expand Down - - - - - - Expand Up - - @@ -39,8 +52,8 @@ mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server. - +mosip.esignet.amr-acr-mapping-file-url=https://raw.githack.com/tf-govstack/esignet/local-latest-esignet/esignet-service/src/main/resources/amr_acr_mapping.json mosip.esignet.supported-id-regex=\\S* mosip.esignet.id-token-expire-seconds=3600 mosip.esignet.access-token.expire.seconds=3600 @@ -66,17 +49,6 @@ mosip.esignet.security.ignore-auth-urls=${server.servlet.path}/csrf/**,${server. ##------------------------------------------ Kafka configurations ------------------------------------------------------ spring.kafka.bootstrap-servers=localhost:9092 - - - - - - - - Expand All - - @@ -54,7 +67,9 @@ mosip.esignet.kafka.linked-auth-code.topic=idp-consented - spring.kafka.consumer.group-id=runtime-kafka-registry spring.kafka.consumer.enable-auto-commit=true spring.kafka.listener.concurrency=1 @@ -91,17 +63,6 @@ mosip.esignet.integration.scan-base-package=io.mosip.esignet.mock.integration mosip.esignet.integration.binding-validator=BindingValidatorServiceImpl mosip.esignet.integration.authenticator=MockAuthenticationService - - - - - - - - Expand All - - @@ -65,10 +80,11 @@ mosip.esignet.integration.audit-plugin=LoggerAuditService - mosip.esignet.integration.key-binder=MockKeyBindingWrapperService mosip.esignet.integration.audit-plugin=LoggerAuditService #Mock IDA integration props @@ -116,23 +77,6 @@ mosip.esignet.mock.authenticator.send-otp=${mosip.esignet.mock.host}/v1/mock-ide mosip.esignet.mock.authenticator.ida.otp-channels=email,phone #Mock Key binding props - - - - - - - - Expand Down - - - - - - Expand Up - - @@ -169,14 +185,14 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer- - mosip.esignet.mock.supported.bind-auth-factor-types={'WLA'} ## ------------------------------------------ oauth & openid supported values ------------------------------------------ ## supported scopes @@ -225,17 +169,6 @@ mosip.esignet.discovery.key-values={'issuer': '${mosip.esignet.discovery.issuer- #------------------------------------ Key-manager specific properties -------------------------------------------------- #Crypto asymmetric algorithm name - - - - - - - - Expand Down - - - mosip.kernel.crypto.asymmetric-algorithm-name=RSA/ECB/OAEPWITHSHA-256ANDMGF1PADDING #Crypto symmetric algorithm name mosip.kernel.crypto.symmetric-algorithm-name=AES/GCM/PKCS5Padding