Show non-selective disclosure data in the selection list #2522

TalaoDAO · Mar 20, 2024 · 88274d1 · 88274d1
1 parent 5b78bef
commit 88274d1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/lib/selective_disclosure/selective_disclosure.dart b/lib/selective_disclosure/selective_disclosure.dart
@@ -105,22 +105,19 @@ class SelectiveDisclosure {
     if (valueType == null) return null;
 
     if (valueType == 'image/jpeg') {
-      final data = getClaimsData(
-        key: 'picture',
-        chooseFromDisclosureFromJWTOnly: false,
-      );
-
+      final (data, _) = getClaimsData(key: 'picture');
       return data;
     } else {
       return null;
     }
   }
 
-  String? getClaimsData({
+  /// claimsdata, isfromDisclosureOfJWT
+  (String?, bool) getClaimsData({
     required String key,
-    required bool chooseFromDisclosureFromJWTOnly,
   }) {
     String? data;
+    bool isfromDisclosureOfJWT = false;
 
     final JsonPath dataPath = JsonPath(
       // ignore: prefer_interpolation_to_compose_strings
@@ -130,17 +127,17 @@ class SelectiveDisclosure {
     try {
       final uncryptedDataPath = dataPath.read(extractedValuesFromJwt).first;
       data = uncryptedDataPath.value.toString();
+      isfromDisclosureOfJWT = true;
     } catch (e) {
-      if (!chooseFromDisclosureFromJWTOnly) {
-        try {
-          final credentialModelPath = dataPath.read(credentialModel.data).first;
-          data = credentialModelPath.value.toString();
-        } catch (e) {
-          data = null;
-        }
+      try {
+        final credentialModelPath = dataPath.read(credentialModel.data).first;
+        data = credentialModelPath.value.toString();
+        isfromDisclosureOfJWT = false;
+      } catch (e) {
+        data = null;
       }
     }
 
-    return data;
+    return (data, isfromDisclosureOfJWT);
   }
 }
diff --git a/lib/selective_disclosure/widget/display_selective_disclosure.dart b/lib/selective_disclosure/widget/display_selective_disclosure.dart
@@ -82,11 +82,13 @@ class DisplaySelectiveDisclosure extends StatelessWidget {
           if (display == null) return Container();
           title = display['name'].toString();
 
-          data = SelectiveDisclosure(credentialModel).getClaimsData(
+          final (claimsData, isfromDisclosureOfJWT) =
+              SelectiveDisclosure(credentialModel).getClaimsData(
             key: key,
-            chooseFromDisclosureFromJWTOnly: selectedIndex != null,
           );
 
+          data = claimsData;
+
           if (data == null) return Container();
 
           return TransparentInkWell(
@@ -104,7 +106,7 @@ class DisplaySelectiveDisclosure extends StatelessWidget {
                     showVertically: showVertically,
                   ),
                 ),
-                if (selectedIndex != null) ...[
+                if (selectedIndex != null && isfromDisclosureOfJWT) ...[
                   const Spacer(),
                   Padding(
                     padding: const EdgeInsets.only(top: 15, right: 10),