feat: apkam-aware activate_cli

packages/at_onboarding_cli/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.5.0
+- feat: 'activate' CLI is now APKAM-aware, and supports 
+  - onboarding (as before)
+  - submitting enrollment requests
+  - listing / approving / denying / revoking enrollment requests
+  - generating one-time passcodes
+  - setting semi-permanent passcode
 ## 1.4.4
 - feat: uptake changes for at_auth 2.0.0
 - build[deps]: upgrade at_auth to 2.0.2 | at_lookup to 3.0.46 | at_client to 3.0.75 \

packages/at_onboarding_cli/analysis_options.yaml

@@ -13,11 +13,12 @@
 
 include: package:lints/recommended.yaml
 
-# Uncomment the following section to specify additional rules.
-
-# linter:
-#   rules:
-#     - camel_case_types
+linter:
+  rules:
+    camel_case_types : true
+    unnecessary_string_interpolations : true
+    await_only_futures : true
+    unawaited_futures: true
 
 # analyzer:
 #   exclude:

packages/at_onboarding_cli/bin/activate_cli.dart

@@ -1,26 +1,7 @@
 import 'dart:io';
 
-import 'package:at_client/at_client.dart';
-import 'package:at_onboarding_cli/src/activate_cli/activate_cli.dart'
-    as activate_cli;
+import 'package:at_onboarding_cli/src/cli/auth_cli.dart' as auth_cli;
 
 Future<void> main(List<String> args) async {
-  try {
-    await activate_cli.main(args);
-  } on IllegalArgumentException catch (e) {
-    stderr.writeln('[Exception] Incorrect arguments provided\nCause: $e');
-    exit(1);
-  } on Exception catch (e) {
-    stderr.writeln('[Exception] Aborting process with exit code:2\nCause: $e');
-    exit(2);
-  } on Error catch (e) {
-    stderr.writeln('[Error] Aborting process with exit code:3\nCause: $e');
-    exit(3);
-  }
-  // The onboarding_service_impl creates an AtClient instance which will start
-  // the following services: SyncService, AtClientCommitLogCompaction,
-  // Monitor connection in NotificationService.
-  // We do not have an stop method in at_client that stop(s) the services, hence
-  // to force quit, calling exit method.
-  exit(0);
+  exit(await auth_cli.main(args));
 }

packages/at_onboarding_cli/example/apkam_examples/apkam_enroll.dart

@@ -15,14 +15,18 @@ Future<void> main(List<String> args) async {
     ..atKeysFilePath = argResults['atKeysPath']
     ..appName = 'buzz'
     ..deviceName = 'iphone'
-    ..rootDomain = 'vip.ve.atsign.zone'
-    ..apkamAuthRetryDurationMins = 1;
+    ..rootDomain = 'vip.ve.atsign.zone';
   AtOnboardingService? onboardingService =
       AtOnboardingServiceImpl(atSign, atOnboardingPreference);
   Map<String, String> namespaces = {"buzz": "rw"};
   // run totp:get from enrolled client and pass the otp
   var enrollmentResponse = await onboardingService.enroll(
-      'buzz', 'iphone', argResults['otp'], namespaces);
+    'buzz',
+    'iphone',
+    argResults['otp'],
+    namespaces,
+    retryInterval: Duration(seconds: 10),
+  );
   print('enrollmentResponse: $enrollmentResponse');
 }
 

packages/at_onboarding_cli/example/apkam_examples/enroll_app_listen.dart

@@ -56,10 +56,10 @@ Future<void> _notificationCallback(AtNotification notification,
   var enrollParamsJson = {};
   enrollParamsJson['enrollmentId'] = enrollmentId;
   if (approveResponse == 'yes') {
-    final encryptedApkamSymmetricKey =
-        jsonDecode(notification.value!)['encryptedApkamSymmetricKey'];
+    final encryptedAPKAMSymmetricKey =
+        jsonDecode(notification.value!)['encryptedAPKAMSymmetricKey'];
     final apkamSymmetricKey = EncryptionUtil.decryptKey(
-        encryptedApkamSymmetricKey, atAuthKeys.defaultEncryptionPrivateKey!);
+        encryptedAPKAMSymmetricKey, atAuthKeys.defaultEncryptionPrivateKey!);
     print('decrypted apkam symmetric key: $apkamSymmetricKey');
     var encryptedDefaultPrivateEncKey = EncryptionUtil.encryptValue(
         atAuthKeys.defaultEncryptionPrivateKey!, apkamSymmetricKey);