fix: Monitor/sync bug while using at_chops with pkam from secure element

packages/at_client/CHANGELOG.md

@@ -1,3 +1,5 @@
+## 3.0.61
+- fix: Sync/Monitor bug while running onboarding_cli with at_chops using pkam from secure element
 ## 3.0.60
 - feat: Add `useRemoteAtServer` to PutRequestOptions. When set, the update
   request will be sent directly to the remote atServer

packages/at_client/lib/src/client/remote_secondary.dart

@@ -44,7 +44,10 @@ class RemoteSecondary implements Secondary {
             AtClientManager.getInstance().secondaryAddressFinder,
         secureSocketConfig: secureSocketConfig,
         clientConfig: _getClientConfig());
-
+    logger.finer(
+        'signingAlgoType: ${preference.signingAlgoType} hashingAlgoType: ${preference.hashingAlgoType}');
+    atLookUp.signingAlgoType = preference.signingAlgoType;
+    atLookUp.hashingAlgoType = preference.hashingAlgoType;
     atLookUp.atChops = atChops;
   }
 

packages/at_client/lib/src/manager/monitor.dart

@@ -268,11 +268,15 @@ class Monitor {
         'Authenticating the monitor connection: from result:$fromResponse');
     if (_preference.useAtChops) {
       _logger.finer('Using AtChops to do the PKAM signing');
-      var signingResult =
-          // ignore: deprecated_member_use
-          atChops!.signString(fromResponse, SigningKeyType.pkamSha256);
-      _logger.finer('Sending command pkam:${signingResult.result}');
-      await _monitorConnection!.write('pkam:${signingResult.result}\n');
+      final atSigningInput = AtSigningInput(fromResponse)
+        ..signingAlgoType = _preference.signingAlgoType
+        ..hashingAlgoType = _preference.hashingAlgoType
+        ..signingMode = AtSigningMode.pkam;
+      var signingResult = atChops!.sign(atSigningInput);
+      var pkamCommand =
+          'pkam:signingAlgo:${_preference.signingAlgoType.name}:hashingAlgo:${_preference.hashingAlgoType.name}:${signingResult.result}\n';
+      _logger.finer('Sending command $pkamCommand');
+      await _monitorConnection!.write(pkamCommand);
     } else {
       var key = RSAPrivateKey.fromString(_preference.privateKey!);
       var sha256signature =

packages/at_client/lib/src/preference/at_client_preference.dart

@@ -1,3 +1,4 @@
+import 'package:at_chops/at_chops.dart';
 import 'package:at_client/at_client.dart';
 import 'package:at_client/src/preference/at_client_particulars.dart';
 import 'package:meta/meta.dart';
@@ -104,6 +105,12 @@ class AtClientPreference {
 
   @experimental
   AtClientParticulars atClientParticulars = AtClientParticulars();
+
+  //signing algorithm to use for pkam authentication
+  SigningAlgoType signingAlgoType = SigningAlgoType.rsa2048;
+
+  //hashing algorithm to use for pkam authentication
+  HashingAlgoType hashingAlgoType = HashingAlgoType.sha256;
 }
 
 @Deprecated("Use SyncService")

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.60
+version: 3.0.61
 ## NB: When incrementing the version, please also increment the version in AtClientConfig file
 ##
 

packages/at_client/test/monitor_test.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
 
+import 'package:at_chops/at_chops.dart';
 import 'package:at_client/at_client.dart';
 import 'package:at_client/src/manager/monitor.dart';
 import 'package:at_client/src/preference/monitor_preference.dart';
@@ -35,6 +36,10 @@ class MockOutboundConnection extends Mock implements OutboundConnection {}
 class MockMonitorOutboundConnectionFactory extends Mock
     implements MonitorOutboundConnectionFactory {}
 
+class MockAtChops extends Mock implements AtChops {}
+
+class FakeAtSigningInput extends Fake implements AtSigningInput {}
+
 /// Note: The test code here prioritizes brevity over isolation
 /// So while, right now, the tests are all passing despite sharing their mock objects, at some point
 /// we will add a test where that assumption doesn't hold any more, and the tests will start failing
@@ -47,6 +52,7 @@ void main() {
   OutboundConnection mockOutboundConnection = MockOutboundConnection();
   SecureSocket mockSocket = MockSecureSocket();
   MonitorPreference monitorPreference = MonitorPreference()..keepAlive = true;
+  AtChops mockAtChops = MockAtChops();
   late Function(dynamic data) socketOnDataFn;
   late Function() socketOnDoneFn;
   late Function(Exception e) socketOnErrorFn;
@@ -69,8 +75,9 @@ void main() {
     reset(mockSocket);
     reset(mockOutboundConnection);
     reset(mockMonitorOutboundConnectionFactory);
+    reset(mockAtChops);
     mockMonitorConnectivityChecker.shouldFail = false;
-
+    atClientPreference.useAtChops = false;
     when(() => mockRemoteSecondary.isAvailable()).thenAnswer((_) async => true);
     when(() => mockRemoteSecondary.findSecondaryUrl())
         .thenAnswer((_) async => fakeSecondaryUrl);
@@ -676,5 +683,32 @@ void main() {
           () async => await monitor.getQueueResponse(maxWaitTimeInMillis: 10),
           throwsA(predicate((dynamic e) => e is AtClientException)));
     });
+    group('A group of tests for monitor when useAtChops is true', () {
+      test('test monitor start when useAtChops is true', () async {
+        AtSigningResult mockSigningResult = AtSigningResult()
+          ..result = 'mock_signing_result';
+        atClientPreference.useAtChops = true;
+        registerFallbackValue(FakeAtSigningInput());
+        when(() => mockAtChops.sign(any()))
+            .thenAnswer((_) => mockSigningResult);
+        Monitor monitor = Monitor(
+            (String received) => print('onResponse: $json'),
+            (e) => print('onError: $e'),
+            atSign,
+            atClientPreference,
+            monitorPreference,
+            () => print('onRetry called'),
+            monitorConnectivityChecker: mockMonitorConnectivityChecker,
+            remoteSecondary: mockRemoteSecondary,
+            monitorOutboundConnectionFactory:
+                mockMonitorOutboundConnectionFactory,
+            atChops: mockAtChops);
+
+        Future<void> monitorStartFuture =
+            monitor.start(lastNotificationTime: null);
+        await monitorStartFuture;
+        expect(monitor.status, MonitorStatus.started);
+      });
+    });
   });
 }