VCI updates

Author: QZHelen

app/src/main/assets/provision_hardcoded.wasm

@@ -179,7 +179,7 @@ class CmWalletApplication : Application() {
             icon = iconBuffer.toByteArray(),
             title = resources.getString(R.string.app_name),
             subtitle = "Save your document to CMWallet",
-            issuerAllowlist = listOf("https://digital-credentials.dev", "http://localhost:8080")
+            issuerAllowlist = null
         )
 
         return data.toRegistryDatabase()

app/src/main/java/com/credman/cmwallet/CmWalletApplication.kt

@@ -208,7 +208,7 @@ class CreateCredentialViewModel : ViewModel() {
                 require(digitalCredentialCreateRequest.has("protocol")) { "request json missing required field protocol" }
                 require(digitalCredentialCreateRequest.has("data")) { "request json missing required field data" }
 
-                if (setOf("openid4vci1.0", "openid4vci").contains(digitalCredentialCreateRequest.getString("protocol"))) {
+                if (setOf("openid4vci1.0", "openid4vci", "openid4vci-v1").contains(digitalCredentialCreateRequest.getString("protocol"))) {
                     openId4VCI =
                         OpenId4VCI(digitalCredentialCreateRequest.getJSONObject("data").toString())
                     // Figure out auth server

app/src/main/java/com/credman/cmwallet/createcred/CreateCredentialViewModel.kt

@@ -119,7 +119,7 @@ class CredentialRepository {
         val icon: ByteArray, // Entry icon for display
         val title: String, // Entry subtitle for display
         val subtitle: String?, // Entry subtitle for display
-        val issuerAllowlist: List<String>,
+        val issuerAllowlist: List<String>?,
     ) {
         fun toRegistryDatabase(): ByteArray {
             val out = ByteArrayOutputStream()
@@ -144,11 +144,13 @@ class CredentialRepository {
                     } // Hardcoded for now
                     put(ICON, iconJson)
                 })
-                val capabilities = JSONObject()
-                for (iss in issuerAllowlist) {
-                    capabilities.put(iss, JSONObject())
+                if (issuerAllowlist != null) {
+                    val capabilities = JSONObject()
+                    for (iss in issuerAllowlist) {
+                        capabilities.put(iss, JSONObject())
+                    }
+                    put("capabilities", capabilities)
                 }
-                put("capabilities", capabilities)
             }
             out.write(json.toString().toByteArray())
             return out.toByteArray()

app/src/main/java/com/credman/cmwallet/data/repository/CredentialRepository.kt

@@ -177,6 +177,6 @@ data class CredentialOffer(
     @SerialName("credential_issuer") val credentialIssuer: String,
     @SerialName("credential_configuration_ids") val credentialConfigurationIds: List<String>,
     @SerialName("grants") val grants: Grants?,
-    @SerialName("issuer_metadata") val issuerMetadata: CredentialIssuerMetadata,
+    @SerialName("credential_issuer_metadata") val issuerMetadata: CredentialIssuerMetadata,
     @SerialName("authorization_server_metadata") val authorizationServerMetadata: OauthAuthorizationServer?
 )

app/src/main/java/com/credman/cmwallet/openid4vci/data/CredentialOfferEndpoint.kt

@@ -10,6 +10,7 @@
 #include "launcher_icon.h"
 
 #define PROTOCOL_OPENID4VCI "openid4vci1.0"
+#define PROTOCOL_OPENID4VCI_V1 "openid4vci-v1"
 
 cJSON* GetDCRequestJson() {
     uint32_t request_size;
@@ -60,13 +61,13 @@ int main() {uint32_t credentials_size;
     for(int i=0; i<requests_size; i++) {
         cJSON* request = cJSON_GetArrayItem(requests, i);
         char* protocol = cJSON_GetStringValue(cJSON_GetObjectItem(request, "protocol"));
-        if (strcmp(protocol, PROTOCOL_OPENID4VCI) == 0) {
+        if (strcmp(protocol, PROTOCOL_OPENID4VCI) == 0 || strcmp(protocol, PROTOCOL_OPENID4VCI_V1) == 0) {
             // We have an OpenID4VCI request
             cJSON* cred_offer = cJSON_GetObjectItem(request, "data");
             cJSON* credential_issuer = cJSON_GetObjectItem(cred_offer, "credential_issuer");
 
             cJSON* capabilities = cJSON_GetObjectItem(creds, "capabilities");
-            if(cJSON_HasObjectItem(capabilities, cJSON_GetStringValue(credential_issuer))) {
+            if(capabilities == NULL || cJSON_HasObjectItem(capabilities, cJSON_GetStringValue(credential_issuer))) {
                 cJSON* display = cJSON_GetObjectItem(creds, "display");
                 cJSON* icon = cJSON_GetObjectItem(display, "icon");
                 int icon_start_int = 0;