fix: revise api key handling

Author: XavierChanth

packages/dart/npt_flutter/lib/args.dart

@@ -1,10 +1,11 @@
-import 'dart:convert' show jsonDecode;
+import 'dart:io' show exit;
 
 import 'package:args/args.dart' show ArgParser, ArgResults;
 import 'package:npt_flutter/constants.dart';
 
 ArgParser createArgParser() {
   var parser = ArgParser();
+  parser.addFlag("help", abbr: "h");
   parser.addMultiOption(
     "register-root",
     help:
@@ -33,6 +34,11 @@ ArgResults parseArgsAndHandleConstants(ArgParser parser, List<String> args) {
     rethrow;
   }
 
+  if (results["help"]) {
+    // ignore: avoid_print
+    print(parser.usage);
+    exit(0);
+  }
   if (results["include-default-roots"]) {
     Constants.registerDefaultRootDomains();
   }
@@ -66,6 +72,7 @@ ArgResults parseArgsAndHandleConstants(ArgParser parser, List<String> args) {
       description: root["description"]!,
       registrarUrl:
           (root["registrar-url"] is String) ? root["registrar-url"] : null,
+      apiKey: null,
     ));
   }
 

packages/dart/npt_flutter/lib/constants.dart

@@ -7,12 +7,14 @@ import 'package:npt_flutter/localization/app_localizations.dart';
 typedef RootDomainMetadata = ({
   dynamic description,
   String? registrarUrl,
+  String? apiKey,
 });
 typedef RootDomainMap = Map<String, RootDomainMetadata>;
 
 typedef ResolvedRootDomainMetadata = ({
   String description,
   String? registrarUrl,
+  String? apiKey,
 });
 typedef ResolvedRootDomainMap = Map<String, ResolvedRootDomainMetadata>;
 
@@ -37,25 +39,30 @@ class Constants {
     return dotenv.env["APP_API_KEY"];
   }
 
+  static Future<String?> getApiKey(String? registrarUrl) async {
+    if (registrarUrl == null) return null;
+    await loadDotenv();
+    String key = "API_KEY_${registrarUrl.toUpperCase().replaceAll(".", "_")}";
+    return dotenv.env[key];
+  }
+
   // Root Domain configuration
 
   // description may be a String or String Function(BuildContext)
   static final RootDomainMap _rootDomainMap = {};
-  Map<String, String> apis = {
-    "root.atsign.org": "my.atsign.com",
-    "root.atsign.wtf": "my.atsign.wtf",
-  };
 
   static void registerDefaultRootDomains() {
     registerRootDomain('root.atsign.org', (
       description: (BuildContext context) =>
           AppLocalizations.of(context)!.rootDomainDefault,
-      registrarUrl: "my.atsign.com"
+      registrarUrl: "my.atsign.com",
+      apiKey: null,
     ));
     registerRootDomain('vip.ve.atsign.zone', (
       description: (BuildContext context) =>
           AppLocalizations.of(context)!.rootDomainDemo,
       registrarUrl: null,
+      apiKey: null, // injected via .env file
     ));
   }
 
@@ -67,13 +74,19 @@ class Constants {
   static bool rootDomainsIsEmpty() => _rootDomainMap.isEmpty;
   static ResolvedRootDomainMap getRootDomains(BuildContext context) {
     return _rootDomainMap.map((k, v) {
+      late String desc;
+      var reg = v.registrarUrl;
+      var api = v.apiKey ?? getApiKey(reg);
       if (v.description is String Function(BuildContext)) {
-        v = (
-          description: v.description.call(context),
-          registrarUrl: v.registrarUrl,
-        ) as ResolvedRootDomainMetadata;
+        desc = v.description.call(context);
+      } else {
+        desc = v.description as String;
       }
-      return MapEntry(k, v as ResolvedRootDomainMetadata);
+      return MapEntry(
+        k,
+        (description: desc, registrarUrl: reg, apiKey: api)
+            as ResolvedRootDomainMetadata,
+      );
     });
   }
 

packages/dart/npt_flutter/lib/features/onboarding/widgets/onboarding_button.dart

@@ -129,7 +129,10 @@ class _OnboardingButtonState extends State<OnboardingButton> {
       bool isFromInitState = false}) async {
     var atSigns =
         await KeyChainManager.getInstance().getAtSignListFromKeychain();
-    var apiKey = await Constants.appAPIKey;
+    final regUrl =
+        Constants.getRootDomains(App.navState.currentContext!)[rootDomain]
+            ?.registrarUrl;
+    var apiKey = await Constants.getApiKey(regUrl);
     var config = AtOnboardingConfig(
       atClientPreference:
           await AtClientMethods.loadAtClientPreference(rootDomain),
@@ -218,10 +221,17 @@ class _OnboardingButtonState extends State<OnboardingButton> {
       case AtSignStatus.unavailable:
       case AtSignStatus.teapot:
         // When onboarding from teapot, set backup status to false (not atKeys not backed up)
-        App.navState.currentContext!
-            .read<BackupKeyCubit>()
-            .setBackupKeyStatus(false);
-        final apiKey = await Constants.appAPIKey;
+        var context = App.navState.currentContext!;
+        // ignore: use_build_context_synchronously
+        context.read<BackupKeyCubit>().setBackupKeyStatus(false);
+        // ignore: use_build_context_synchronously
+        final rootDomain = context
+            .read<OnboardingCubit>()
+            .getRootDomain(); // Or get from your state/cubit if needed
+        final regUrl =
+            // ignore: use_build_context_synchronously
+            Constants.getRootDomains(context)[rootDomain]?.registrarUrl;
+        final apiKey = await Constants.getApiKey(regUrl);
 
         if (apiKey == null) {
           result = AtOnboardingResult.error(
@@ -238,10 +248,8 @@ class _OnboardingButtonState extends State<OnboardingButton> {
                 .locale);
         if (!mounted) return null;
 
-        var regUrl = Constants.getRootDomains(
-                context)[util.config.atClientPreference.rootDomain]
-            ?.registrarUrl;
         result = await showDialog<AtOnboardingResult>(
+          // ignore: use_build_context_synchronously
           context: context,
           barrierDismissible: false,
           builder: (context) => (regUrl == null)

packages/dart/npt_flutter/lib/widgets/custom_text_button.dart

@@ -45,15 +45,23 @@ class CustomTextButton extends StatelessWidget {
         type = CustomListTileType.privacyPolicy;
 
   const CustomTextButton.backUpYourKey(
-      {this.iconData = Icons.bookmark_outline, this.type = CustomListTileType.backupYourKey, super.key});
+      {this.iconData = Icons.bookmark_outline,
+      this.type = CustomListTileType.backupYourKey,
+      super.key});
 
   const CustomTextButton.resetAtsign(
-      {this.iconData = Icons.rotate_right, this.type = CustomListTileType.resetAtsign, super.key});
+      {this.iconData = Icons.rotate_right,
+      this.type = CustomListTileType.resetAtsign,
+      super.key});
   const CustomTextButton.signOut(
-      {this.iconData = Icons.logout_outlined, this.type = CustomListTileType.signOut, super.key});
+      {this.iconData = Icons.logout_outlined,
+      this.type = CustomListTileType.signOut,
+      super.key});
 
   const CustomTextButton.feedback(
-      {this.iconData = Icons.feedback_outlined, this.type = CustomListTileType.feedback, super.key});
+      {this.iconData = Icons.feedback_outlined,
+      this.type = CustomListTileType.feedback,
+      super.key});
 
   final IconData iconData;
 
@@ -73,17 +81,20 @@ class CustomTextButton extends StatelessWidget {
             path: 'info@noports.com',
           );
           if (!await launchUrl(emailUri)) {
-            CustomSnackBar.notification(content: strings.noEmailClientAvailable);
+            CustomSnackBar.notification(
+                content: strings.noEmailClientAvailable);
           }
           break;
         case CustomListTileType.discord:
-          final Uri url = Uri.parse('https://discord.gg/atsign-778383211214536722');
+          final Uri url =
+              Uri.parse('https://discord.gg/atsign-778383211214536722');
           if (!await launchUrl(url)) {
             throw Exception('Could not launch $url');
           }
           break;
         case CustomListTileType.faq:
-          final Uri url = Uri.parse('https://docs.noports.com/ssh-no-ports/faq');
+          final Uri url =
+              Uri.parse('https://docs.noports.com/ssh-no-ports/faq');
           if (!await launchUrl(url)) {
             throw Exception('Could not launch $url');
           }
@@ -100,23 +111,25 @@ class CustomTextButton extends StatelessWidget {
           }
           break;
         case CustomListTileType.resetAtsign:
-          final futurePreference = await AtClientMethods.loadAtClientPreference(rootDomain!);
-          final apiKey = await Constants.appAPIKey;
+          final futurePreference =
+              await AtClientMethods.loadAtClientPreference(rootDomain!);
           if (context.mounted) {
             final result = await AtOnboarding.reset(
               context: context,
               config: AtOnboardingConfig(
                 atClientPreference: futurePreference,
                 rootEnvironment: RootEnvironment.Testing,
                 domain: rootDomain,
-                appAPIKey: apiKey,
+                appAPIKey: null,
               ),
             );
-            final OnboardingService onboardingService = OnboardingService.getInstance();
+            final OnboardingService onboardingService =
+                OnboardingService.getInstance();
 
             if (context.mounted && result == AtOnboardingResetResult.success) {
               onboardingService.setAtsign = null;
-              Navigator.of(context, rootNavigator: true).pushNamedAndRemoveUntil(
+              Navigator.of(context, rootNavigator: true)
+                  .pushNamedAndRemoveUntil(
                 Routes.onboarding,
                 (route) => false,
               );
@@ -132,7 +145,8 @@ class CustomTextButton extends StatelessWidget {
           );
 
           if (!await launchUrl(emailUri)) {
-            CustomSnackBar.notification(content: strings.noEmailClientAvailable);
+            CustomSnackBar.notification(
+                content: strings.noEmailClientAvailable);
           }
           break;
 
@@ -176,9 +190,11 @@ class CustomTextButton extends StatelessWidget {
     }
 
     if (type == CustomListTileType.resetAtsign) {
-      return BlocBuilder<OnboardingCubit, AtsignInformation>(builder: (context, atsignInformation) {
+      return BlocBuilder<OnboardingCubit, AtsignInformation>(
+          builder: (context, atsignInformation) {
         return Padding(
-          padding: const EdgeInsets.only(left: Sizes.p30, right: Sizes.p30, bottom: Sizes.p10),
+          padding: const EdgeInsets.only(
+              left: Sizes.p30, right: Sizes.p30, bottom: Sizes.p10),
           child: TextButton.icon(
             label: Text(getTitle(strings)),
             onPressed: () {
@@ -192,7 +208,8 @@ class CustomTextButton extends StatelessWidget {
       });
     }
     return Padding(
-      padding: const EdgeInsets.only(left: Sizes.p30, right: Sizes.p30, bottom: Sizes.p10),
+      padding: const EdgeInsets.only(
+          left: Sizes.p30, right: Sizes.p30, bottom: Sizes.p10),
       child: TextButton.icon(
         label: Text(getTitle(strings)),
         onPressed: () {

packages/dart/npt_flutter/lib/widgets/switch_atsign_button.dart

@@ -42,10 +42,11 @@ class SwitchAtsignButton extends StatelessWidget {
             // Select atsign to switch
             final atSignList = await KeychainUtil.getAtsignList();
             // set to dynamic to handle being popped by the AppBar back button which returns a 'StatefulElement'
+            if (!context.mounted) return;
             final selectedAtSign = await showMenu<dynamic>(
               context: context,
-              position:
-                  const RelativeRect.fromLTRB(-1000, 1, 0, 0), // You may want to calculate this based on tap position
+              position: const RelativeRect.fromLTRB(-1000, 1, 0,
+                  0), // You may want to calculate this based on tap position
               shape: RoundedRectangleBorder(
                 side: const BorderSide(
                   color: AppColor.primaryColor,
@@ -70,7 +71,14 @@ class SwitchAtsignButton extends StatelessWidget {
             // Check for connected profiles before switching
             var isProfileConnected = false;
 
-            if (context.read<ProfilesRunningCubit>().state.socketConnectors.keys.toSet().isNotEmpty) {
+            if (!context.mounted) return;
+            if (context
+                .read<ProfilesRunningCubit>()
+                .state
+                .socketConnectors
+                .keys
+                .toSet()
+                .isNotEmpty) {
               log('tap triggered more than once');
               isProfileConnected = await showDialog(
                 barrierDismissible: false,
@@ -84,21 +92,29 @@ class SwitchAtsignButton extends StatelessWidget {
             }
             final currentContext = App.navState.currentContext!;
 
-            final rootDomain =
-                currentContext.read<OnboardingCubit>().getRootDomain(); // Or get from your state/cubit if needed
-            final atClientPreference = await AtClientMethods.loadAtClientPreference(rootDomain);
+            if (!currentContext.mounted) return;
+            final rootDomain = currentContext
+                .read<OnboardingCubit>()
+                .getRootDomain(); // Or get from your state/cubit if needed
+            final atClientPreference =
+                await AtClientMethods.loadAtClientPreference(rootDomain);
             await preSignout();
-            final result = await AtOnboarding.changePrimaryAtsign(atsign: selectedAtSign);
+            final result =
+                await AtOnboarding.changePrimaryAtsign(atsign: selectedAtSign);
 
+            if (!currentContext.mounted) return;
+            final regUrl = Constants.getRootDomains(currentContext)[rootDomain]
+                ?.registrarUrl;
             if (result) {
               final onboardingResult = await AtOnboarding.onboard(
                 atsign: selectedAtSign,
+                // ignore: use_build_context_synchronously
                 context: currentContext,
                 config: AtOnboardingConfig(
                   atClientPreference: atClientPreference,
                   domain: rootDomain,
                   rootEnvironment: RootEnvironment.Production,
-                  appAPIKey: await Constants.appAPIKey,
+                  appAPIKey: await Constants.getApiKey(regUrl),
                 ),
               );
               log("onboarding result: $onboardingResult");
@@ -130,7 +146,9 @@ class _HoverableMenuItemState extends State<_HoverableMenuItem> {
       onEnter: (_) => setState(() => _hovering = true),
       onExit: (_) => setState(() => _hovering = false),
       child: Container(
-        color: _hovering ? AppColor.primaryColorButtonBackgroundAlt : Colors.transparent,
+        color: _hovering
+            ? AppColor.primaryColorButtonBackgroundAlt
+            : Colors.transparent,
         child: Column(
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
@@ -141,10 +159,13 @@ class _HoverableMenuItemState extends State<_HoverableMenuItem> {
                 children: [
                   RichText(
                     text: TextSpan(children: [
-                      const TextSpan(text: '@', style: TextStyle(color: AppColor.primaryColor)),
+                      const TextSpan(
+                          text: '@',
+                          style: TextStyle(color: AppColor.primaryColor)),
                       TextSpan(
                         text: widget.atSign.split('@').last,
-                        style: Theme.of(context).textTheme.bodyMedium?.copyWith(),
+                        style:
+                            Theme.of(context).textTheme.bodyMedium?.copyWith(),
                       ),
                     ]),
                   ),