Merge branch 'trunk' into enroll_list_client

atsign-foundation · Jan 24, 2024 · 8f1b820 · 8f1b820
2 parents 8a17438 + be4d88c
commit 8f1b820
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 10 deletions.
diff --git a/melos.yaml b/melos.yaml
@@ -2,5 +2,8 @@ name: at_client_sdk
 
 packages:
   - packages/at_client_mobile
-  - packages/*/example
   - tests/*
+
+command:
+  bootstrap:
+    runPubGetInParallel: false
diff --git a/packages/at_client/CHANGELOG.md b/packages/at_client/CHANGELOG.md
@@ -1,4 +1,8 @@
-# 3.0.73
+## 3.0.74
+- build[deps]: Upgraded dependencies for the following packages:
+  - at_chops to v2.0.0
+  - at_lookup to v3.0.45
+## 3.0.73
 - build[deps]: Upgraded dependencies for the following packages:
     - at_commons to v4.0.0
     - at_utils to v3.0.16

diff --git a/packages/at_client/lib/src/encryption_service/abstract_atkey_encryption.dart b/packages/at_client/lib/src/encryption_service/abstract_atkey_encryption.dart
@@ -209,14 +209,18 @@ abstract class AbstractAtKeyEncryption implements AtKeyEncryption {
     }
 
     ///         (ii) Encrypt the symmetric key with their public key
-    theirEncryptedCopy =
-        EncryptionUtil.encryptKey(symmetricKeyBase64, sharedWithPublicKey);
+    var rsaEncryptionAlgo = RsaEncryptionAlgo();
+    rsaEncryptionAlgo.atPublicKey = AtPublicKey.fromString(sharedWithPublicKey);
+    var encryptionResult = _atClient.atChops!.encryptString(
+        symmetricKeyBase64, EncryptionKeyType.rsa2048,
+        encryptionAlgorithm: rsaEncryptionAlgo);
+    theirEncryptedCopy = encryptionResult.result;
 
     ///   - (b) save encrypted copy to atServer
     _logger.info(
         "Saving 'their' copy of shared symmetric key for ${atKey.sharedWith} to atServer");
     await storeTheirCopyOfEncryptedSharedKeyToSecondary(
-        atKey, theirEncryptedCopy,
+        atKey, theirEncryptedCopy!,
         secondary: _atClient.getRemoteSecondary()!);
 
     ///   - (c) save encrypted copy to local storage and return

diff --git a/packages/at_client/lib/src/preference/at_client_config.dart b/packages/at_client/lib/src/preference/at_client_config.dart
@@ -10,7 +10,7 @@ class AtClientConfig {
 
   /// Represents the at_client version.
   /// Must always be the same as the actual version in pubspec.yaml
-  final String atClientVersion = '3.0.73';
+  final String atClientVersion = '3.0.74';
 
   /// Represents the client commit log compaction time interval
   ///

diff --git a/packages/at_client/pubspec.yaml b/packages/at_client/pubspec.yaml
@@ -4,7 +4,7 @@ description: The at_client library is the non-platform specific Client SDK which
 ##
 ##
 ## NB: When incrementing the version, please also increment the version in AtClientConfig file
-version: 3.0.73
+version: 3.0.74
 ## NB: When incrementing the version, please also increment the version in AtClientConfig file
 ##
 
@@ -33,8 +33,8 @@ dependencies:
   at_base2e15: ^1.0.0
   at_commons: ^4.0.0
   at_utils: ^3.0.16
-  at_chops: ^1.0.7
-  at_lookup: ^3.0.44
+  at_chops: ^2.0.0
+  at_lookup: ^3.0.45
   at_persistence_spec: ^2.0.14
   at_persistence_secondary_server: ^3.0.60
   meta: ^1.8.0

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -4,4 +4,4 @@ environment:
   sdk: ">=2.18.0 <4.0.0"
 
 dev_dependencies:
-  melos: ^3.0.1
+  melos: ^4.0.0