Sd jwt : if there is no cnf in the sd jwt payload

#2877
TalaoDAO · Sep 12, 2024 · 74a58b3 · 74a58b3
1 parent 74b69f6
commit 74a58b3
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 34 deletions.
diff --git a/.../credentials/present/pick/selective_disclosure/cubit/selective_disclosure_pick_cubit.dart b/.../credentials/present/pick/selective_disclosure/cubit/selective_disclosure_pick_cubit.dart
@@ -102,31 +102,24 @@ class SelectiveDisclosureCubit extends Cubit<SelectiveDisclosureState> {
           );
     }
 
-    if (index == null || index == -1) {
-      throw ResponseMessage(
-        data: {
-          'error': 'invalid_request',
-          'error_description': 'Issue with the dislosure of jwt.',
-        },
-      );
-    }
-
-    final bool isSelected = state.selectedSDIndexInJWT.contains(index);
-
-    late List<int> selected;
-
-    if (isSelected) {
-      /// deSelecting the credential
-      selected = List<int>.from(state.selectedSDIndexInJWT)
-        ..removeWhere((element) => element == index);
-    } else {
-      /// selecting the credential
-      selected = [
-        ...state.selectedSDIndexInJWT,
-        ...[index],
-      ];
+    if (!(index == null || index == -1)) {
+      final bool isSelected = state.selectedSDIndexInJWT.contains(index);
+
+      late List<int> selected;
+
+      if (isSelected) {
+        /// deSelecting the credential
+        selected = List<int>.from(state.selectedSDIndexInJWT)
+          ..removeWhere((element) => element == index);
+      } else {
+        /// selecting the credential
+        selected = [
+          ...state.selectedSDIndexInJWT,
+          ...[index],
+        ];
+      }
+      emit(state.copyWith(selectedSDIndexInJWT: selected));
     }
-    emit(state.copyWith(selectedSDIndexInJWT: selected));
   }
 
   void disclosureAction({

diff --git a/...ar/credentials/present/pick/selective_disclosure/view/selective_disclosure_pick_page.dart b/...ar/credentials/present/pick/selective_disclosure/view/selective_disclosure_pick_page.dart
@@ -269,14 +269,17 @@ class _SelectiveDisclosurePickViewState
         'sd_hash': sdHash,
       };
 
-      /// sign and get token
-      final jwtToken = profileCubit.oidc4vc.generateToken(
-        payload: payload,
-        tokenParameters: tokenParameters,
-        ignoreProofHeaderType: true,
-      );
-
-      newJwt = '$newJwt$jwtToken';
+// If there no cnf in the payload, then no need to add signature
+      if (payload['cnf'] != null) {
+        /// sign and get token
+        final jwtToken = profileCubit.oidc4vc.generateToken(
+          payload: payload,
+          tokenParameters: tokenParameters,
+          ignoreProofHeaderType: true,
+        );
+
+        newJwt = '$newJwt$jwtToken';
+      }
 
       final CredentialModel newModel = widget.credentialToBePresented
           .copyWith(selectiveDisclosureJwt: newJwt);

diff --git a/lib/selective_disclosure/helper_functions/selective_disclosure_display_map.dart b/lib/selective_disclosure/helper_functions/selective_disclosure_display_map.dart
@@ -191,8 +191,16 @@ class SelectiveDisclosureDisplayMap {
     } else {
       final isCompulsary = limitDisclosure == 'required';
 
-      final bool isDisabled = isCompulsary;
-      if (!isDisabled && isPresentation && parentKeyId != null) {}
+      bool isDisabled = isCompulsary;
+      final index = SelectiveDisclosure(credentialModel)
+          .disclosureListToContent
+          .entries
+          .toList()
+          .indexWhere(
+            (entry) => entry.value.toString().contains(element.key.toString()),
+          );
+      if (index == -1) isDisabled = true;
+      // if (!isDisabled && isPresentation && parentKeyId != null) {}
       builtMap[element.key.toString()] = {
         'mapKey': element.key.toString(),
         'claimKey': element.key.toString(),
@@ -266,6 +274,15 @@ class SelectiveDisclosureDisplayMap {
           });
         }
       }
+      final indexInDisclosure = SelectiveDisclosure(credentialModel)
+          .disclosureListToContent
+          .entries
+          .toList()
+          .indexWhere(
+            (entry) => entry.value.toString().contains(claimKey),
+          );
+      if (indexInDisclosure == -1) isDisabled = true;
+
       if (!(isDisabled && isPresentation)) {
         final listElement = {
           'mapKey': mapKey,