Merge pull request #634 from /issues/633-unavailable-keystore-service

Fixed public ECIES encryptor construction
wultra · Oct 3, 2024 · c396c7a · c396c7a
2 parents e5791d6 + 5b6b965
commit c396c7a
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 1 deletion.
diff --git a/...roidTest/java/io/getlime/security/powerauth/integration/tests/StandardActivationTest.java b/...roidTest/java/io/getlime/security/powerauth/integration/tests/StandardActivationTest.java
@@ -22,6 +22,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import com.google.gson.reflect.TypeToken;
+import io.getlime.security.powerauth.core.EciesEncryptor;
 import io.getlime.security.powerauth.networking.client.JsonSerialization;
 import io.getlime.security.powerauth.networking.response.*;
 import org.junit.After;
@@ -506,4 +507,46 @@ public void onJwtSignatureFailed(@NonNull Throwable t) {
         boolean result = testHelper.getServerApi().verifyEcdsaSignature(activationHelper.getActivation().getActivationId(), jwtSignedDatasBase64, jwtSignatureBase64, "JOSE");
         assertTrue(result);
     }
+
+    @Test
+    public void testEciesEncryptors() throws Exception {
+        EciesEncryptor encryptor = AsyncHelper.await(resultCatcher -> {
+            powerAuthSDK.getEciesEncryptorForApplicationScope(new IGetEciesEncryptorListener() {
+                @Override
+                public void onGetEciesEncryptorSuccess(@NonNull EciesEncryptor encryptor) {
+                    resultCatcher.completeWithResult(encryptor);
+                }
+
+                @Override
+                public void onGetEciesEncryptorFailed(@NonNull Throwable t) {
+                    resultCatcher.completeWithError(t);
+                }
+            });
+        });
+        assertNotNull(encryptor);
+
+        // Now create activation
+        activationHelper.createStandardActivation(true, null);
+        final ActivationHelper.HelperState activationHelperState = activationHelper.getHelperState();
+
+        // Now re-instantiate PowerAuthSDK (e.g. with no-EEK in configuration)
+        testHelper = new PowerAuthTestHelper.Builder().build(true);
+        powerAuthSDK = testHelper.getSharedSdk();
+        activationHelper = new ActivationHelper(testHelper, activationHelperState);
+
+        encryptor = AsyncHelper.await(resultCatcher -> {
+            powerAuthSDK.getEciesEncryptorForApplicationScope(new IGetEciesEncryptorListener() {
+                @Override
+                public void onGetEciesEncryptorSuccess(@NonNull EciesEncryptor encryptor) {
+                    resultCatcher.completeWithResult(encryptor);
+                }
+
+                @Override
+                public void onGetEciesEncryptorFailed(@NonNull Throwable t) {
+                    resultCatcher.completeWithError(t);
+                }
+            });
+        });
+        assertNotNull(encryptor);
+    }
 }
diff --git a/proj-xcode/PowerAuth2/PowerAuthSDK.m b/proj-xcode/PowerAuth2/PowerAuthSDK.m
@@ -1544,7 +1544,7 @@ @implementation PowerAuthSDK (E2EE)
 - (id<PowerAuthOperationTask>) eciesEncryptorWithScope:(PowerAuthCoreEciesEncryptorScope)scope
                                               callback:(void (^)(PowerAuthCoreEciesEncryptor *, NSError *))callback
 {
-    return [_keystoreService createKeyForEncryptorScope:scope callback:^(NSError * error) {
+    return [[self keystoreService] createKeyForEncryptorScope:scope callback:^(NSError * error) {
         PowerAuthCoreEciesEncryptor * encryptor;
         if (!error) {
             encryptor = [self eciesEncryptorWithScope:scope error:&error];

diff --git a/proj-xcode/PowerAuth2IntegrationTests/PowerAuthSDKDefaultTests.m b/proj-xcode/PowerAuth2IntegrationTests/PowerAuthSDKDefaultTests.m
@@ -1363,4 +1363,36 @@ - (void) testJwtSignature
     XCTAssertTrue(result);
 }
 
+#pragma mark - ECIES
+
+- (void) testEncryptorCreation
+{
+    CHECK_TEST_CONFIG();
+
+    PowerAuthCoreEciesEncryptor * encryptor = [AsyncHelper synchronizeAsynchronousBlock:^(AsyncHelper *waiting) {
+        [_sdk eciesEncryptorForApplicationScopeWithCallback:^(PowerAuthCoreEciesEncryptor * _Nullable encryptor, NSError * _Nullable error) {
+            XCTAssertNil(error);
+            [waiting reportCompletion:encryptor];
+        }];
+    }];
+    XCTAssertNotNil(encryptor);
+
+    PowerAuthSdkActivation * activation = [_helper createActivation:YES];
+    if (!activation) {
+        return;
+    }
+
+    // Re-create SDK to reset internal objects
+    _sdk = [_helper reCreateSdkInstanceWithConfiguration:nil keychainConfiguration:nil clientConfiguration:nil];
+    XCTAssertTrue(_sdk.hasValidActivation);
+
+    encryptor = [AsyncHelper synchronizeAsynchronousBlock:^(AsyncHelper *waiting) {
+        [_sdk eciesEncryptorForApplicationScopeWithCallback:^(PowerAuthCoreEciesEncryptor * _Nullable encryptor, NSError * _Nullable error) {
+            XCTAssertNil(error);
+            [waiting reportCompletion:encryptor];
+        }];
+    }];
+    XCTAssertNotNil(encryptor);
+}
+
 @end