Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

use secure Packages location for upgrade process

Browse Source
This commit is contained in:
Shaun Walker
2021-06-02 16:53:55 -04:00
parent 912b775553
commit 3db12a225b
9 changed files with 59 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Oqtane.Client/Modules/Admin/Upgrade/Index.razor
View File

@ -27,7 +27,7 @@
<Label HelpText="Upload a framework package and select Install to complete the installation" ResourceKey="Framework">Framework: </Label>
</td>
<td>
<FileManager Filter="nupkg" ShowFiles="false" Folder="Framework" />
<FileManager Filter="nupkg" ShowFiles="false" Folder="Packages" />
</td>
</tr>
</table>
@ -86,8 +86,9 @@
{
try
{
await PackageService.DownloadPackageAsync(packageid, version, "Framework");
ShowProgressIndicator();
await PackageService.DownloadPackageAsync(packageid, version, "Packages");
await PackageService.DownloadPackageAsync("Oqtane.Upgrade", version, "Packages");
var interop = new Interop(JSRuntime);
await interop.RedirectBrowser(NavigateUrl(), 10);
await InstallationService.Upgrade();

7
Oqtane.Client/Services/InstallationService.cs
View File

@ -9,12 +9,7 @@ namespace Oqtane.Services
[PrivateApi("Don't show in the documentation, as everything should use the Interface")]
public class InstallationService : ServiceBase, IInstallationService
{
private readonly SiteState _siteState;
public InstallationService(HttpClient http, SiteState siteState) : base(http)
{
_siteState = siteState;
}
public InstallationService(HttpClient http) : base(http) {}
private string ApiUrl => CreateApiUrl("Installation", null); // tenant agnostic as SiteState does not exist