Compare commits
2 Commits
93836ae243
...
86cf3a6bbb
Author | SHA1 | Date | |
---|---|---|---|
86cf3a6bbb | |||
ed268bf322 |
@ -27,13 +27,13 @@
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
|
||||
<PackageReference Include="LinqKit" Version="1.3.8" />
|
||||
<PackageReference Include="MailKit" Version="4.11.0" />
|
||||
<PackageReference Include="MailKit" Version="4.12.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.36" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="9.0.4" />
|
||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.4" />
|
||||
<PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="9.0.4" />
|
||||
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.3179.45" />
|
||||
<PackageReference Include="NJsonSchema" Version="11.2.0" />
|
||||
<PackageReference Include="NJsonSchema" Version="11.3.2" />
|
||||
<PackageReference Include="PdfiumViewer" Version="2.13.0" />
|
||||
<PackageReference Include="PdfiumViewer.Native.x86_64.no_v8-no_xfa" Version="2018.4.8.256" />
|
||||
<PackageReference Include="RazorLight" Version="2.3.1" />
|
||||
|
@ -434,8 +434,7 @@ namespace Elwig.Helpers {
|
||||
if (accept != null)
|
||||
client.DefaultRequestHeaders.Accept.Add(new(accept));
|
||||
if (username != null || password != null)
|
||||
client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(
|
||||
Utils.UTF8.GetBytes($"{username}:{password}")));
|
||||
client.DefaultRequestHeaders.Authorization = new("Basic", Convert.ToBase64String(Utils.UTF8.GetBytes($"{username}:{password}")));
|
||||
return client;
|
||||
}
|
||||
|
||||
@ -454,6 +453,8 @@ namespace Elwig.Helpers {
|
||||
}
|
||||
|
||||
public static async Task UploadExportData(string zip, string url, string username, string password) {
|
||||
if (url.StartsWith("https://elwig.at/clients/"))
|
||||
url = "https://sync.elwig.at/" + url[25..];
|
||||
if (!url.EndsWith('/')) url += "/";
|
||||
using var client = GetHttpClient(username, password, accept: "application/json");
|
||||
var content = new StreamContent(new FileStream(zip, FileMode.Open, FileAccess.Read));
|
||||
@ -463,6 +464,8 @@ namespace Elwig.Helpers {
|
||||
}
|
||||
|
||||
public static async Task<JsonArray> GetExportMetaData(string url, string username, string password) {
|
||||
if (url.StartsWith("https://elwig.at/clients/"))
|
||||
url = "https://sync.elwig.at/" + url[25..];
|
||||
using var client = GetHttpClient(username, password, accept: "application/json");
|
||||
using var res = await client.GetAsync(url);
|
||||
res.EnsureSuccessStatusCode();
|
||||
|
Reference in New Issue
Block a user