- Improved BootOASISAsync in OASISBootLoader so the OASIS System Account check has been improved with integrity checks.

- Updated OASIS Runtime v3.2.2.

- Fixed bugs in the OASIS.STAR.DNATemplates.OAPP.Console.DLL template.

Author: dellams

NextGenSoftware.OASIS.OASISBootLoader/OASISBootLoader.cs

@@ -226,16 +226,28 @@ public static async Task<OASISResult<bool>> BootOASISAsync(OASISDNA OASISDNA, bo
 
                     if (result.Result && !result.IsError)
                     {
-                       if (!string.IsNullOrEmpty(OASISDNA.OASIS.OASISSystemAccountId))
-                            LoggingManager.Log($"OASISSystemAccountId Found In OASISDNA: {OASISDNA.OASIS.OASISSystemAccountId}.", LogType.Info);
+                        LoggingManager.BeginLogAction($"Looking For OASIS System Account For Email {OASISDNA.OASIS.Email.SmtpUser}...", LogType.Info);
+                        OASISResult<IAvatar> oasisSystemAccountResult = await AvatarManager.Instance.LoadAvatarByEmailAsync(OASISDNA.OASIS.Email.SmtpUser);
+
+                        //if (!string.IsNullOrEmpty(OASISDNA.OASIS.OASISSystemAccountId))
+                        if (oasisSystemAccountResult != null && oasisSystemAccountResult.Result != null && !oasisSystemAccountResult.IsError)
+                        {
+                            LoggingManager.EndLogAction($"DONE", LogType.Info);
+                            LoggingManager.Log($"OASIS System Account Found: Id: {oasisSystemAccountResult.Result.Id}, Name: {oasisSystemAccountResult.Result.Name}, Email: {oasisSystemAccountResult.Result.Email}, Username: {oasisSystemAccountResult.Result.Username}, Type: {oasisSystemAccountResult.Result.AvatarType.Name}.", LogType.Info);
+                            
+                            if (oasisSystemAccountResult.Result.AvatarType.Value != AvatarType.System || oasisSystemAccountResult.Result.Name != "OASIS SYSTEM" || oasisSystemAccountResult.Result.Username != "root")
+                                LoggingManager.Log($"OASIS System Account Invalid! Please change the SmtpUser to a different email in the Email section in the OASISDNA and then boot the OASIS again so a new OASIS System Account can be generated using the new email.", LogType.Error);
+                            else
+                            {
+                                //Make sure the OASISDNA is updated with the right id.
+                                OASISDNA.OASIS.OASISSystemAccountId = oasisSystemAccountResult.Result.Id.ToString();
+                                await OASISDNAManager.SaveDNAAsync(OASISDNAPath, OASISDNA);
+                            }
+                        }
                         else
                         {
-                            //LoggingManager.Log($"OASISSystemAccountId Not Found In OASISDNA So Generating Now...", LogType.Info, true, false, false, 1, true);
-                            LoggingManager.BeginLogAction($"OASISSystemAccountId Not Found In OASISDNA So Generating Now...", LogType.Info);
-
-                            //TODO: Later may need to actually create a avatar for this Id? So we can see which ids belong to OASIS SYSTEM Accounts outside of each ONODE (each ONODE has its own OASISDNA with its own system id's)
-                            //OASISDNA.OASIS.OASISSystemAccountId = Guid.NewGuid().ToString();
-                            //await OASISDNAManager.SaveDNAAsync(OASISDNAPath, OASISDNA);
+                            LoggingManager.EndLogAction($"DONE", LogType.Info);
+                            LoggingManager.BeginLogAction($"OASIS System Account Not Found So Generating For Email {OASISDNA.OASIS.Email.SmtpUser} Now...", LogType.Info);
 
                             //TODO: Need to make this more secure in future to prevent others creating similar accounts (but none will ever have AvatarType of System, this is the only place that can be created but we need to make sure a normal user accout is not hacked or changed to a system one. But currently it cannot do any harm because this system account is currently not used for anything, it simply creates the default OASIS Omniverse when STAR CLI first boots up on a running ONODE (before a avatar is created or logged in).
                             CLIEngine.SupressConsoleLogging = true;
@@ -248,7 +260,7 @@ public static async Task<OASISResult<bool>> BootOASISAsync(OASISDNA OASISDNA, bo
                                 await OASISDNAManager.SaveDNAAsync(OASISDNAPath, OASISDNA);
 
                                 LoggingManager.EndLogAction($"DONE", LogType.Info);
-                                LoggingManager.Log($"OASISSystemAccountId Generated: {OASISDNA.OASIS.OASISSystemAccountId}.", LogType.Info);
+                                LoggingManager.Log($"OASIS System Account Generated: Id: {avatarResult.Result.Id}, Name: {avatarResult.Result.Name}, Email: {avatarResult.Result.Email}, Username: {avatarResult.Result.Username}, Type: {avatarResult.Result.AvatarType.Name}.", LogType.Info);
                             }
                             else
                                 OASISErrorHandling.HandleError(ref result, $"Error Occured In OASISBootLoader.BootOASISAsync Calling AvatarManager.Instance.RegisterAsync Attempting To Create The OASISSystem Account. Reason: {avatarResult.Message}");

NextGenSoftware.OASIS.STAR.DNATemplates.OAPP.Console.DLL/Program.cs

@@ -21,7 +21,7 @@
 
     if (!holonsReuslt.IsError && holonsReuslt.Result != null)
     {
-        CLIEngine.ShowErrorMessage($"{holonsReuslt.Result.Count()} Child Holons Loaded.");
+        CLIEngine.ShowSuccessMessage($"{holonsReuslt.Result.Count()} Child Holons Loaded.");
         STARCLI.ShowHolons(holonsReuslt.Result);
     }
     else
@@ -64,8 +64,7 @@
         if (!loadHolonResult.IsError && loadHolonResult.Result != null)
         {
             holon = loadHolonResult.Result;
-            ShowHolon(saveHolonResult.Result, "saveHolonResult: Test Holon Loaded (Using Zome).");
-            ShowHolon(holon, "holon: Test Holon Loaded (Using Zome).");
+            ShowHolon(loadHolonResult.Result, "loadHolonResult: Test Holon Loaded (Using Zome).");
         }
         else
             CLIEngine.ShowErrorMessage($"Error Loading Holon (Using Zome). Reason: {loadHolonResult.Message}");
@@ -94,10 +93,7 @@
         OASISResult<{HOLON}> loadHolonResult = await zome.GlobalHolonData.LoadHolonAsync<{HOLON}> (holon.Id);
 
         if (!loadHolonResult.IsError && loadHolonResult.Result != null)
-        {
-            ShowHolon(saveHolonResult.Result, "saveHolonResult: Test Holon Loaded (Using Zome GlobalHolonData Generic SaveAsync).");
-            ShowHolon(holon, "holon: Test Holon Loaded (Using Zome GlobalHolonData Generic SaveAsync).");
-        }
+            ShowHolon(loadHolonResult.Result, "loadHolonResult: Test Holon Loaded (Using Zome GlobalHolonData Generic SaveAsync).");
         else
             CLIEngine.ShowErrorMessage($"Error Loading Holon (Using Zome GlobalHolonData Generic LoadAsync). Reason: {loadHolonResult.Message}");
     }
@@ -127,10 +123,7 @@
         OASISResult<IHolon> loadHolonResult = await zome.GlobalHolonData.LoadHolonAsync(holon.Id);
 
         if (!loadHolonResult.IsError && loadHolonResult.Result != null)
-        {
-            ShowHolon(saveGlobalHolonResult.Result, "saveGlobalHolonResult: Test Holon Loaded (Using Zome GlobalHolonData Standard SaveAsync).");
-            ShowHolon(holon, "holon: Test Holon Loaded (Using Zome GlobalHolonData Standard SaveAsync).");
-        }
+            ShowHolon(loadHolonResult.Result, "loadHolonResult: Test Holon Loaded (Using Zome GlobalHolonData Standard SaveAsync).");
         else
             CLIEngine.ShowErrorMessage($"Error Loading Holon (Using Zome GlobalHolonData Standard LoadAsync). Reason: {loadHolonResult.Message}");
     }
@@ -147,8 +140,8 @@
 
     //CelestialBodyOnly:{CELESTIALBODY} {CELESTIALBODYVAR} = new {CELESTIALBODY}();
     //CelestialBodyOnly:saveHolonResult = await {CELESTIALBODYVAR}.Save{HOLON}Async(holon);
-    //CelestialBodyOnly://saveHolonResult = await supermama.GlobalHolonData.SaveHolonAsync<{HOLON}>(holon); //Alternatively you can use the generic GlobalHolonData functions just like you could with the zome example above (GlobalHolonData is available on ALL COSMIC objects so includes CelestialBodies, CelesitalSpaces, Zomes & Holons).
-    //CelestialBodyOnly://saveGlobalHolonResult = await supermama.GlobalHolonData.SaveHolonAsync(holon);
+    //CelestialBodyOnly://saveHolonResult = await {CELESTIALBODY}.GlobalHolonData.SaveHolonAsync<{HOLON}>(holon); //Alternatively you can use the generic GlobalHolonData functions just like you could with the zome example above (GlobalHolonData is available on ALL COSMIC objects so includes CelestialBodies, CelesitalSpaces, Zomes & Holons).
+    //CelestialBodyOnly://saveGlobalHolonResult = await {CELESTIALBODY}.GlobalHolonData.SaveHolonAsync(holon);
 
     //CelestialBodyOnly:if (!saveHolonResult.IsError && saveHolonResult.Result != null)
     //CelestialBodyOnly:{
@@ -160,8 +153,7 @@
 
     //CelestialBodyOnly:if (!loadHolonResult.IsError && loadHolonResult.Result != null)
     //CelestialBodyOnly:{
-    //CelestialBodyOnly:ShowHolon(saveGlobalHolonResult.Result, "saveGlobalHolonResult: Test Holon Loaded (Using CelestialBody).");
-    //CelestialBodyOnly:ShowHolon(holon, "holon: Test Holon Loaded (Using CelestialBody).");
+    //CelestialBodyOnly:ShowHolon(loadHolonResult.Result, "loadHolonResult: Test Holon Loaded (Using CelestialBody).");
     //CelestialBodyOnly:}
     //CelestialBodyOnly:else
     //CelestialBodyOnly:CLIEngine.ShowErrorMessage($"Error Loading Holon (Using Zome GlobalHolonData Standard LoadAsync). Reason: {loadHolonResult.Message}");
@@ -192,10 +184,7 @@
         OASISResult<{HOLON}> loadHolonResult = await holon.LoadAsync<{HOLON}>();
 
         if (!loadHolonResult.IsError && loadHolonResult.Result != null)
-        {
-            ShowHolon(saveHolonResult.Result, "saveHolonResult: Test Holon Loaded (Using Holon).");
-            ShowHolon(holon, "holon: Test Holon Loaded (Using Holon).");
-        }
+            ShowHolon(loadHolonResult.Result, "loadHolonResult: Test Holon Loaded (Using Holon).");
         else
             CLIEngine.ShowErrorMessage($"Error Loading Holon (Using Holon). Reason: {loadHolonResult.Message}");
     }
@@ -227,10 +216,7 @@
         OASISResult<{HOLON}> loadHolonResult = await STAR.OASISAPI.Data.LoadHolonAsync<{HOLON}>(holon.Id);
 
         if (!loadHolonResult.IsError && loadHolonResult.Result != null)
-        {
-            ShowHolon(saveHolonResult.Result, "saveHolonResult: Test Holon Loaded (Using Data API).");
-            ShowHolon(holon, "holon: Test Holon Loaded (Using Data API).");
-        }
+            ShowHolon(loadHolonResult.Result, "loadHolonResult: Test Holon Loaded (Using Data API).");
         else
             CLIEngine.ShowErrorMessage($"Error Loading Holon (Using Data API). Reason: {loadHolonResult.Message}");
     }