Merge branch 'trunk' into sync_builder_remove_deprecated_params

atsign-foundation · Dec 12, 2024 · 8585b18 · 8585b18
2 parents 15d68c5 + 8252529
commit 8585b18
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/tests/at_end2end_test/test/enrollment_setup.dart b/tests/at_end2end_test/test/enrollment_setup.dart
@@ -191,6 +191,7 @@ Future<String> getDefaultEncryptionPrivateKey(
   var privateKeyCommand =
       'keys:get:keyName:$enrollmentIdFromServer.${AtConstants.defaultEncryptionPrivateKey}.__manage$atSign';
   String encryptionPrivateKeyFromServer;
+  String encryptionPrivateKeyIV;
   try {
     var getPrivateKeyResult =
         await atLookUp.executeCommand('$privateKeyCommand\n', auth: true);
@@ -200,13 +201,15 @@ Future<String> getDefaultEncryptionPrivateKey(
     getPrivateKeyResult = getPrivateKeyResult.replaceFirst('data:', '');
     var privateKeyResultJson = jsonDecode(getPrivateKeyResult);
     encryptionPrivateKeyFromServer = privateKeyResultJson['value'];
+    encryptionPrivateKeyIV = privateKeyResultJson['iv'];
   } on Exception catch (e) {
     throw AtEnrollmentException(
         'Exception while getting encrypted private key/self key from server: $e');
   }
   AtEncryptionResult? atEncryptionResult = atLookUp.atChops?.decryptString(
       encryptionPrivateKeyFromServer, EncryptionKeyType.aes256,
-      keyName: 'apkamSymmetricKey', iv: AtChopsUtil.generateIVLegacy());
+      keyName: 'apkamSymmetricKey',
+      iv: AtChopsUtil.generateIVFromBase64String(encryptionPrivateKeyIV));
   return atEncryptionResult?.result;
 }
 
@@ -218,6 +221,7 @@ Future<String> getDefaultSelfEncryptionKey(
   var selfEncryptionKeyCommand =
       'keys:get:keyName:$enrollmentIdFromServer.${AtConstants.defaultSelfEncryptionKey}.__manage$atSign';
   String selfEncryptionKeyFromServer;
+  String selfEncryptionKeyIV;
   try {
     String? encryptedSelfEncryptionKey = await atLookUp
         .executeCommand('$selfEncryptionKeyCommand\n', auth: true);
@@ -230,12 +234,14 @@ Future<String> getDefaultSelfEncryptionKey(
         encryptedSelfEncryptionKey.replaceFirst('data:', '');
     var selfEncryptionKeyResultJson = jsonDecode(encryptedSelfEncryptionKey);
     selfEncryptionKeyFromServer = selfEncryptionKeyResultJson['value'];
+    selfEncryptionKeyIV = selfEncryptionKeyResultJson['iv'];
   } on Exception catch (e) {
     throw AtEnrollmentException(
         'Exception while getting encrypted private key/self key from server: $e');
   }
   AtEncryptionResult? atEncryptionResult = atLookUp.atChops?.decryptString(
       selfEncryptionKeyFromServer, EncryptionKeyType.aes256,
-      keyName: 'apkamSymmetricKey', iv: AtChopsUtil.generateIVLegacy());
+      keyName: 'apkamSymmetricKey',
+      iv: AtChopsUtil.generateIVFromBase64String(selfEncryptionKeyIV));
   return atEncryptionResult?.result;
 }