Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-31 12:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix warnings

Browse Source
This commit is contained in:
Zoe Roux 2023-07-25 19:26:08 +09:00
parent 31d8f5f7b9
commit 95ccceb259
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
back/src/Kyoo.Authentication/AuthenticationModule.cs
View File

@ -61,12 +61,12 @@ namespace Kyoo.Authentication
/// <inheritdoc /> /// <inheritdoc />
public void Configure(IServiceCollection services) public void Configure(IServiceCollection services)
{ {
string secret = _configuration.GetValue("AUTHENTICATION_SECRET", AuthenticationOption.DefaultSecret); string secret = _configuration.GetValue("AUTHENTICATION_SECRET", AuthenticationOption.DefaultSecret)!;
PermissionOption permissions = new() PermissionOption permissions = new()
{ {
Default = _configuration.GetValue("UNLOGGED_PERMISSIONS", "overall.read").Split(','), Default = _configuration.GetValue("UNLOGGED_PERMISSIONS", "overall.read")!.Split(','),
NewUser = _configuration.GetValue("DEFAULT_PERMISSIONS", "overall.read").Split(','), NewUser = _configuration.GetValue("DEFAULT_PERMISSIONS", "overall.read")!.Split(','),
ApiKeys = _configuration.GetValue("KYOO_APIKEYS", string.Empty).Split(','), ApiKeys = _configuration.GetValue("KYOO_APIKEYS", string.Empty)!.Split(','),
}; };
services.AddSingleton(permissions); services.AddSingleton(permissions);
services.AddSingleton(new AuthenticationOption() services.AddSingleton(new AuthenticationOption()

2
back/src/Kyoo.Authentication/Controllers/PermissionValidator.cs
View File

@ -198,7 +198,7 @@ namespace Kyoo.Authentication
{ {
if (!context.HttpContext.Request.Headers.TryGetValue("X-API-Key", out StringValues apiKey)) if (!context.HttpContext.Request.Headers.TryGetValue("X-API-Key", out StringValues apiKey))
return AuthenticateResult.NoResult(); return AuthenticateResult.NoResult();
if (!_options.ApiKeys.Contains<string>(apiKey)) if (!_options.ApiKeys.Contains<string>(apiKey!))
return AuthenticateResult.Fail("Invalid API-Key."); return AuthenticateResult.Fail("Invalid API-Key.");
return AuthenticateResult.Success( return AuthenticateResult.Success(
new AuthenticationTicket( new AuthenticationTicket(

2
back/tests/Kyoo.Tests/Database/RepositoryTests.cs
View File

@ -196,7 +196,7 @@ namespace Kyoo.Tests.Database
{ {
string slug = TestSample.Get<T>().Slug[2..4]; string slug = TestSample.Get<T>().Slug[2..4];
ICollection<T> ret = await _repository.GetAll(x => x.Slug.Contains(slug)); ICollection<T> ret = await _repository.GetAll(x => x.Slug.Contains(slug));
Assert.Equal(1, ret.Count); Assert.Single(ret);
KAssert.DeepEqual(TestSample.Get<T>(), ret.First()); KAssert.DeepEqual(TestSample.Get<T>(), ret.First());
} }

2
back/tests/Kyoo.Tests/Database/SpecificTests/LibraryTests.cs
View File

@ -91,7 +91,7 @@ namespace Kyoo.Tests.Database
await _repository.Create(library); await _repository.Create(library);
Library retrieved = await _repository.Get(2); Library retrieved = await _repository.Get(2);
await Repositories.LibraryManager.Load(retrieved, x => x.Providers); await Repositories.LibraryManager.Load(retrieved, x => x.Providers);
Assert.Equal(1, retrieved.Providers.Count); Assert.Single(retrieved.Providers);
Assert.Equal(TestSample.Get<Provider>().Slug, retrieved.Providers.First().Slug); Assert.Equal(TestSample.Get<Provider>().Slug, retrieved.Providers.First().Slug);
} }

6
back/tests/Kyoo.Tests/Database/SpecificTests/ShowTests.cs
View File

@ -316,7 +316,7 @@ namespace Kyoo.Tests.Database
.ThenInclude(x => x.Provider) .ThenInclude(x => x.Provider)
.FirstAsync(x => x.ID == created.ID); .FirstAsync(x => x.ID == created.ID);
KAssert.DeepEqual(expected, retrieved); KAssert.DeepEqual(expected, retrieved);
Assert.Equal(1, retrieved.ExternalIDs.Count); Assert.Single(retrieved.ExternalIDs);
Assert.Equal("ID", retrieved.ExternalIDs.First().DataID); Assert.Equal("ID", retrieved.ExternalIDs.First().DataID);
} }
@ -362,8 +362,8 @@ namespace Kyoo.Tests.Database
await Repositories.LibraryManager.Load(show, x => x.Seasons); await Repositories.LibraryManager.Load(show, x => x.Seasons);
await Repositories.LibraryManager.Load(show, x => x.Episodes); await Repositories.LibraryManager.Load(show, x => x.Episodes);
Assert.Equal(1, await _repository.GetCount()); Assert.Equal(1, await _repository.GetCount());
Assert.Equal(1, show.Seasons.Count); Assert.Single(show.Seasons);
Assert.Equal(1, show.Episodes.Count); Assert.Single(show.Episodes);
await _repository.Delete(show); await _repository.Delete(show);
Assert.Equal(0, await Repositories.LibraryManager.ShowRepository.GetCount()); Assert.Equal(0, await Repositories.LibraryManager.ShowRepository.GetCount());
Assert.Equal(0, await Repositories.LibraryManager.SeasonRepository.GetCount()); Assert.Equal(0, await Repositories.LibraryManager.SeasonRepository.GetCount());

2
back/tests/Kyoo.Tests/Utility/MergerTests.cs
View File

@ -414,7 +414,7 @@ namespace Kyoo.Tests.Utility
}; };
IDictionary<int, string> ret = Merger.CompleteDictionaries(first, second, out bool changed); IDictionary<int, string> ret = Merger.CompleteDictionaries(first, second, out bool changed);
Assert.True(changed); Assert.True(changed);
Assert.Equal(1, ret.Count); Assert.Single(ret);
Assert.Equal("new-poster", ret[Images.Poster]); Assert.Equal("new-poster", ret[Images.Poster]);
} }

12
shell.nix
View File

@ -10,8 +10,8 @@ in
nodePackages.expo-cli nodePackages.expo-cli
(with dotnetCorePackages; (with dotnetCorePackages;
combinePackages [ combinePackages [
sdk_6_0 sdk_7_0
aspnetcore_6_0 aspnetcore_7_0
]) ])
python3 python3
python3Packages.pip python3Packages.pip
@ -19,10 +19,10 @@ in
cargo-watch cargo-watch
rustfmt rustfmt
rustc rustc
pkgconfig pkgconfig
openssl openssl
mediainfo mediainfo
ffmpeg ffmpeg
]; ];
RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}"; RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";