[INJICERT-248] rename config keys

mosip.certify.well-known.file.uri -> mosip.certify.issuer-metadata.config-url Signed-off-by: Harsh Vardhan <[email protected]>
mosip · Nov 4, 2024 · c937d45 · c937d45
1 parent a718e79
commit c937d45
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -179,7 +179,7 @@ Execute installation script
     * Registry Url `mosip.certify.vciplugin.sunbird-rc.credential-type.{credential type}.registry-get-url`
     * Template Url `mosip.certify.vciplugin.sunbird-rc.credential-type.{credential type}.template-url`
     * Credential schema version  `mosip.certify.vciplugin.sunbird-rc.credential-type.{credential type}.cred-schema-version`
-    * Change these properties for different credential types supported `mosip.certify.key-values` based on OID4VCI version.
+    * Change these properties for different credential types supported `mosip.certify.issuer-metadata.config-url` based on OID4VCI version.
 
 ## Web interface for VC Issuance (optional)
 

diff --git a/certify-service/src/main/java/io/mosip/certify/services/VCIssuanceServiceImpl.java b/certify-service/src/main/java/io/mosip/certify/services/VCIssuanceServiceImpl.java
@@ -56,13 +56,12 @@ public class VCIssuanceServiceImpl implements VCIssuanceService {
 
     private static final String TYPE_VERIFIABLE_CREDENTIAL = "VerifiableCredential";
 
-    @Value("${mosip.certify.well-known.file.uri}")
-    private String metadataURL;
+    @Value("${mosip.certify.issuer-metadata.config-url}")
+    private String issuerMetadataConfigURL;
 
     @Autowired
     private RestTemplate restTemplate;
 
-    @Value("#{${mosip.certify.key-values}}")
     private LinkedHashMap<String, LinkedHashMap<String, Object>> issuerMetadata;
 
     @Value("${mosip.certify.cnonce-expire-seconds:300}")
@@ -91,9 +90,9 @@ public class VCIssuanceServiceImpl implements VCIssuanceService {
 
     @PostConstruct
     public void postConstructMetadata() {
-        String issuer = restTemplate.getForObject(metadataURL, String.class);
+        String issuerMetadataString = restTemplate.getForObject(issuerMetadataConfigURL, String.class);
         try {
-            issuerMetadata = objectMapper.readValue(issuer, LinkedHashMap.class);
+            issuerMetadata = objectMapper.readValue(issuerMetadataString, LinkedHashMap.class);
         } catch (JsonProcessingException e) {
             throw new CertifyException(ErrorConstants.MISSING_WELLKNOWN_CONFIG);
         }

diff --git a/certify-service/src/main/resources/application-local.properties b/certify-service/src/main/resources/application-local.properties
@@ -32,7 +32,7 @@ mosip.certify.authn.issuer-uri=http://localhost:8088/v1/esignet
 mosip.certify.authn.jwk-set-uri=http://localhost:8088/v1/esignet/oauth/.well-known/jwks.json
 mosip.certify.authn.allowed-audiences={ '${mosip.certify.domain.url}${server.servlet.path}/issuance/credential', 'http://localhost:8088/v1/esignet/vci/credential' }
 mosip.certify.svg-templates=svg-template.json
-mosip.certify.well-known.file.uri=https://raw.githubusercontent.com/mosip/inji-config/develop/certify-mock-openid4vci-wk.json
+mosip.certify.issuer-metadata.config-url=https://raw.githubusercontent.com/mosip/inji-config/develop/certify-mock-openid4vci-wk.json
 
 ## ------------------------------------------- Integrations ------------------------------------------------------------
 #mosip.certify.integration.scan-base-package=io.mosip.certify.sunbirdrc.integration

diff --git a/certify-service/src/test/resources/application-test.properties b/certify-service/src/test/resources/application-test.properties
@@ -30,8 +30,8 @@ mosip.certify.authn.allowed-audiences={ '${mosipbox.public.url}${server.servlet.
 mosip.certify.mock.authenticator.get-identity-url=http://localhost:8082/v1/mock-identity-system/identity
 
 mosip.certify.supported.jwt-proof-alg={'RS256'}
-mosip.certify.well-known.file.uri=https://raw.githubusercontent.com/mosip/inji-config/develop/certify-mock-openid4vci-wk.json
 mosip.certify.svg-templates=svg-template.json
+mosip.certify.issuer-metadata.config-url=https://raw.githubusercontent.com/mosip/inji-config/develop/certify-mock-openid4vci-wk.json
 
 #------------------------------------ Key-manager specific properties --------------------------------------------------
 

diff --git a/docker-compose/docker-compose-certify/config/certify-default.properties b/docker-compose/docker-compose-certify/config/certify-default.properties
@@ -45,6 +45,7 @@ mosip.certify.security.ignore-auth-urls=**/actuator/**,**/error,**/swagger-ui/**
 ## ------------------------------------------ Discovery openid-configuration -------------------------------------------
 mosip.certify.discovery.issuer-id=${mosipbox.public.url}${server.servlet.path}
 mosip.certify.authorization.url=http://localhost:8088
+mosip.certify.issuer-metadata.config-url=https://raw.githubusercontent.com/mosip/inji-config/develop/certify-mock-openid4vci-wk.json
 
 ##--------------change this later---------------------------------
 mosip.certify.supported.jwt-proof-alg={'RS256','PS256'}