From eeb051756aaa00e4b063a3da061e7700600afcfb Mon Sep 17 00:00:00 2001
From: Bibash Shrestha <bibashshrestha@gmail.com>
Date: Wed, 23 Aug 2023 16:39:13 +0545
Subject: [PATCH] refactor: Bug fix for ebsiV3 card issuance

---
 lib/oidc4vc/add_oidc4vc_credential.dart               | 9 +++++----
 lib/oidc4vc/initiate_oidv4vc_credential_issuance.dart | 1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/oidc4vc/add_oidc4vc_credential.dart b/lib/oidc4vc/add_oidc4vc_credential.dart
index e87a4fb5c..5258ca4b9 100644
--- a/lib/oidc4vc/add_oidc4vc_credential.dart
+++ b/lib/oidc4vc/add_oidc4vc_credential.dart
@@ -12,13 +12,14 @@ Future<void> addOIDC4VCCredential({
   required dynamic encodedCredentialFromOIDC4VC,
   required Uri uri,
   required CredentialsCubit credentialsCubit,
-  required OIDC4VCType oidc4vcType,
   required String issuer,
+  required OIDC4VCType oidc4vcType,
   required String credentialType,
   required bool isLastCall,
+  required String format,
 }) async {
   late Map<String, dynamic> credentialFromOIDC4VC;
-  if (oidc4vcType.issuerVcType == 'jwt_vc') {
+  if (format == 'jwt_vc') {
     //jwt_vc_json
     final jws = JsonWebSignature.fromCompactSerialization(
       encodedCredentialFromOIDC4VC['credential'] as String,
@@ -26,7 +27,7 @@ Future<void> addOIDC4VCCredential({
 
     credentialFromOIDC4VC =
         jws.unverifiedPayload.jsonContent['vc'] as Map<String, dynamic>;
-  } else if (oidc4vcType.issuerVcType == 'ldp_vc') {
+  } else if (format == 'ldp_vc') {
     //ldp_vc
 
     final data = encodedCredentialFromOIDC4VC['credential'];
@@ -42,7 +43,7 @@ Future<void> addOIDC4VCCredential({
   final Map<String, dynamic> newCredential =
       Map<String, dynamic>.from(credentialFromOIDC4VC);
 
-  if (oidc4vcType.issuerVcType == 'jwt_vc') {
+  if (format == 'jwt_vc') {
     //jwt_vc_json
     newCredential['jwt'] = encodedCredentialFromOIDC4VC['credential'];
   }
diff --git a/lib/oidc4vc/initiate_oidv4vc_credential_issuance.dart b/lib/oidc4vc/initiate_oidv4vc_credential_issuance.dart
index 77c194c0f..5a1f10e97 100644
--- a/lib/oidc4vc/initiate_oidv4vc_credential_issuance.dart
+++ b/lib/oidc4vc/initiate_oidv4vc_credential_issuance.dart
@@ -151,6 +151,7 @@ Future<void> getAndAddCredential({
       issuer: issuer,
       credentialType: credentialType,
       isLastCall: isLastCall,
+      format: format,
     );
   } else {
     final Uri ebsiAuthenticationUri =