kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix WebAssembly startup alias handling

Browse Source
This commit is contained in:
sbwalker 2023-08-03 08:25:44 -04:00
parent edf955f4cd
commit d518860a34
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Oqtane.Client/Program.cs
View File

@ -1,9 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.IO.Compression; using System.IO.Compression;
using System.Linq; using System.Linq;
using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Reflection; using System.Reflection;
using System.Runtime.Loader; using System.Runtime.Loader;
@ -15,6 +17,7 @@ using Microsoft.AspNetCore.Localization;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.JSInterop; using Microsoft.JSInterop;
using Oqtane.Documentation; using Oqtane.Documentation;
using Oqtane.Models;
using Oqtane.Modules; using Oqtane.Modules;
using Oqtane.Services; using Oqtane.Services;
using Oqtane.UI; using Oqtane.UI;
@ -66,8 +69,13 @@ namespace Oqtane.Client
private static async Task LoadClientAssemblies(HttpClient http, IServiceProvider serviceProvider) private static async Task LoadClientAssemblies(HttpClient http, IServiceProvider serviceProvider)
{ {
// get alias
var navigationManager = serviceProvider.GetRequiredService<NavigationManager>(); var navigationManager = serviceProvider.GetRequiredService<NavigationManager>();
var urlpath = GetUrlPath(navigationManager.Uri); var urlpath = GetUrlPath(navigationManager.Uri);
var json = await http.GetStringAsync($"api/Installation/installed/?path={WebUtility.UrlEncode(urlpath)}");
var installation = JsonSerializer.Deserialize<Installation>(json, new JsonSerializerOptions(JsonSerializerDefaults.Web));
urlpath = installation.Alias.Path;
urlpath = (!string.IsNullOrEmpty(urlpath)) ? urlpath + "/" : urlpath;
var dlls = new Dictionary<string, byte[]>(); var dlls = new Dictionary<string, byte[]>();
var pdbs = new Dictionary<string, byte[]>(); var pdbs = new Dictionary<string, byte[]>();
@ -80,7 +88,7 @@ namespace Oqtane.Client
if (files.Count() != 0) if (files.Count() != 0)
{ {
// get list of assemblies from server // get list of assemblies from server
var json = await http.GetStringAsync($"{urlpath}api/Installation/list"); json = await http.GetStringAsync($"{urlpath}api/Installation/list");
var assemblies = JsonSerializer.Deserialize<List<string>>(json); var assemblies = JsonSerializer.Deserialize<List<string>>(json);
// determine which assemblies need to be downloaded // determine which assemblies need to be downloaded
@ -261,9 +269,7 @@ namespace Oqtane.Client
private static string GetUrlPath(string url) private static string GetUrlPath(string url)
{ {
var path = new Uri(url).AbsolutePath.Substring(1); return new Uri(url).AbsolutePath.Substring(1);
path = (!string.IsNullOrEmpty(path) && !path.EndsWith("/")) ? path + "/" : path;
return path;
} }
} }
} }