Merge pull request #1192 from atsign-foundation/update_atclient_depen…

…dencies fix: at_commons 4.0.0 uptake in at_Client
atsign-foundation · Jan 16, 2024 · 4d67c5b · 4d67c5b
2 parents 8393445 + 03e9ab0
commit 4d67c5b
Show file tree

Hide file tree

Showing 52 changed files with 505 additions and 534 deletions.
diff --git a/melos.yaml b/melos.yaml
@@ -1,7 +1,6 @@
 name: at_client_sdk
 
 packages:
-  - packages/*
+  - packages/at_client_mobile
   - packages/*/example
-
   - tests/*
diff --git a/packages/at_client/CHANGELOG.md b/packages/at_client/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 3.0.73
+- build[deps]: Upgraded dependencies for the following packages:
+    - at_commons to v4.0.0
+    - at_utils to v3.0.16
+    - at_lookup to v3.0.44
+    - at_chops to v1.0.7
+    - at_persistence_secondary_server to v3.0.60
 ## 3.0.72
 - chore: Minor change to allow us to support dart 
   versions both before and after 3.2.0 specifically for this

diff --git a/packages/at_client/lib/src/at_collection/impl/collection_methods_impl.dart b/packages/at_client/lib/src/at_collection/impl/collection_methods_impl.dart
@@ -41,7 +41,7 @@ class AtCollectionMethodImpl {
     _logger.finest('Self key to be used : $atKey');
     var atOperationItemStatus = AtOperationItemStatus(
         atSign: atKey.sharedBy ?? '',
-        key: atKey.key ?? '',
+        key: atKey.key,
         complete: false,
         operation: Operation.save);
     try {
@@ -76,7 +76,7 @@ class AtCollectionMethodImpl {
       _logger.finest('Update shared key $sharedKey');
       var atOperationItemStatus = AtOperationItemStatus(
           atSign: sharedKey.sharedWith ?? '',
-          key: sharedKey.key ?? '',
+          key: sharedKey.key,
           complete: false,
           operation: Operation.share);
       try {
@@ -133,7 +133,7 @@ class AtCollectionMethodImpl {
 
       var atOperationItemStatus = AtOperationItemStatus(
           atSign: atSign,
-          key: selfKey.key ?? '',
+          key: selfKey.key,
           complete: false,
           operation: Operation.share);
 
@@ -164,7 +164,7 @@ class AtCollectionMethodImpl {
 
     yield AtOperationItemStatus(
         atSign: selfAtKey.sharedWith ?? '',
-        key: selfAtKey.key ?? '',
+        key: selfAtKey.key,
         complete: isSelfKeyDeleted,
         operation: Operation.delete);
   }
@@ -192,7 +192,7 @@ class AtCollectionMethodImpl {
     for (var sharedKey in sharedAtKeys) {
       var atOperationItemStatus = AtOperationItemStatus(
           atSign: sharedKey.sharedWith ?? '',
-          key: sharedKey.key ?? '',
+          key: sharedKey.key,
           complete: false,
           operation: Operation.unshare);
 

diff --git a/packages/at_client/lib/src/at_collection/impl/default_key_maker.dart b/packages/at_client/lib/src/at_collection/impl/default_key_maker.dart
@@ -16,9 +16,9 @@ class DefaultKeyMaker implements KeyMaker {
     return AtKey()
       ..key = '$keyId.$collectionName.atcollectionmodel.$namespace'
       ..metadata = Metadata()
-      ..metadata!.ccd = objectLifeCycleOptions?.cascadeDelete ?? true
-      ..metadata!.ttl = objectLifeCycleOptions?.timeToLive?.inMilliseconds
-      ..metadata!.ttb = objectLifeCycleOptions?.timeToBirth?.inMilliseconds
+      ..metadata.ccd = objectLifeCycleOptions?.cascadeDelete ?? true
+      ..metadata.ttl = objectLifeCycleOptions?.timeToLive?.inMilliseconds
+      ..metadata.ttb = objectLifeCycleOptions?.timeToBirth?.inMilliseconds
       ..sharedBy = _getAtClient().getCurrentAtSign();
   }
 
@@ -36,10 +36,10 @@ class DefaultKeyMaker implements KeyMaker {
       ..key = '$keyId.$collectionName.atcollectionmodel.$namespace'
       ..sharedWith = sharedWith
       ..metadata = Metadata()
-      ..metadata!.ttr = ttrInSeconds ?? -1
-      ..metadata!.ccd = objectLifeCycleOptions?.cascadeDelete ?? true
-      ..metadata!.ttl = objectLifeCycleOptions?.timeToLive?.inMilliseconds
-      ..metadata!.ttb = objectLifeCycleOptions?.timeToBirth?.inMilliseconds
+      ..metadata.ttr = ttrInSeconds ?? -1
+      ..metadata.ccd = objectLifeCycleOptions?.cascadeDelete ?? true
+      ..metadata.ttl = objectLifeCycleOptions?.timeToLive?.inMilliseconds
+      ..metadata.ttb = objectLifeCycleOptions?.timeToBirth?.inMilliseconds
       ..sharedBy = _getAtClient().getCurrentAtSign();
   }
 }
diff --git a/packages/at_client/lib/src/client/at_client_impl.dart b/packages/at_client/lib/src/client/at_client_impl.dart
@@ -294,23 +294,13 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
 
   Future<bool> _delete(AtKey atKey,
       {DeleteRequestOptions? deleteRequestOptions}) async {
-    // If metadata is null, initialize metadata
-    atKey.metadata ??= Metadata();
-    String keyWithNamespace;
-    if (atKey.metadata!.namespaceAware) {
-      keyWithNamespace = AtClientUtil.getKeyWithNameSpace(atKey, _preference!);
-    } else {
-      keyWithNamespace = atKey.key!;
-    }
     atKey.sharedBy ??= _atSign;
-    var builder = DeleteVerbBuilder()
-      ..isLocal = atKey.isLocal
-      ..isCached = atKey.metadata!.isCached
-      ..isPublic =
-          (atKey.metadata!.isPublic == null) ? false : atKey.metadata!.isPublic!
-      ..sharedWith = atKey.sharedWith
-      ..atKey = keyWithNamespace
-      ..sharedBy = atKey.sharedBy;
+    // When namespace is not set in AtKey.namespace, default it to namespace from
+    // AtClientPreferences
+    if (atKey.metadata.namespaceAware) {
+      atKey.namespace ??= preference?.namespace;
+    }
+    var builder = DeleteVerbBuilder()..atKey = atKey;
     var secondary = getSecondary();
     if (deleteRequestOptions != null &&
         deleteRequestOptions.useRemoteAtServer) {
@@ -441,10 +431,8 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
   Future<AtResponse> putText(AtKey atKey, String value,
       {PutRequestOptions? putRequestOptions}) async {
     try {
-      // Set the default metadata if not already set.
-      atKey.metadata ??= Metadata();
       // Setting metadata.isBinary to false for putText
-      atKey.metadata!.isBinary = false;
+      atKey.metadata.isBinary = false;
       return await _putInternal(atKey, value, putRequestOptions);
     } on AtException catch (e) {
       throw AtExceptionManager.createException(e);
@@ -456,10 +444,8 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
   Future<AtResponse> putBinary(AtKey atKey, List<int> value,
       {PutRequestOptions? putRequestOptions}) async {
     try {
-      // Set the default metadata if not already set.
-      atKey.metadata ??= Metadata();
       // Setting metadata.isBinary to true for putBinary
-      atKey.metadata!.isBinary = true;
+      atKey.metadata.isBinary = true;
       // Base2e15.encode method converts the List<int> type to String.
       return await _putInternal(
           atKey, Base2e15.encode(value), putRequestOptions);
@@ -470,7 +456,7 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
 
   @visibleForTesting
   ensureLowerCase(AtKey atKey) {
-    if ((atKey.key != null && upperCaseRegex.hasMatch(atKey.key!)) ||
+    if (upperCaseRegex.hasMatch(atKey.key) ||
         (atKey.namespace != null &&
             upperCaseRegex.hasMatch(atKey.namespace!))) {
       _logger.finer('AtKey: ${atKey.toString()} previously contained upper case'
@@ -487,12 +473,12 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
     if (atKey.sharedBy.isNull) {
       atKey.sharedBy = _atSign;
     }
-    if (atKey.metadata!.namespaceAware) {
+    if (atKey.metadata.namespaceAware) {
       atKey.namespace ??= preference?.namespace;
     }
 
     if (preference!.atProtocolEmitted >= Version(2, 0, 0)) {
-      atKey.metadata!.ivNonce ??= EncryptionUtil.generateIV();
+      atKey.metadata.ivNonce ??= EncryptionUtil.generateIV();
     }
     ensureLowerCase(atKey);
 
@@ -521,7 +507,7 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
 
     //Get encryptionPrivateKey for public key to signData
     String? encryptionPrivateKey;
-    if (atKey.metadata!.isPublic != null && atKey.metadata!.isPublic! == true) {
+    if (atKey.metadata.isPublic == true) {
       encryptionPrivateKey = await _localSecondary?.getEncryptionPrivateKey();
     }
     // Transform put request
@@ -543,7 +529,7 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
     }
     // Execute the verb builder
     var putResponse = await secondary.executeVerb(verbBuilder,
-        sync: SyncUtil.shouldSync(atKey.key!));
+        sync: SyncUtil.shouldSync(atKey.key));
     // If putResponse is null or empty, return AtResponse with isError set to true
     if (putResponse == null || putResponse.isEmpty) {
       return AtResponse()..isError = true;
@@ -579,27 +565,17 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
   @override
   Future<bool> putMeta(AtKey atKey) async {
     var updateKey = atKey.key;
-    var metadata = atKey.metadata!;
+    var metadata = atKey.metadata;
     if (metadata.namespaceAware) {
-      updateKey = _getKeyWithNamespace(atKey.key!);
+      updateKey = _getKeyWithNamespace(atKey.key);
     }
-    var sharedWith = atKey.sharedWith;
     var builder = UpdateVerbBuilder();
     builder
-      ..atKey = updateKey
-      ..sharedBy = _atSign
-      ..sharedWith = sharedWith
-      ..ttl = metadata.ttl
-      ..ttb = metadata.ttb
-      ..ttr = metadata.ttr
-      ..ccd = metadata.ccd
-      ..isBinary = metadata.isBinary
-      ..isEncrypted = metadata.isEncrypted
-      ..dataSignature = metadata.dataSignature
+      ..atKey = atKey
       ..operation = AtConstants.updateMeta;
 
     var updateMetaResult = await getSecondary()
-        .executeVerb(builder, sync: SyncUtil.shouldSync(updateKey!));
+        .executeVerb(builder, sync: SyncUtil.shouldSync(updateKey));
     return updateMetaResult != null;
   }
 
@@ -768,9 +744,9 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
           ..key = key
           ..sharedWith = sharedWithAtSign
           ..metadata = Metadata()
-          ..metadata!.ttr = -1
+          ..metadata.ttr = -1
           // file transfer key will be deleted after 30 days
-          ..metadata!.ttl = 2592000000
+          ..metadata.ttl = 2592000000
           ..sharedBy = _atSign;
 
         var notificationResult = await notificationService.notify(
@@ -949,7 +925,7 @@ class AtClientImpl implements AtClient, AtSignChangeListener {
       PriorityEnum? priority,
       StrategyEnum? strategy,
       int? latestN,
-      String? notifier = SYSTEM,
+      String? notifier = AtConstants.system,
       bool isDedicated = false}) async {
     AtKeyValidators.get().validate(
         atKey.toString(),

diff --git a/packages/at_client/lib/src/client/local_secondary.dart b/packages/at_client/lib/src/client/local_secondary.dart
@@ -69,46 +69,15 @@ class LocalSecondary implements Secondary {
       var updateKey = builder.buildKey();
       switch (builder.operation) {
         case AtConstants.updateMeta:
-          var metadata = Metadata();
-          metadata
-            ..ttl = builder.ttl
-            ..ttb = builder.ttb
-            ..ttr = builder.ttr
-            ..ccd = builder.ccd
-            ..isBinary = builder.isBinary
-            ..isEncrypted = builder.isEncrypted
-            ..sharedKeyEnc = builder.sharedKeyEncrypted
-            ..pubKeyCS = builder.pubKeyChecksum
-            ..encoding = builder.encoding
-            ..encKeyName = builder.encKeyName
-            ..encAlgo = builder.encAlgo
-            ..ivNonce = builder.ivNonce
-            ..skeEncKeyName = builder.skeEncKeyName
-            ..skeEncAlgo = builder.skeEncAlgo;
-          var atMetadata = AtMetaData.fromCommonsMetadata(metadata);
+          var atMetadata =
+              AtMetaData.fromCommonsMetadata(builder.atKey.metadata);
           updateResult = await keyStore!.putMeta(updateKey, atMetadata);
           break;
         default:
           var atData = AtData();
           atData.data = builder.value;
-          var metadata = Metadata();
-          metadata
-            ..ttl = builder.ttl
-            ..ttb = builder.ttb
-            ..ttr = builder.ttr
-            ..ccd = builder.ccd
-            ..isBinary = builder.isBinary
-            ..isEncrypted = builder.isEncrypted
-            ..dataSignature = builder.dataSignature
-            ..sharedKeyEnc = builder.sharedKeyEncrypted
-            ..pubKeyCS = builder.pubKeyChecksum
-            ..encoding = builder.encoding
-            ..encKeyName = builder.encKeyName
-            ..encAlgo = builder.encAlgo
-            ..ivNonce = builder.ivNonce
-            ..skeEncKeyName = builder.skeEncKeyName
-            ..skeEncAlgo = builder.skeEncAlgo;
-          var atMetadata = AtMetaData.fromCommonsMetadata(metadata);
+          var atMetadata =
+              AtMetaData.fromCommonsMetadata(builder.atKey.metadata);
           updateResult = await keyStore!.putAll(updateKey, atData, atMetadata);
           break;
       }

diff --git a/packages/at_client/lib/src/client/verb_builder_manager.dart b/packages/at_client/lib/src/client/verb_builder_manager.dart
@@ -10,12 +10,11 @@ class LookUpBuilderManager {
       {GetRequestOptions? getRequestOptions}) {
     // If isPublic is true in metadata, the key is a public key, return PLookupVerbHandler.
     if (atKey.sharedBy != currentAtSign &&
-        (atKey.metadata != null &&
-            atKey.metadata!.isPublic! &&
-            !atKey.metadata!.isCached)) {
+        (atKey.metadata.isPublic && !atKey.metadata.isCached)) {
       final plookUpVerbBuilder = PLookupVerbBuilder()
-        ..atKey = AtClientUtil.getKeyWithNameSpace(atKey, atClientPreference)
-        ..sharedBy = AtClientUtil.fixAtSign(atKey.sharedBy)
+        ..atKey = (AtKey()
+          ..key = AtClientUtil.getKeyWithNameSpace(atKey, atClientPreference)
+          ..sharedBy = AtClientUtil.fixAtSign(atKey.sharedBy))
         ..operation = 'all';
       if (getRequestOptions != null && getRequestOptions.bypassCache == true) {
         plookUpVerbBuilder.bypassCache = true;
@@ -24,12 +23,11 @@ class LookUpBuilderManager {
     }
     // If sharedBy is not equal to currentAtSign and isCached is false, return LookupVerbHandler
     if (atKey.sharedBy != currentAtSign &&
-        (atKey.metadata != null &&
-            !atKey.metadata!.isCached &&
-            !atKey.metadata!.isPublic!)) {
+        (!atKey.metadata.isCached && !atKey.metadata.isPublic)) {
       final lookupVerbBuilder = LookupVerbBuilder()
-        ..atKey = AtClientUtil.getKeyWithNameSpace(atKey, atClientPreference)
-        ..sharedBy = AtClientUtil.fixAtSign(atKey.sharedBy)
+        ..atKey = (AtKey()
+          ..key = AtClientUtil.getKeyWithNameSpace(atKey, atClientPreference)
+          ..sharedBy = AtClientUtil.fixAtSign(atKey.sharedBy))
         ..auth = true
         ..operation = 'all';
       if (getRequestOptions != null && getRequestOptions.bypassCache == true) {
@@ -38,16 +36,14 @@ class LookUpBuilderManager {
       return lookupVerbBuilder;
     }
     return LLookupVerbBuilder()
-      ..atKey = AtClientUtil.getKeyWithNameSpace(atKey, atClientPreference)
-      ..sharedBy = AtClientUtil.fixAtSign(atKey.sharedBy)
-      ..sharedWith = AtClientUtil.fixAtSign(atKey.sharedWith)
-      ..isPublic = (atKey.metadata != null && atKey.metadata?.isPublic != null)
-          ? atKey.metadata!.isPublic!
-          : false
-      ..isCached = (atKey.metadata != null && atKey.metadata?.isCached != null)
-          ? atKey.metadata!.isCached
-          : false
-      ..isLocal = atKey.isLocal
+      ..atKey = (AtKey()
+        ..key = AtClientUtil.getKeyWithNameSpace(atKey, atClientPreference)
+        ..sharedBy = AtClientUtil.fixAtSign(atKey.sharedBy)
+        ..sharedWith = AtClientUtil.fixAtSign(atKey.sharedWith)
+        ..metadata = (Metadata()
+          ..isPublic = atKey.metadata.isPublic
+          ..isCached = atKey.metadata.isCached)
+        ..isLocal = atKey.isLocal)
       ..operation = 'all';
   }
 }

diff --git a/packages/at_client/lib/src/decryption_service/decryption_manager.dart b/packages/at_client/lib/src/decryption_service/decryption_manager.dart
@@ -21,7 +21,7 @@ class AtKeyDecryptionManager {
     // Eg: currentAtSign is @bob and _phone.wavi@bob (or) phone@bob (or) @bob:phone@bob
     if (((atKey.sharedWith == null || atKey.sharedWith == currentAtSign) &&
             atKey.sharedBy == currentAtSign) ||
-        atKey.key!.startsWith('_')) {
+        atKey.key.startsWith('_')) {
       return SelfKeyDecryption(_atClient);
     }
     // Returns LocalKeyDecryption to for the keys present in local storage

diff --git a/packages/at_client/lib/src/decryption_service/local_key_decryption.dart b/packages/at_client/lib/src/decryption_service/local_key_decryption.dart
@@ -35,8 +35,8 @@ class LocalKeyDecryption extends AbstractAtKeyEncryption
           exceptionScenario: ExceptionScenario.fetchEncryptionKeys);
     }
     InitialisationVector iV;
-    if (atKey.metadata?.ivNonce != null) {
-      iV = AtChopsUtil.generateIVFromBase64String(atKey.metadata!.ivNonce!);
+    if (atKey.metadata.ivNonce != null) {
+      iV = AtChopsUtil.generateIVFromBase64String(atKey.metadata.ivNonce!);
     } else {
       iV = AtChopsUtil.generateIVLegacy();
     }

diff --git a/packages/at_client/lib/src/decryption_service/self_key_decryption.dart b/packages/at_client/lib/src/decryption_service/self_key_decryption.dart
@@ -36,8 +36,8 @@ class SelfKeyDecryption implements AtKeyDecryption {
     }
 
     InitialisationVector iV;
-    if (atKey.metadata?.ivNonce != null) {
-      iV = AtChopsUtil.generateIVFromBase64String(atKey.metadata!.ivNonce!);
+    if (atKey.metadata.ivNonce != null) {
+      iV = AtChopsUtil.generateIVFromBase64String(atKey.metadata.ivNonce!);
     } else {
       iV = AtChopsUtil.generateIVLegacy();
     }