[INJICERT-273] make versions v11 -> vd11 & v12 -> vd12

Signed-off-by: Harsh Vardhan <[email protected]>
vharsh · Jun 24, 2024 · 8b2d7f0 · 8b2d7f0
1 parent 55b1ab9
commit 8b2d7f0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/certify-service/src/main/resources/application-local.properties b/certify-service/src/main/resources/application-local.properties
@@ -29,7 +29,7 @@ mosip.certify.authn.jwk-set-uri=http://localhost:8088/v1/esignet/oauth/.well-kno
 mosip.certify.authn.allowed-audiences={ '${mosipbox.public.url}${server.servlet.path}/issuance/credential', 'http://localhost:8088/v1/esignet/vci/credential' }
 
 mosip.certify.key-values={\
- 'v11' : {\
+ 'vd11' : {\
               'credential_issuer': '${mosipbox.public.url}',   \
               'authorization_server': 'http://esignet:8088/', \
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/issuance/vd11/credential', \
@@ -91,7 +91,7 @@ mosip.certify.key-values={\
                        'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
                   }}\
           },\
-   'v12' : {\
+   'vd12' : {\
               'credential_issuer': '${mosipbox.public.url}',   \
               'authorization_servers': {'http://esignet:8088/'}, \
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/issuance/vd12/credential', \

diff --git a/certify-service/src/test/java/io/mosip/certify/controller/VCIssuanceControllerTest.java b/certify-service/src/test/java/io/mosip/certify/controller/VCIssuanceControllerTest.java
@@ -74,14 +74,14 @@ public void getIssuerMetadata_withQueryParam_thenPass() throws Exception {
 
         Mockito.when(vcIssuanceService.getCredentialIssuerMetadata(Mockito.anyString())).thenReturn(issuerMetadata);
 
-        mockMvc.perform(get("/issuance/.well-known/openid-credential-issuer?version=v11"))
+        mockMvc.perform(get("/issuance/.well-known/openid-credential-issuer?version=vd11"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.credential_issuer").exists())
                 .andExpect(jsonPath("$.credential_issuer").exists())
                 .andExpect(jsonPath("$.credentials_supported").exists())
                 .andExpect(header().string("Content-Type", "application/json"));
 
-        Mockito.verify(vcIssuanceService).getCredentialIssuerMetadata("v11");
+        Mockito.verify(vcIssuanceService).getCredentialIssuerMetadata("vd11");
     }
 
     @Test
@@ -192,7 +192,7 @@ public void getVerifiableCredential_withInvalidNonceException_thenFail() throws
     }
 
     @Test
-    public void getVerifiableCredential_v11() throws Exception {
+    public void getVerifiableCredential_vd11() throws Exception {
         CredentialDefinition credentialDefinition = new CredentialDefinition();
         credentialDefinition.setType(Arrays.asList("VerifiableCredential", "SampleVerifiableCredential_ldp"));
         credentialDefinition.setContext(Arrays.asList("https://www.w3.org/2018/credentials/v1"));
@@ -218,7 +218,7 @@ public void getVerifiableCredential_v11() throws Exception {
     }
 
     @Test
-    public void getVerifiableCredential_v12() throws Exception {
+    public void getVerifiableCredential_vd12() throws Exception {
         CredentialDefinition credentialDefinition = new CredentialDefinition();
         credentialDefinition.setType(Arrays.asList("VerifiableCredential", "SampleVerifiableCredential_ldp"));
         credentialDefinition.setContext(Arrays.asList("https://www.w3.org/2018/credentials/v1"));

diff --git a/certify-service/src/test/resources/application-test.properties b/certify-service/src/test/resources/application-test.properties
@@ -26,7 +26,7 @@ mosip.certify.authn.allowed-audiences={ '${mosipbox.public.url}${server.servlet.
 
 mosip.certify.supported.jwt-proof-alg={'RS256'}
 mosip.certify.key-values={\
- 'v11' : {\
+ 'vd11' : {\
               'credential_issuer': '${mosipbox.public.url}',   \
               'authorization_server': 'http://esignet:8088/', \
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/issuance/vd11/credential', \
@@ -88,7 +88,7 @@ mosip.certify.key-values={\
                        'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
                   }}\
           },\
-   'v12' : {\
+   'vd12' : {\
               'credential_issuer': '${mosipbox.public.url}',   \
               'authorization_servers': {'http://esignet:8088/'}, \
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/issuance/vd12/credential', \

diff --git a/docker-compose/docker-compose-certify/config/certify-default.properties b/docker-compose/docker-compose-certify/config/certify-default.properties
@@ -60,7 +60,7 @@ mosip.certify.authn.jwk-set-uri=http://esignet:8088/v1/esignet/oauth/.well-known
 mosip.certify.authn.allowed-audiences={ '${mosipbox.public.url}${server.servlet.path}/issuance/credential', '${mosip.certify.authorization.url}/v1/esignet/vci/credential' }
 
 mosip.certify.key-values={\
- 'v11' : {\
+ 'vd11' : {\
               'credential_issuer': '${mosipbox.public.url}',   \
               'authorization_server': '${mosip.certify.authorization.url}', \
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/issuance/vd11/credential', \
@@ -122,7 +122,7 @@ mosip.certify.key-values={\
                        'order' : {'fullName','policyName','policyExpiresOn','policyIssuedOn','policyNumber','mobile','dob','gender','benefits','email'}\
                   }}\
           },\
-   'v12' : {\
+   'vd12' : {\
               'credential_issuer': '${mosipbox.public.url}',   \
               'authorization_servers': {'${mosip.certify.authorization.url}'}, \
               'credential_endpoint': '${mosipbox.public.url}${server.servlet.path}/issuance/vd12/credential', \

diff --git a/docker-compose/docker-compose-certify/config/esignet-default.properties b/docker-compose/docker-compose-certify/config/esignet-default.properties
@@ -426,7 +426,7 @@ mosip.esignet.cnonce-expire-seconds=1000
 mosip.esignet.vci.supported.jwt-proof-alg={'RS256','PS256','ES256'}
 
 mosip.esignet.vci.key-values={\
- 'v11' : {\
+ 'vd11' : {\
               'credential_issuer': '${mosip.esignet.vci.identifier}',   \
               'authorization_server': 'http://esignet:8088/', \
               'credential_endpoint': '${mosip.esignet.domain.url}${server.servlet.path}/vci/credential', \