- Added LaunchTarget to IOAPPDNA interface in OASIS.API.Core

dellams · dellams · commit 3d1dd7e807cf · 2024-10-04T14:29:53.000-04:00
- Added InstalledPath, InstalledOn &amp; InstalledBy to InstalledOAPP and IInstalledOAPP interface in OASIS.API.ONODE.Core.

- Updated InstallOAPPAsync and InstallOAPP overloads in OAPPManager in OASIS.API.ONODE.Core and now returns IInstalledOAPP instead of IOAPPDNA.

- Added net and installoapp commands to STAR CLI (ReadyPlayerOne and ShowCommands functions).

- Added InstallOAPPAsync, InstallOAPP, LaunchSTARNETAsync, LaunchSTARNET, ListAllOAPPsAsync &amp; ListAllOAPPs to STAR.CLI.Lib.
diff --git a/NextGenSoftware.OASIS.API.Core/Interfaces/IOAPPDNA.cs b/NextGenSoftware.OASIS.API.Core/Interfaces/IOAPPDNA.cs
@@ -22,6 +22,7 @@ public interface IOAPPDNA
         Guid PublishedByAvatarId { get; set; }
         DateTime PublishedOn { get; set; }
         bool PublishedOnSTARNET { get; set; }
+        public string LaunchTarget { get; set; }
         string Version { get; set; }
     }
 }
diff --git a/NextGenSoftware.OASIS.API.ONODE.Core/Holons/InstalledOAPP.cs b/NextGenSoftware.OASIS.API.ONODE.Core/Holons/InstalledOAPP.cs
@@ -1,12 +1,13 @@
-﻿using NextGenSoftware.OASIS.API.Core.Holons;
+﻿using System;
+using NextGenSoftware.OASIS.API.Core.Holons;
 using NextGenSoftware.OASIS.API.Core.Enums;
 using NextGenSoftware.OASIS.API.Core.CustomAttrbiutes;
 using NextGenSoftware.OASIS.API.ONode.Core.Interfaces.Holons;
 using NextGenSoftware.OASIS.API.Core.Interfaces;
 
 namespace NextGenSoftware.OASIS.API.ONode.Core.Holons
 {
-    public class InstalledOAPP : Holon, IInstalledOAPP
+    public class InstalledOAPP : Holon, IInstalledOAPP //TODO: Do we want to use Holon? What was the reason again?! ;-) Think so can be used with Data API and HolonManager?
     {
         public InstalledOAPP()
         {
@@ -16,6 +17,15 @@ public InstalledOAPP()
         [CustomOASISProperty]
         public IOAPPDNA OAPPDNA { get; set; }
 
+        [CustomOASISProperty]
+        public string InstalledPath { get; set; }
+
+        [CustomOASISProperty]
+        public DateTime InstalledOn { get; set; }
+
+        [CustomOASISProperty]
+        public Guid InstalledBy { get; set; }
+
         //[CustomOASISProperty]
         //public IOAPP OAPP { get; set; }
 
diff --git a/NextGenSoftware.OASIS.API.ONODE.Core/Interfaces/Holons/IInstalledOAPP.cs b/NextGenSoftware.OASIS.API.ONODE.Core/Interfaces/Holons/IInstalledOAPP.cs
@@ -1,11 +1,15 @@
-﻿using NextGenSoftware.OASIS.API.Core.Interfaces;
-using NextGenSoftware.OASIS.API.ONode.Core.Interfaces.Objects;
+﻿using System;
+using NextGenSoftware.OASIS.API.Core.Interfaces;
 
 namespace NextGenSoftware.OASIS.API.ONode.Core.Interfaces.Holons
 {
     public interface IInstalledOAPP : IHolon
     {
         IOAPPDNA OAPPDNA { get; set; }
+        public string InstalledPath { get; set; }
+        public DateTime InstalledOn { get; set; }
+        public Guid InstalledBy { get; set; }
+
         //IOAPP OAPP { get; set; }
         //Guid OAPPId { get; set; }
     }
diff --git a/NextGenSoftware.OASIS.API.ONODE.Core/Managers/OAPPManager.cs b/NextGenSoftware.OASIS.API.ONODE.Core/Managers/OAPPManager.cs
@@ -661,9 +661,9 @@ public OASISResult<IOAPPDNA> UnPublishOAPP(Guid OAPPId, ProviderType providerTyp
         //    return result;
         //}
 
-        public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)
+        public async Task<OASISResult<IInstalledOAPP>> InstallOAPPAsync(Guid avatarId, string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)
         {
-            OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();
+            OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();
             string errorMessage = "Error occured in OAPPManager.InstallOAPPAsync. Reason: ";
 
             try
@@ -674,13 +674,20 @@ public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(string fullPathToPubli
 
                 if (OAPPDNA != null)
                 {
-                    InstalledOAPP installedOAPP = new InstalledOAPP() { OAPPDNA = OAPPDNA };
+                    InstalledOAPP installedOAPP = new InstalledOAPP() 
+                    { 
+                        OAPPDNA = OAPPDNA,
+                        InstalledBy = avatarId,
+                        InstalledOn = DateTime.Now,
+                        InstalledPath = fullInstallPath
+                    };
+
                     OASISResult<IHolon> saveResult = await installedOAPP.SaveAsync();
 
                     if (saveResult != null && saveResult.Result != null && !saveResult.IsError)
                     {
                         result.Message = "OAPP Installed";
-                        result.Result = OAPPDNA;
+                        result.Result = installedOAPP;
                     }
                     else
                         OASISErrorHandling.HandleError(ref result, $"{errorMessage} Error occured calling SaveAsync method. Reason: {saveResult.Message}");
@@ -694,9 +701,9 @@ public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(string fullPathToPubli
             return result;
         }
 
-        public OASISResult<IOAPPDNA> InstallOAPP(string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)
+        public OASISResult<IInstalledOAPP> InstallOAPP(Guid avatarId, string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)
         {
-            OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();
+            OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();
             string errorMessage = "Error occured in OAPPManager.InstallOAPP. Reason: ";
 
             try
@@ -707,13 +714,20 @@ public OASISResult<IOAPPDNA> InstallOAPP(string fullPathToPublishedOAPPFile, str
 
                 if (OAPPDNA != null)
                 {
-                    InstalledOAPP installedOAPP = new InstalledOAPP() { OAPPDNA = OAPPDNA };
+                    InstalledOAPP installedOAPP = new InstalledOAPP()
+                    {
+                        OAPPDNA = OAPPDNA,
+                        InstalledBy = avatarId,
+                        InstalledOn = DateTime.Now,
+                        InstalledPath = fullInstallPath
+                    };
+
                     OASISResult<IHolon> saveResult = installedOAPP.Save();
 
                     if (saveResult != null && saveResult.Result != null && !saveResult.IsError)
                     {
                         result.Message = "OAPP Installed";
-                        result.Result = OAPPDNA;
+                        result.Result = installedOAPP;
                     }
                     else
                         OASISErrorHandling.HandleError(ref result, $"{errorMessage} Error occured calling Save method. Reason: {saveResult.Message}");
@@ -727,16 +741,16 @@ public OASISResult<IOAPPDNA> InstallOAPP(string fullPathToPublishedOAPPFile, str
             return result;
         }
 
-        public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)
+        public async Task<OASISResult<IInstalledOAPP>> InstallOAPPAsync(Guid avatarId, IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)
         {
-            OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();
+            OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();
             string errorMessage = "Error occured in OAPPManager.InstallOAPPAsync. Reason: ";
 
             try
             {
                 string OAPPPath = Path.Combine("temp", OAPP.Name, ".oapp");
                 await File.WriteAllBytesAsync(OAPPPath, OAPP.PublishedOAPP);
-                result = await InstallOAPPAsync(OAPPPath, fullInstallPath, providerType);
+                result = await InstallOAPPAsync(avatarId, OAPPPath, fullInstallPath, providerType);
             }
             catch (Exception ex)
             {
@@ -746,16 +760,16 @@ public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(IOAPP OAPP, string ful
             return result;
         }
 
-        public OASISResult<IOAPPDNA> InstallOAPP(IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)
+        public OASISResult<IInstalledOAPP> InstallOAPP(Guid avatarId, IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)
         {
-            OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();
+            OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();
             string errorMessage = "Error occured in OAPPManager.InstallOAPP. Reason: ";
 
             try
             {
                 string OAPPPath = Path.Combine("temp", OAPP.Name, ".oapp");
                 File.WriteAllBytes(OAPPPath, OAPP.PublishedOAPP);
-                result = InstallOAPP(OAPPPath, fullInstallPath, providerType);
+                result = InstallOAPP(avatarId, OAPPPath, fullInstallPath, providerType);
             }
             catch (Exception ex)
             {
@@ -765,26 +779,26 @@ public OASISResult<IOAPPDNA> InstallOAPP(IOAPP OAPP, string fullInstallPath, Pro
             return result;
         }
 
-        public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)
+        public async Task<OASISResult<IInstalledOAPP>> InstallOAPPAsync(Guid avatarId, Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)
         {
-            OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();
+            OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();
             OASISResult<IOAPP> OAPPResult = await LoadOAPPAsync(OAPPId, providerType);
 
             if (OAPPResult != null && !OAPPResult.IsError && OAPPResult.Result != null)
-                result = await InstallOAPPAsync(OAPPResult.Result, fullInstallPath, providerType);
+                result = await InstallOAPPAsync(avatarId, OAPPResult.Result, fullInstallPath, providerType);
             else
                 OASISErrorHandling.HandleError(ref result, $"Error occured in OAPPManager.InstallOAPPAsync loading the OAPP with the LoadOAPPAsync method, reason: {result.Message}");
 
             return result;
         }
 
-        public OASISResult<IOAPPDNA> InstallOAPP(Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)
+        public OASISResult<IInstalledOAPP> InstallOAPP(Guid avatarId, Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)
         {
-            OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();
+            OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();
             OASISResult<IOAPP> OAPPResult = LoadOAPP(OAPPId, providerType);
 
             if (OAPPResult != null && !OAPPResult.IsError && OAPPResult.Result != null)
-                result = InstallOAPP(OAPPResult.Result, fullInstallPath, providerType);
+                result = InstallOAPP(avatarId, OAPPResult.Result, fullInstallPath, providerType);
             else
                 OASISErrorHandling.HandleError(ref result, $"Error occured in OAPPManager.InstallOAPP loading the OAPP with the LoadOAPP method, reason: {result.Message}");
 
diff --git a/NextGenSoftware.OASIS.STAR.CLI.Lib/STARCLI.cs b/NextGenSoftware.OASIS.STAR.CLI.Lib/STARCLI.cs
diff --git a/NextGenSoftware.OASIS.STAR.CLI/Program.cs b/NextGenSoftware.OASIS.STAR.CLI/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public interface IOAPPDNA`
`22`	`22`	`Guid PublishedByAvatarId { get; set; }`
`23`	`23`	`DateTime PublishedOn { get; set; }`
`24`	`24`	`bool PublishedOnSTARNET { get; set; }`
	`25`	`+ public string LaunchTarget { get; set; }`
`25`	`26`	`string Version { get; set; }`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,15 @@`
`1`		`-using NextGenSoftware.OASIS.API.Core.Interfaces;`
`2`		`-using NextGenSoftware.OASIS.API.ONode.Core.Interfaces.Objects;`
	`1`	`+using System;`
	`2`	`+using NextGenSoftware.OASIS.API.Core.Interfaces;`
`3`	`3`
`4`	`4`	`namespace NextGenSoftware.OASIS.API.ONode.Core.Interfaces.Holons`
`5`	`5`	`{`
`6`	`6`	`public interface IInstalledOAPP : IHolon`
`7`	`7`	`{`
`8`	`8`	`IOAPPDNA OAPPDNA { get; set; }`
	`9`	`+ public string InstalledPath { get; set; }`
	`10`	`+ public DateTime InstalledOn { get; set; }`
	`11`	`+ public Guid InstalledBy { get; set; }`
	`12`	`+`
`9`	`13`	`//IOAPP OAPP { get; set; }`
`10`	`14`	`//Guid OAPPId { get; set; }`
`11`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -661,9 +661,9 @@ public OASISResult<IOAPPDNA> UnPublishOAPP(Guid OAPPId, ProviderType providerTyp`
`661`	`661`	`// return result;`
`662`	`662`	`//}`
`663`	`663`
`664`		`- public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
	`664`	`+ public async Task<OASISResult<IInstalledOAPP>> InstallOAPPAsync(Guid avatarId, string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
`665`	`665`	`{`
`666`		`- OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();`
	`666`	`+ OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();`
`667`	`667`	`string errorMessage = "Error occured in OAPPManager.InstallOAPPAsync. Reason: ";`
`668`	`668`
`669`	`669`	`try`
`@@ -674,13 +674,20 @@ public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(string fullPathToPubli`
`674`	`674`
`675`	`675`	`if (OAPPDNA != null)`
`676`	`676`	`{`
`677`		`- InstalledOAPP installedOAPP = new InstalledOAPP() { OAPPDNA = OAPPDNA };`
	`677`	`+ InstalledOAPP installedOAPP = new InstalledOAPP()`
	`678`	`+ {`
	`679`	`+ OAPPDNA = OAPPDNA,`
	`680`	`+ InstalledBy = avatarId,`
	`681`	`+ InstalledOn = DateTime.Now,`
	`682`	`+ InstalledPath = fullInstallPath`
	`683`	`+ };`
	`684`	`+`
`678`	`685`	`OASISResult<IHolon> saveResult = await installedOAPP.SaveAsync();`
`679`	`686`
`680`	`687`	`if (saveResult != null && saveResult.Result != null && !saveResult.IsError)`
`681`	`688`	`{`
`682`	`689`	`result.Message = "OAPP Installed";`
`683`		`- result.Result = OAPPDNA;`
	`690`	`+ result.Result = installedOAPP;`
`684`	`691`	`}`
`685`	`692`	`else`
`686`	`693`	`OASISErrorHandling.HandleError(ref result, $"{errorMessage} Error occured calling SaveAsync method. Reason: {saveResult.Message}");`
`@@ -694,9 +701,9 @@ public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(string fullPathToPubli`
`694`	`701`	`return result;`
`695`	`702`	`}`
`696`	`703`
`697`		`- public OASISResult<IOAPPDNA> InstallOAPP(string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
	`704`	`+ public OASISResult<IInstalledOAPP> InstallOAPP(Guid avatarId, string fullPathToPublishedOAPPFile, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
`698`	`705`	`{`
`699`		`- OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();`
	`706`	`+ OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();`
`700`	`707`	`string errorMessage = "Error occured in OAPPManager.InstallOAPP. Reason: ";`
`701`	`708`
`702`	`709`	`try`
`@@ -707,13 +714,20 @@ public OASISResult<IOAPPDNA> InstallOAPP(string fullPathToPublishedOAPPFile, str`
`707`	`714`
`708`	`715`	`if (OAPPDNA != null)`
`709`	`716`	`{`
`710`		`- InstalledOAPP installedOAPP = new InstalledOAPP() { OAPPDNA = OAPPDNA };`
	`717`	`+ InstalledOAPP installedOAPP = new InstalledOAPP()`
	`718`	`+ {`
	`719`	`+ OAPPDNA = OAPPDNA,`
	`720`	`+ InstalledBy = avatarId,`
	`721`	`+ InstalledOn = DateTime.Now,`
	`722`	`+ InstalledPath = fullInstallPath`
	`723`	`+ };`
	`724`	`+`
`711`	`725`	`OASISResult<IHolon> saveResult = installedOAPP.Save();`
`712`	`726`
`713`	`727`	`if (saveResult != null && saveResult.Result != null && !saveResult.IsError)`
`714`	`728`	`{`
`715`	`729`	`result.Message = "OAPP Installed";`
`716`		`- result.Result = OAPPDNA;`
	`730`	`+ result.Result = installedOAPP;`
`717`	`731`	`}`
`718`	`732`	`else`
`719`	`733`	`OASISErrorHandling.HandleError(ref result, $"{errorMessage} Error occured calling Save method. Reason: {saveResult.Message}");`
`@@ -727,16 +741,16 @@ public OASISResult<IOAPPDNA> InstallOAPP(string fullPathToPublishedOAPPFile, str`
`727`	`741`	`return result;`
`728`	`742`	`}`
`729`	`743`
`730`		`- public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
	`744`	`+ public async Task<OASISResult<IInstalledOAPP>> InstallOAPPAsync(Guid avatarId, IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
`731`	`745`	`{`
`732`		`- OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();`
	`746`	`+ OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();`
`733`	`747`	`string errorMessage = "Error occured in OAPPManager.InstallOAPPAsync. Reason: ";`
`734`	`748`
`735`	`749`	`try`
`736`	`750`	`{`
`737`	`751`	`string OAPPPath = Path.Combine("temp", OAPP.Name, ".oapp");`
`738`	`752`	`await File.WriteAllBytesAsync(OAPPPath, OAPP.PublishedOAPP);`
`739`		`- result = await InstallOAPPAsync(OAPPPath, fullInstallPath, providerType);`
	`753`	`+ result = await InstallOAPPAsync(avatarId, OAPPPath, fullInstallPath, providerType);`
`740`	`754`	`}`
`741`	`755`	`catch (Exception ex)`
`742`	`756`	`{`
`@@ -746,16 +760,16 @@ public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(IOAPP OAPP, string ful`
`746`	`760`	`return result;`
`747`	`761`	`}`
`748`	`762`
`749`		`- public OASISResult<IOAPPDNA> InstallOAPP(IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
	`763`	`+ public OASISResult<IInstalledOAPP> InstallOAPP(Guid avatarId, IOAPP OAPP, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
`750`	`764`	`{`
`751`		`- OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();`
	`765`	`+ OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();`
`752`	`766`	`string errorMessage = "Error occured in OAPPManager.InstallOAPP. Reason: ";`
`753`	`767`
`754`	`768`	`try`
`755`	`769`	`{`
`756`	`770`	`string OAPPPath = Path.Combine("temp", OAPP.Name, ".oapp");`
`757`	`771`	`File.WriteAllBytes(OAPPPath, OAPP.PublishedOAPP);`
`758`		`- result = InstallOAPP(OAPPPath, fullInstallPath, providerType);`
	`772`	`+ result = InstallOAPP(avatarId, OAPPPath, fullInstallPath, providerType);`
`759`	`773`	`}`
`760`	`774`	`catch (Exception ex)`
`761`	`775`	`{`
`@@ -765,26 +779,26 @@ public OASISResult<IOAPPDNA> InstallOAPP(IOAPP OAPP, string fullInstallPath, Pro`
`765`	`779`	`return result;`
`766`	`780`	`}`
`767`	`781`
`768`		`- public async Task<OASISResult<IOAPPDNA>> InstallOAPPAsync(Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
	`782`	`+ public async Task<OASISResult<IInstalledOAPP>> InstallOAPPAsync(Guid avatarId, Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
`769`	`783`	`{`
`770`		`- OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();`
	`784`	`+ OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();`
`771`	`785`	`OASISResult<IOAPP> OAPPResult = await LoadOAPPAsync(OAPPId, providerType);`
`772`	`786`
`773`	`787`	`if (OAPPResult != null && !OAPPResult.IsError && OAPPResult.Result != null)`
`774`		`- result = await InstallOAPPAsync(OAPPResult.Result, fullInstallPath, providerType);`
	`788`	`+ result = await InstallOAPPAsync(avatarId, OAPPResult.Result, fullInstallPath, providerType);`
`775`	`789`	`else`
`776`	`790`	`OASISErrorHandling.HandleError(ref result, $"Error occured in OAPPManager.InstallOAPPAsync loading the OAPP with the LoadOAPPAsync method, reason: {result.Message}");`
`777`	`791`
`778`	`792`	`return result;`
`779`	`793`	`}`
`780`	`794`
`781`		`- public OASISResult<IOAPPDNA> InstallOAPP(Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
	`795`	`+ public OASISResult<IInstalledOAPP> InstallOAPP(Guid avatarId, Guid OAPPId, string fullInstallPath, ProviderType providerType = ProviderType.Default)`
`782`	`796`	`{`
`783`		`- OASISResult<IOAPPDNA> result = new OASISResult<IOAPPDNA>();`
	`797`	`+ OASISResult<IInstalledOAPP> result = new OASISResult<IInstalledOAPP>();`
`784`	`798`	`OASISResult<IOAPP> OAPPResult = LoadOAPP(OAPPId, providerType);`
`785`	`799`
`786`	`800`	`if (OAPPResult != null && !OAPPResult.IsError && OAPPResult.Result != null)`
`787`		`- result = InstallOAPP(OAPPResult.Result, fullInstallPath, providerType);`
	`801`	`+ result = InstallOAPP(avatarId, OAPPResult.Result, fullInstallPath, providerType);`
`788`	`802`	`else`
`789`	`803`	`OASISErrorHandling.HandleError(ref result, $"Error occured in OAPPManager.InstallOAPP loading the OAPP with the LoadOAPP method, reason: {result.Message}");`
`790`	`804`