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

refacts

Browse source
This commit is contained in:
Paul Schneider 2021-08-15 01:50:07 +01:00
commit ae114c68db
26 changed files with 99 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/isnd/Controllers/ApiKeysController.cs
View file

@ -21,18 +21,18 @@ namespace isn.Controllers
public class ApiKeysController : Controller
{
private readonly ApplicationDbContext dbContext;
private readonly NugetSettings nugetSettings;
private readonly IsndSettings isndSettings;
private readonly UserManager<ApplicationUser> _userManager;
private readonly IDataProtector protector;
public ApiKeysController(ApplicationDbContext dbContext,
IOptions<NugetSettings> nugetSettingsOptions,
IOptions<IsndSettings> isndSettingsOptions,
IDataProtectionProvider provider,
UserManager<ApplicationUser> userManager)
{
this.dbContext = dbContext;
this.nugetSettings = nugetSettingsOptions.Value;
protector = provider.CreateProtector(nugetSettings.ProtectionTitle);
this.isndSettings = isndSettingsOptions.Value;
protector = provider.CreateProtector(isndSettings.ProtectionTitle);
_userManager = userManager;
}
@ -59,7 +59,7 @@ namespace isn.Controllers
{
string userid = User.FindFirstValue(ClaimTypes.NameIdentifier);
IQueryable<ApiKey> userKeys = GetUserKeys();
if (userKeys.Count() >= nugetSettings.MaxUserKeyCount)
if (userKeys.Count() >= isndSettings.MaxUserKeyCount)
{
ModelState.AddModelError(null, "Maximum key count reached");
return View();

2
src/isnd/Controllers/PackagesController.Put.cs
View file

@ -71,7 +71,7 @@ namespace isn.Controllers
pkgid = reader.GetId();
version = reader.GetVersion();
string pkgidpath = Path.Combine(_nugetSettings.PackagesRootDir,
string pkgidpath = Path.Combine(_isndSettings.PackagesRootDir,
pkgid);
pkgpath = Path.Combine(pkgidpath, version.ToFullString());
string name = $"{pkgid}-{version}.nupkg";

12
src/isnd/Controllers/PackagesController.cs
View file

@ -32,7 +32,7 @@ namespace isn.Controllers
private readonly ILogger<PackagesController> _logger;
private readonly IDataProtector _protector;
private readonly NugetSettings _nugetSettings;
private readonly IsndSettings _isndSettings;
readonly ApplicationDbContext _dbContext;
private readonly PackageManager _packageManager;
private readonly IUnleash _unleashĈlient;
@ -40,13 +40,13 @@ namespace isn.Controllers
public PackagesController(
ILoggerFactory loggerFactory,
IDataProtectionProvider provider,
IOptions<NugetSettings> nugetOptions,
IOptions<IsndSettings> isndOptions,
IUnleash unleashĈlient,
ApplicationDbContext dbContext)
{
_logger = loggerFactory.CreateLogger<PackagesController>();
_nugetSettings = nugetOptions.Value;
_protector = provider.CreateProtector(_nugetSettings.ProtectionTitle);
_isndSettings = isndOptions.Value;
_protector = provider.CreateProtector(_isndSettings.ProtectionTitle);
_dbContext = dbContext;
_packageManager = new PackageManager(dbContext);
_unleashĈlient = unleashĈlient;
@ -158,7 +158,7 @@ namespace isn.Controllers
[FromRoute] string id, [FromRoute] string lower,
[FromRoute] string idf, [FromRoute] string lowerf)
{
var pkgpath = Path.Combine(_nugetSettings.PackagesRootDir,
var pkgpath = Path.Combine(_isndSettings.PackagesRootDir,
id, lower, $"{id}-{lower}.nupkg"
);
@ -180,7 +180,7 @@ namespace isn.Controllers
[FromRoute][SafeName][Required] string idf,
[FromRoute][SafeName][Required] string lowerf)
{
var pkgpath = Path.Combine(_nugetSettings.PackagesRootDir,
var pkgpath = Path.Combine(_isndSettings.PackagesRootDir,
id, lower, $"{id}.nuspec");
FileInfo pkgfi = new FileInfo(pkgpath);