refactor: Fix and handle both ebsv3 and other formats #1826

TalaoDAO · Aug 23, 2023 · a1e967a · a1e967a
1 parent 65e886e
commit a1e967a
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 22 deletions.
diff --git a/lib/app/shared/helper_functions/helper_functions.dart b/lib/app/shared/helper_functions/helper_functions.dart
@@ -459,29 +459,28 @@ OIDC4VCType? getOIDC4VCTypeForIssuance(String url) {
 }
 
 (String, List<String>?, String?) getCredentialData({
-  required List<dynamic> credentials,
+  required dynamic credential,
   OIDC4VCType? oidc4vcType,
 }) {
-  late String credential;
-  late List<String> credentialSupported;
-  late String format;
-
-  for (final cred in credentials) {
-    if (cred is String) {
-      credential = cred;
-      if (oidc4vcType != null) {
-        credentialSupported = oidc4vcType.credentialSupported;
-        format = oidc4vcType.issuerVcType;
-      }
-    } else if (cred is Map<String, dynamic>) {
-      credentialSupported =
-          (cred['types'] as List<dynamic>).map((e) => e.toString()).toList();
-      credential = credentialSupported.last;
-      format = cred['format'].toString();
-    } else {
-      throw Exception();
+  late String cred;
+  List<String>? credentialSupported;
+  String? format;
+
+  if (credential is String) {
+    cred = credential;
+    if (oidc4vcType != null) {
+      credentialSupported = oidc4vcType.credentialSupported;
+      format = oidc4vcType.issuerVcType;
     }
+  } else if (credential is Map<String, dynamic>) {
+    credentialSupported = (credential['types'] as List<dynamic>)
+        .map((e) => e.toString())
+        .toList();
+    cred = credentialSupported.last;
+    format = credential['format'].toString();
+  } else {
+    throw Exception();
   }
 
-  return (credential, credentialSupported, format);
+  return (cred, credentialSupported, format);
 }
diff --git a/...redentials/oid4c4vc_pick/oid4c4vc_credential_pick/view/oid4c4vc_credential_pick_page.dart b/...redentials/oid4c4vc_pick/oid4c4vc_credential_pick/view/oid4c4vc_credential_pick_page.dart
@@ -91,7 +91,7 @@ class Oidc4vcCredentialPickView extends StatelessWidget {
                   credentials.length,
                   (index) {
                     final (credential, _, _) = getCredentialData(
-                      credentials: credentials,
+                      credential: credentials[index],
                     );
 
                     final CredentialSubjectType credentialSubjectType =

diff --git a/lib/dashboard/qr_code/qr_code_scan/cubit/qr_code_scan_cubit.dart b/lib/dashboard/qr_code/qr_code_scan/cubit/qr_code_scan_cubit.dart
@@ -807,7 +807,7 @@ class QRCodeScanCubit extends Cubit<QRCodeScanState> {
           emit(state.loading());
 
           final (credential, credentialSupported, format) = getCredentialData(
-            credentials: credentials,
+            credential: credentials[i],
             oidc4vcType: currentOIIDC4VCTypeForIssuance,
           );