feat: fix order field position

Signed-off-by: Mykhailo Sizov <[email protected]>
mishasizov-SK · Feb 21, 2024 · 428959a · 428959a
1 parent e965efa
commit 428959a
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 33 deletions.
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ export TERM := xterm-256color
 
 ANDROID_EMULATOR_NAME ?= WalletSDKDeviceEmulator
 
-VCS_COMMIT ?= 85f957d9f6554679b3fff86828d4e97ae556d05d
+VCS_COMMIT ?= 3eafabe27767fe7aa6055afe81634ba12a60db94
 
 .PHONY: all
 all: checks unit-test integration-test

diff --git a/cmd/wallet-sdk-gomobile/display/testdata/issuer_metadata.json b/cmd/wallet-sdk-gomobile/display/testdata/issuer_metadata.json
@@ -15,6 +15,11 @@
   "credential_configurations_supported": {
     "UniversityDegreeCredential_jwt_vc_json_v1": {
       "format": "jwt_vc_json",
+      "order": [
+        "id",
+        "given_name",
+        "surname"
+      ],
       "credential_definition": {
         "credentialSubject": {
           "id": {
@@ -24,8 +29,7 @@
                 "locale": "en-US"
               }
             ],
-            "value_type": "string",
-            "order": 0
+            "value_type": "string"
           },
           "given_name": {
             "display": [
@@ -34,8 +38,7 @@
                 "locale": "en-US"
               }
             ],
-            "value_type": "string",
-            "order": 1
+            "value_type": "string"
           },
           "surname": {
             "display": [
@@ -44,8 +47,7 @@
                 "locale": "en-US"
               }
             ],
-            "value_type": "string",
-            "order": 2
+            "value_type": "string"
           },
           "gpa": {
             "display": [

diff --git a/pkg/credentialschema/credentialdisplay.go b/pkg/credentialschema/credentialdisplay.go
@@ -177,7 +177,8 @@ func resolveClaims(
 	var resolvedClaims []ResolvedClaim
 
 	for fieldName, claim := range credentialConfigurationSupported.CredentialDefinition.CredentialSubject {
-		resolvedClaim, err := resolveClaim(fieldName, claim, credentialSubject, preferredLocale, maskingString)
+		resolvedClaim, err := resolveClaim(
+			fieldName, claim, credentialSubject, credentialConfigurationSupported, preferredLocale, maskingString)
 		if err != nil && !errors.Is(err, errNoClaimDisplays) && !errors.Is(err, errClaimValueNotFoundInVC) {
 			return nil, err
 		}
@@ -190,7 +191,11 @@ func resolveClaims(
 	return resolvedClaims, nil
 }
 
-func resolveClaim(fieldName string, claim *issuer.Claim, credentialSubject *verifiable.Subject,
+func resolveClaim(
+	fieldName string,
+	claim *issuer.Claim,
+	credentialSubject *verifiable.Subject,
+	credentialConfigurationSupported *issuer.CredentialConfigurationSupported,
 	preferredLocale, maskingString string,
 ) (*ResolvedClaim, error) {
 	if len(claim.LocalizedClaimDisplays) == 0 {
@@ -219,12 +224,8 @@ func resolveClaim(fieldName string, claim *issuer.Claim, credentialSubject *veri
 
 	var order *int
 
-	if claim.Order != nil {
-		orderAsInt, err := claim.OrderAsInt()
-		if err != nil {
-			return nil, err
-		}
-
+	orderAsInt, err := credentialConfigurationSupported.ClaimOrderAsInt(fieldName)
+	if err == nil {
 		order = &orderAsInt
 	}
 

diff --git a/pkg/credentialschema/testdata/issuer_metadata.json b/pkg/credentialschema/testdata/issuer_metadata.json
@@ -15,6 +15,11 @@
   "credential_configurations_supported": {
     "UniversityDegreeCredential_jwt_vc_json-ld_v1": {
       "format": "jwt_vc_json",
+      "order": [
+        "id",
+        "given_name",
+        "surname"
+      ],
       "credential_definition": {
         "credentialSubject": {
           "id": {
@@ -24,8 +29,7 @@
                 "locale": "en-US"
               }
             ],
-            "value_type": "string",
-            "order": 0
+            "value_type": "string"
           },
           "given_name": {
             "display": [
@@ -34,8 +38,7 @@
                 "locale": "en-US"
               }
             ],
-            "value_type": "string",
-            "order": 1
+            "value_type": "string"
           },
           "surname": {
             "display": [
@@ -44,8 +47,7 @@
                 "locale": "en-US"
               }
             ],
-            "value_type": "string",
-            "order": 2
+            "value_type": "string"
           },
           "gpa": {
             "display": [

diff --git a/test/integration/fixtures/profile/profiles.json b/test/integration/fixtures/profile/profiles.json
@@ -56,6 +56,11 @@
           "credential_configurations_supported": {
             "VerifiedEmployee_jwt_vc_json_v1": {
               "format": "jwt_vc_json",
+              "order": [
+                "displayName",
+                "givenName",
+                "jobTitle"
+              ],
               "credential_definition": {
                 "type": [
                   "VerifiableCredential",
@@ -69,8 +74,7 @@
                         "name": "Employee"
                       }
                     ],
-                    "value_type": "string",
-                    "order": 0
+                    "value_type": "string"
                   },
                   "givenName": {
                     "display": [
@@ -79,8 +83,7 @@
                         "name": "Given Name"
                       }
                     ],
-                    "value_type": "string",
-                    "order": 1
+                    "value_type": "string"
                   },
                   "jobTitle": {
                     "display": [
@@ -89,8 +92,7 @@
                         "name": "Job Title"
                       }
                     ],
-                    "value_type": "string",
-                    "order": 2
+                    "value_type": "string"
                   },
                   "mail": {
                     "display": [
@@ -430,6 +432,11 @@
           "credential_configurations_supported": {
             "VerifiedEmployee_jwt_vc_json_v1": {
               "format": "jwt_vc_json",
+              "order": [
+                "displayName",
+                "givenName",
+                "jobTitle"
+              ],
               "credential_definition": {
                 "type": [
                   "VerifiableCredential",
@@ -443,8 +450,7 @@
                         "locale": "en-US"
                       }
                     ],
-                    "value_type": "string",
-                    "order": 0
+                    "value_type": "string"
                   },
                   "givenName": {
                     "display": [
@@ -453,8 +459,7 @@
                         "locale": "en-US"
                       }
                     ],
-                    "value_type": "string",
-                    "order": 1
+                    "value_type": "string"
                   },
                   "jobTitle": {
                     "display": [
@@ -463,8 +468,7 @@
                         "locale": "en-US"
                       }
                     ],
-                    "value_type": "string",
-                    "order": 2
+                    "value_type": "string"
                   },
                   "surname": {
                     "display": [