Merge pull request #1070 from PlayEveryWare/fix/nullcheck-migration

Fix/nullcheck migration

Author: WispyMouse

com.playeveryware.eos/Runtime/Core/Config/PlatformConfig.cs

@@ -416,11 +416,11 @@ protected virtual void MigrateNonOverrideableConfigValues(EOSConfig overrideValu
             integratedPlatformManagementFlags |= mainNonOverrideableConfig.integratedPlatformManagementFlags;
 
             ProductConfig productConfig = Get<ProductConfig>();
-            string compDeploymentString = mainNonOverrideableConfig.deploymentID.ToLower();
+            string compDeploymentString = mainNonOverrideableConfig.deploymentID?.ToLower();
 
             foreach(Named<Deployment> dep in productConfig.Environments.Deployments)
             {
-                if (!compDeploymentString.Equals(dep.Value.DeploymentId.ToString("N").ToLowerInvariant()))
+                if (!string.IsNullOrEmpty(compDeploymentString) && !compDeploymentString.Equals(dep.Value.DeploymentId.ToString("N").ToLowerInvariant()))
                 {
                     continue;
                 }

com.playeveryware.eos/Runtime/Core/Config/ProductConfig.cs

@@ -141,7 +141,9 @@ private void MigrateProductNameVersionAndId(PreviousEOSConfig config)
             ProductName = config.productName;
             ProductVersion = config.productVersion;
 
-            if (!Guid.TryParse(config.productID, out ProductId))
+            // Attempt to parse the productID, and log a message if it cannot be parsed
+            // Do not log a message if the productID is empty, and could not possibly migrate
+            if (!string.IsNullOrWhiteSpace(config.productID) && !Guid.TryParse(config.productID, out ProductId))
             {
                 Debug.LogWarning("Could not parse product ID.");
             }
@@ -151,13 +153,24 @@ private void MigrateClientCredentials(PreviousEOSConfig config)
         {
 #if !EOS_DISABLE
             // Import the old config client stuff
-            Clients.Add(new EOSClientCredentials(config.clientID, config.clientSecret,
-                config.encryptionKey));
+            // Some amount of these values should be provided, though encryptionKey is optional
+            if (!string.IsNullOrWhiteSpace(config.clientID) && !string.IsNullOrWhiteSpace(config.clientSecret))
+            {
+                Clients.Add(new EOSClientCredentials(config.clientID, config.clientSecret,
+                    config.encryptionKey));
+            }
 #endif
         }
 
         private void MigrateSandboxAndDeployment(PreviousEOSConfig config)
         {
+            // Check to see if the sandbox and deployment id were configured in the previous config
+            if (string.IsNullOrWhiteSpace(config.sandboxID) || string.IsNullOrEmpty(config.deploymentID))
+            {
+                // One of them is empty, we can't possibly add this deployment
+                return;
+            }
+
             // Import explicitly set sandbox and deployment
             SandboxId sandboxId = new()
             {
@@ -181,6 +194,13 @@ private void MigrateSandboxAndDeployment(PreviousEOSConfig config)
 
         private void MigrateSandboxAndDeploymentOverrides(PreviousEOSConfig config)
         {
+            // If the sandboxDeploymentOverrides didn't parse, they were likely missing
+            // Only migrate values if they are present
+            if (config.sandboxDeploymentOverrides == null)
+            {
+                return;
+            }
+
             // Import each of the overrides
             foreach (var overrideValues in config.sandboxDeploymentOverrides)
             {

com.playeveryware.eos/Runtime/Core/Utility/ConfigurationUtility.cs

@@ -77,7 +77,7 @@ public static EOSCreateOptions GetEOSCreateOptions()
             platformConfig.platformOptionsFlags.Unwrap();
 #endif
 
-            if (!platformConfig.clientCredentials.IsEncryptionKeyValid())
+            if (platformConfig.clientCredentials == null || platformConfig.clientCredentials.IsEncryptionKeyValid() == false)
             {
                 Debug.LogError("The encryption key used for the selected client credentials is invalid. Please see your platform configuration.");
             }
@@ -147,7 +147,7 @@ public static EOSInitializeOptions GetEOSInitializeOptions()
             // Set the product name, version, and override thread affinity
             initOptions.options.ProductName = productConfig.ProductName;
             initOptions.options.ProductVersion = productConfig.ProductVersion;
-            initOptions.options.OverrideThreadAffinity = platformConfig.threadAffinity.Unwrap();
+            initOptions.options.OverrideThreadAffinity = platformConfig.threadAffinity?.Unwrap();
 
             initOptions.options.AllocateMemoryFunction = IntPtr.Zero;
             initOptions.options.ReallocateMemoryFunction = IntPtr.Zero;