fix: edge case, when apiKey is null, show the cram screen instead of an

error

Author: XavierChanth

packages/dart/npt_flutter/lib/constants.dart

@@ -1,3 +1,4 @@
+import 'dart:async' show FutureOr;
 import 'dart:developer' show log;
 
 import 'package:flutter/material.dart';
@@ -14,7 +15,7 @@ typedef RootDomainMap = Map<String, RootDomainMetadata>;
 typedef ResolvedRootDomainMetadata = ({
   String description,
   String? registrarUrl,
-  String? apiKey,
+  FutureOr<String?> apiKey,
 });
 typedef ResolvedRootDomainMap = Map<String, ResolvedRootDomainMetadata>;
 
@@ -39,7 +40,7 @@ class Constants {
     return dotenv.env["APP_API_KEY"];
   }
 
-  static Future<String?> getApiKey(String? registrarUrl) async {
+  static Future<String?> _getApiKey(String? registrarUrl) async {
     if (registrarUrl == null) return null;
     await loadDotenv();
     String key = "API_KEY_${registrarUrl.toUpperCase().replaceAll(".", "_")}";
@@ -76,7 +77,7 @@ class Constants {
     return _rootDomainMap.map((k, v) {
       late String desc;
       var reg = v.registrarUrl;
-      var api = v.apiKey ?? getApiKey(reg);
+      var api = v.apiKey ?? _getApiKey(reg);
       if (v.description is String Function(BuildContext)) {
         desc = v.description.call(context);
       } else {

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

@@ -129,10 +129,9 @@ class _OnboardingButtonState extends State<OnboardingButton> {
       bool isFromInitState = false}) async {
     var atSigns =
         await KeyChainManager.getInstance().getAtSignListFromKeychain();
-    final regUrl =
-        Constants.getRootDomains(App.navState.currentContext!)[rootDomain]
-            ?.registrarUrl;
-    var apiKey = await Constants.getApiKey(regUrl);
+    final roots =
+        Constants.getRootDomains(App.navState.currentContext!)[rootDomain];
+    var apiKey = await roots?.apiKey;
     var config = AtOnboardingConfig(
       atClientPreference:
           await AtClientMethods.loadAtClientPreference(rootDomain),
@@ -228,18 +227,14 @@ class _OnboardingButtonState extends State<OnboardingButton> {
         final rootDomain = context
             .read<OnboardingCubit>()
             .getRootDomain(); // Or get from your state/cubit if needed
-        final regUrl =
+        final root =
             // ignore: use_build_context_synchronously
-            Constants.getRootDomains(context)[rootDomain]?.registrarUrl;
-        final apiKey = await Constants.getApiKey(regUrl);
+            Constants.getRootDomains(context)[rootDomain];
 
-        if (apiKey == null) {
-          result = AtOnboardingResult.error(
-            message: strings.errorAtSignNotExist,
-          );
-          break;
+        final apiKey = await root?.apiKey;
+        if (apiKey != null) {
+          AtOnboardingConstants.setApiKey(apiKey!);
         }
-        AtOnboardingConstants.setApiKey(apiKey);
         AtOnboardingConstants.rootDomain =
             util.config.atClientPreference.rootDomain;
 
@@ -252,7 +247,7 @@ class _OnboardingButtonState extends State<OnboardingButton> {
           // ignore: use_build_context_synchronously
           context: context,
           barrierDismissible: false,
-          builder: (context) => (regUrl == null)
+          builder: (context) => (root?.registrarUrl == null || apiKey == null)
               ? ActivateCramDialog(
                   atSign: atsign,
                   config: util.config,
@@ -262,7 +257,7 @@ class _OnboardingButtonState extends State<OnboardingButton> {
                   atSign: atsign,
                   apiKey: apiKey,
                   config: util.config,
-                  registrarUrl: regUrl,
+                  registrarUrl: root!.registrarUrl!,
                   onboardingUtil: util,
                   waitForTeapot: initialStatus != AtSignStatus.teapot,
                 ),

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

@@ -103,8 +103,8 @@ class SwitchAtsignButton extends StatelessWidget {
                 await AtOnboarding.changePrimaryAtsign(atsign: selectedAtSign);
 
             if (!currentContext.mounted) return;
-            final regUrl = Constants.getRootDomains(currentContext)[rootDomain]
-                ?.registrarUrl;
+            final root = Constants.getRootDomains(currentContext)[rootDomain];
+
             if (result) {
               final onboardingResult = await AtOnboarding.onboard(
                 atsign: selectedAtSign,
@@ -114,7 +114,7 @@ class SwitchAtsignButton extends StatelessWidget {
                   atClientPreference: atClientPreference,
                   domain: rootDomain,
                   rootEnvironment: RootEnvironment.Production,
-                  appAPIKey: await Constants.getApiKey(regUrl),
+                  appAPIKey: await root?.apiKey,
                 ),
               );
               log("onboarding result: $onboardingResult");