v2.3.4

velocitycareerlabs · Mar 5, 2024 · d913df0 · d913df0
1 parent a02bf64
commit d913df0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/VCL/build.gradle b/VCL/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 33
-        versionName "2.3.3"
-        versionCode 133
+        versionName "2.3.4"
+        versionCode 134
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

diff --git a/VCL/src/main/java/io/velocitycareerlabs/impl/data/verifiers/CredentialIssuerVerifierImpl.kt b/VCL/src/main/java/io/velocitycareerlabs/impl/data/verifiers/CredentialIssuerVerifierImpl.kt
@@ -289,15 +289,18 @@ internal class CredentialIssuerVerifierImpl(
             val allFutures = CompletableFuture.allOf(*completableFutures.toTypedArray())
             allFutures.join()
 
-            if (isCredentialVerified)
-                completionBlock(VCLResult.Success(true))
-            else
-                completionBlock(
-                    VCLResult.Failure(
-                        globalError
-                            ?: VCLError(errorCode = VCLErrorCode.IssuerUnexpectedPermissionFailure.value)
+            globalError?.let {
+                completionBlock(VCLResult.Failure(it))
+            } ?: run {
+                if (isCredentialVerified) {
+                    completionBlock(VCLResult.Success(true))
+                } else {
+                    completionBlock(
+                        VCLResult.Failure(VCLError(errorCode = VCLErrorCode.IssuerUnexpectedPermissionFailure.value))
                     )
-                )
+                }
+            }
+
         } ?: run {
             onError(
                 VCLError(errorCode = VCLErrorCode.InvalidCredentialSubjectType.value),

diff --git a/VCL/src/test/java/io/velocitycareerlabs/verifiers/CredentialIssuerVerifierTest.kt b/VCL/src/test/java/io/velocitycareerlabs/verifiers/CredentialIssuerVerifierTest.kt
@@ -19,7 +19,6 @@ import io.velocitycareerlabs.impl.data.verifiers.CredentialIssuerVerifierImpl
 import io.velocitycareerlabs.impl.domain.verifiers.CredentialIssuerVerifier
 import io.velocitycareerlabs.impl.extensions.toJsonObject
 import io.velocitycareerlabs.impl.extensions.toJwtList
-import io.velocitycareerlabs.impl.utils.VCLLog
 import io.velocitycareerlabs.infrastructure.network.NetworkServiceSuccess
 import io.velocitycareerlabs.infrastructure.resources.CredentialTypesModelMock
 import io.velocitycareerlabs.infrastructure.resources.valid.CredentialManifestMocks