refactor: Solved input descriptor id issue #1888

TalaoDAO · Sep 13, 2023 · 52e4ecd · 52e4ecd
1 parent 575a4fa
commit 52e4ecd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/...ar/credentials/present/pick/credential_manifest/cubit/credential_manifest_pick_cubit.dart b/...ar/credentials/present/pick/credential_manifest/cubit/credential_manifest_pick_cubit.dart
@@ -13,21 +13,24 @@ part 'credential_manifest_pick_cubit.g.dart';
 class CredentialManifestPickCubit extends Cubit<CredentialManifestPickState> {
   CredentialManifestPickCubit({
     required List<CredentialModel> credentialList,
-    required PresentationDefinition presentationDefinition,
+    required CredentialModel credential,
     required int inputDescriptorIndex,
   }) : super(const CredentialManifestPickState(filteredCredentialList: [])) {
     filterList(
       credentialList: credentialList,
-      presentationDefinition: presentationDefinition,
+      credential: credential,
       inputDescriptorIndex: inputDescriptorIndex,
     );
   }
 
   void filterList({
     required List<CredentialModel> credentialList,
-    required PresentationDefinition presentationDefinition,
+    required CredentialModel credential,
     required int inputDescriptorIndex,
   }) {
+    var presentationDefinition =
+        credential.credentialManifest!.presentationDefinition!;
+
     if (presentationDefinition.submissionRequirements != null) {
       /// https://identity.foundation/presentation-exchange/#presentation-definition-extensions
       final inputDescriptors = List.of(presentationDefinition.inputDescriptors);
@@ -70,7 +73,10 @@ class CredentialManifestPickCubit extends Cubit<CredentialManifestPickState> {
         }
       }
 
-      presentationDefinition.inputDescriptors = newInputDescriptor;
+      presentationDefinition = PresentationDefinition.copyWithData(
+        oldPresentationDefinition: presentationDefinition,
+        inputDescriptors: newInputDescriptor,
+      );
     }
 
     /// Get instruction to filter credentials of the wallet

diff --git a/...present/pick/credential_manifest/view/credential_manifest_credential_offer_pick_page.dart b/...present/pick/credential_manifest/view/credential_manifest_credential_offer_pick_page.dart
@@ -48,10 +48,8 @@ class CredentialManifestOfferPickPage extends StatelessWidget {
   Widget build(BuildContext context) {
     return BlocProvider(
       create: (context) {
-        final presentationDefinition =
-            credential.credentialManifest!.presentationDefinition!;
         return CredentialManifestPickCubit(
-          presentationDefinition: presentationDefinition,
+          credential: credential,
           credentialList: context.read<CredentialsCubit>().state.credentials,
           inputDescriptorIndex: inputDescriptorIndex,
         );

diff --git a/packages/credential_manifest/lib/src/models/presentation_definition.dart b/packages/credential_manifest/lib/src/models/presentation_definition.dart
@@ -19,6 +19,19 @@ class PresentationDefinition {
   factory PresentationDefinition.fromJson(Map<String, dynamic> json) =>
       _$PresentationDefinitionFromJson(json);
 
+  factory PresentationDefinition.copyWithData({
+    required PresentationDefinition oldPresentationDefinition,
+    required List<InputDescriptor> inputDescriptors,
+  }) {
+    return PresentationDefinition(
+      inputDescriptors: inputDescriptors,
+      id: oldPresentationDefinition.id,
+      name: oldPresentationDefinition.name,
+      purpose: oldPresentationDefinition.purpose,
+      submissionRequirements: oldPresentationDefinition.submissionRequirements,
+    );
+  }
+
   final String? id;
   @JsonKey(name: 'input_descriptors')
   List<InputDescriptor> inputDescriptors;