Conform to revised J4JHost API

Author: markolbert

GeoProcessorWPF/ViewModelLocator.cs

@@ -21,7 +21,7 @@ public class ViewModelLocator
         public const string AppConfigFile = "appConfig.json";
         public const string UserConfigFile = "userConfig.json";
 
-        private readonly IHost _host;
+        private readonly IJ4JHost _host;
 
         private IJ4JLogger? _buildLogger;
 
@@ -36,7 +36,7 @@ public ViewModelLocator()
         public RouteDisplayVM RouteDisplayVM => _host!.Services.GetRequiredService<RouteDisplayVM>();
         public RouteEnginesVM RouteEnginesVM => _host!.Services.GetRequiredService<RouteEnginesVM>();
 
-        private IHost CreateHost()
+        private IJ4JHost CreateHost()
         {
             var hostConfig = new J4JHostConfiguration()
                 .Publisher( "J4JSoftware" )
@@ -55,12 +55,7 @@ private IHost CreateHost()
                 throw new ArgumentException(
                     $"Could not create IHost. The following requirements were not met: {hostConfig.MissingRequirements.ToText()}" );
 
-            var builder = hostConfig.CreateHostBuilder();
-
-            if( builder == null )
-                throw new ArgumentException( "Failed to create host builder." );
-
-            var retVal = builder.Build();
+            var retVal = hostConfig.Build();
 
             if( retVal == null )
                 throw new ArgumentException( "Failed to build host" );
@@ -126,6 +121,10 @@ private void SetupDependencyInjection( HostBuilderContext hbc, ContainerBuilder
             builder.RegisterType<ProcessorVM>()
                 .AsSelf();
 
+            //builder.Register( c => _host )
+            //       .As<IJ4JHost>()
+            //       .SingleInstance();
+
             builder.RegisterModule<AutofacGeoProcessorModule>();
         }
 

GeoProcessorWPF/config/APIKey.cs

@@ -25,8 +25,8 @@ namespace J4JSoftware.GeoProcessor
 {
     public class APIKey
     {
-        private string? _encryptedKey;
-        private string? _key;
+        private string _encryptedKey = string.Empty;
+        private string _key = string.Empty;
 
         internal IJ4JProtection? Protection { get; private set; }
 
@@ -36,52 +36,56 @@ public string EncryptedValue
         {
             get
             {
-                if( _encryptedKey != null )
-                    return _encryptedKey;
-
-                // abort if we haven't been initialized or the plain text key is undefined/not yet set
-                if( Protection == null || string.IsNullOrEmpty( _key ) )
+                if( Protection == null )
                     return string.Empty;
 
-                if( Protection == null )
-                    throw new NullReferenceException(
-                        $"{nameof(APIKey)} is not initialized. {nameof(Initialize)}() must be called before use." );
+                if( !string.IsNullOrEmpty( _encryptedKey ) )
+                    return _encryptedKey;
 
                 if( !Protection.Protect( _key!, out var encrypted ) )
                     return string.Empty;
 
                 _encryptedKey = encrypted!;
+
                 return _encryptedKey;
             }
 
-            set => _encryptedKey = value;
+            set
+            {
+                _encryptedKey = value;
+
+                // force decryption if the cryption system is initialized
+                if( Protection != null )
+                    _key = string.Empty;
+            }
         }
 
         [ JsonIgnore ]
         public string Value
         {
             get
             {
-                if( _key != null )
-                    return _key;
-
-                // abort if we haven't been initialized or the encrypted key is undefined/not yet set
-                if( Protection == null || string.IsNullOrEmpty( _encryptedKey ) )
+                if (Protection == null)
                     return string.Empty;
 
-                if( !Protection.Unprotect( _encryptedKey!, out var decrypted ) )
+                if (!string.IsNullOrEmpty(_key))
+                    return _key;
+
+                if ( !Protection.Unprotect( _encryptedKey!, out var decrypted ) )
                     return string.Empty;
 
                 _key = decrypted!;
+
                 return _key;
             }
 
             set
             {
                 _key = value;
 
-                // force re-encryption
-                _encryptedKey = null;
+                // force encryption if the cryption system is initialized
+                if( Protection != null )
+                    _encryptedKey = string.Empty;
             }
         }
 

GeoProcessorWPF/ui/optionswin/vm/RouteEnginesVM.cs

@@ -21,6 +21,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
+using J4JSoftware.Logging;
 using Microsoft.Toolkit.Mvvm.ComponentModel;
 
 namespace J4JSoftware.GeoProcessor
@@ -29,6 +30,7 @@ public class RouteEnginesVM : ObservableRecipient
     {
         private readonly IAppConfig _appConfig;
         private readonly IUserConfig _userConfig;
+
         private string _apiKey = string.Empty;
 
         private Visibility _apiKeyVisibility = Visibility.Collapsed;
@@ -41,7 +43,8 @@ public class RouteEnginesVM : ObservableRecipient
 
         public RouteEnginesVM(
             IAppConfig appConfig,
-            IUserConfig userConfig )
+            IUserConfig userConfig
+            )
         {
             _appConfig = appConfig;
             _userConfig = userConfig;
@@ -50,6 +53,10 @@ public RouteEnginesVM(
                 .Where( x => x != ProcessorType.None ) );
 
             UnitTypes = new ObservableCollection<UnitTypes>( Enum.GetValues<UnitTypes>() );
+
+            // go live for messages
+            IsActive = true;
+
             SelectedProcessorType = ProcessorTypes.FirstOrDefault( x => x != ProcessorType.Distance );
 
             _setState = PropertySettingState.Normal;
@@ -137,14 +144,17 @@ public string APIKey
             set
             {
                 SetProperty( ref _apiKey, value );
-                OnSettingsChanged();
 
                 if( _setState != PropertySettingState.Normal
                     || !_userConfig.APIKeys.TryGetValue( SelectedProcessorType, out var temp ) )
+                {
                     return;
+                }
 
                 temp.Value = value;
                 EncryptedAPIKey = temp.EncryptedValue;
+
+                OnSettingsChanged();
             }
         }