notazof
/
isn
1
1
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

Compare commits

base: notazof:72839e8251297935a4ab138a99152733f07a23f2
Branches Tags
notazof:main
notazof:net6
notazof:fixed-page-index
notazof:broken/ef
notazof:1.1.0
notazof:1.0.1
notazof:1.0.0
...
compare: notazof:16258d1c3317e1b00f0b9f9593f9055b9b6ffdfe
Branches Tags
notazof:main
notazof:net6
notazof:fixed-page-index
notazof:broken/ef
notazof:1.1.0
notazof:1.0.1
notazof:1.0.0

2 Commits
72839e8251 ... 16258d1c33

Author SHA1 Message Date
Paul Schneider 16258d1c33 version bumps 7 months ago
Paul Schneider 019d858ac2 fixes the chown 7 months ago
9 changed files with 70 additions and 68 deletions
Show Stats

2
README.md
Unescape Escape View File

@ -85,5 +85,5 @@ sudo cp -a src/isnd/bin/Release/net7.0/publish/* /srv/www/isnd
sudo systemctl start isnd
# MAJ du client
sudo cp -a src/isn/bin/Release/net7.0/* /usr/local/lib/isn
sudo chown -R root.root /usr/local/lib/isn
sudo chown -R root:root /usr/local/lib/isn
````

2
src/isn.abst/isn.abst.csproj
Unescape Escape View File

@ -9,6 +9,6 @@
<InformationalVersion>1.0.7+Branch.main.Sha.3695c1742965d93eba0ad851656cfaa3e44ba327</InformationalVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>
</Project>

4
src/isn/Program.cs
Unescape Escape View File

@ -17,10 +17,6 @@ namespace isn
{
var json = File.ReadAllText(cfgSettingIf.FullName);
settings = JsonConvert.DeserializeObject<Settings>(json);
if (settings.DefaultSourceKey == null)
{
Settings.DefaultSourceKey = settings.Sources.Keys.FirstOrDefault();
}
CurrentSource = settings.DefaultSourceKey;
}
}

12
src/isn/Settings.cs
Unescape Escape View File

@ -12,6 +12,8 @@ namespace isn
/// Protected API Key
/// </summary>
/// <value></value>
public string ProtectedApiKey { get; set; }
public string ApiKey { get; set; }
/// <summary>
@ -22,19 +24,19 @@ namespace isn
public string GetClearApiKey()
{
return Protector.UnProtect(ApiKey);
if (!string.IsNullOrEmpty(ApiKey)) return ApiKey;
return ProtectedApiKey = Protector.UnProtect(ApiKey);
}
public void SetApiKey(string key)
{
ApiKey = Protector.Protect(key);
ApiKey = key;
ProtectedApiKey = Protector.Protect(key);
}
public static IDataProtector Protector { get; set; } = new DefaultDataProtector();
public static IDataProtector Protector { get; private set ; } = new DefaultDataProtector();
}
public class Settings
{
public string DataProtectionTitle { get; set; }

8
src/isn/isn.csproj
Unescape Escape View File

@ -15,11 +15,11 @@
<InformationalVersion>1.0.7+Branch.main.Sha.3695c1742965d93eba0ad851656cfaa3e44ba327</InformationalVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="Mono.Options" Version="5.3.0" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="unleash.client" Version="1.6.1" />
<PackageReference Include="GitVersion.MsBuild" Version="5.6.10*" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="unleash.client" Version="4.1.6" />
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0" />
<ProjectReference Include="../isn.abst/isn.abst.csproj" />
</ItemGroup>
</Project>

28
src/isnd/isnd.csproj
Unescape Escape View File

@ -13,32 +13,32 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="7.0.15" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="7.0.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.15">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.4" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.5" />
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.15" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.11" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.3" IncludeAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.15" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.11" IncludeAssets="All" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.15" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.15" />
<PackageReference Include="NuGet.Packaging.Core" Version="6.5.0" />
<PackageReference Include="MailKit" Version="3.6.0" />
<PackageReference Include="unleash.client" Version="2.4.3" />
<PackageReference Include="NuGet.Packaging.Core" Version="6.8.0" />
<PackageReference Include="MailKit" Version="4.3.0" />
<PackageReference Include="unleash.client" Version="4.1.6" />
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.1" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Antiforgery" Version="2.2.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.15" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="../isn.abst/isn.abst.csproj" />

1
test/isn.tests/PushTest.cs
Unescape Escape View File

@ -43,6 +43,7 @@ namespace isn.tests
Assert.NotNull(vm);
Assert.NotNull(vm.Resources);
}
[Fact]
public void TestPush()
{

9
test/isnd.tests/UnitTestWebHost.cs
Unescape Escape View File

@ -62,7 +62,8 @@ namespace isnd.host.tests
public void NugetInstallsTest()
{
using (var serviceScope = server.Host.Services.CreateScope())
{ var isnSettings = serviceScope.ServiceProvider.GetService<IOptions<isnd.Entities.IsndSettings>>().Value;
{
var isnSettings = serviceScope.ServiceProvider.GetService<IOptions<isnd.Entities.IsndSettings>>().Value;
string pkgSourceUrl = isnSettings.ExternalUrl + apiindex;
ProcessStartInfo psi = new ProcessStartInfo("nuget");
psi.ArgumentList.Add("install");
@ -80,7 +81,8 @@ namespace isnd.host.tests
public void TestRegistrationV3Resource()
{
using (var serviceScope = server.Host.Services.CreateScope())
{ var isnSettings = serviceScope.ServiceProvider.GetService<IOptions<isnd.Entities.IsndSettings>>().Value;
{
var isnSettings = serviceScope.ServiceProvider.GetService<IOptions<isnd.Entities.IsndSettings>>().Value;
string pkgSourceUrl = isnSettings.ExternalUrl + apiindex;
NullThrottle throttle = new NullThrottle();
@ -110,7 +112,8 @@ namespace isnd.host.tests
{
throw new NotImplementedException();
}
public string SPIIndexURI {
public string SPIIndexURI
{
get => server.Addresses.First() + "/v3/index";
}

10
test/isnd.tests/isnd.tests.csproj
Unescape Escape View File

@ -10,12 +10,12 @@
<Version>1.0.7</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="XunitXml.TestLogger" Version="3.0.70" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="XunitXml.TestLogger" Version="3.1.20" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
<PackageReference Include="xunit.runner.reporters" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.2" />
<PackageReference Include="xunit.runner.reporters" Version="2.6.6" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
<PackageToolReference Include="xunit.runner.console" Version="2.4.2" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>

Write Preview
Loading…