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

upgrade notes

Browse source
This commit is contained in:
Paul Schneider 2021-07-12 03:23:11 +01:00
commit 1aef7ce614
4 changed files with 41 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,7 +20,7 @@ namespace isn.Controllers
public partial class PackagesController
{
[HttpPut("packages")]
[HttpPut(_pkgRootPrefix)]
public async Task<IActionResult> Put()
{
try
@ -31,11 +31,11 @@ namespace isn.Controllers
var files = new List<string>();
ViewData["files"] = files;
var clearkey = protector.Unprotect(apiKey);
var apikey = dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
var clearkey = _protector.Unprotect(apiKey);
var apikey = _dbContext.ApiKeys.SingleOrDefault(k => k.Id == clearkey);
if (apikey == null)
{
logger.LogError("403 : no api-key");
_logger.LogError("403 : no api-key");
return Unauthorized();
}
@ -70,14 +70,14 @@ namespace isn.Controllers
pkgid = reader.GetId();
version = reader.GetVersion();
string pkgidpath = Path.Combine(nugetSettings.PackagesRootDir,
string pkgidpath = Path.Combine(_nugetSettings.PackagesRootDir,
pkgid);
pkgpath = Path.Combine(pkgidpath, version.ToFullString());
string name = $"{pkgid}-{version}.nupkg";
fullpath = Path.Combine(pkgpath, name);
var destpkgiddir = new DirectoryInfo(pkgidpath);
Package package = dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
Package package = _dbContext.Packages.SingleOrDefault(p => p.Id == pkgid);
if (package != null)
{
if (package.OwnerId != apikey.UserId)
@ -94,7 +94,7 @@ namespace isn.Controllers
Description = pkgdesc,
OwnerId = apikey.UserId
};
dbContext.Packages.Add(package);
_dbContext.Packages.Add(package);
}
if (!destpkgiddir.Exists) destpkgiddir.Create();
@ -105,7 +105,7 @@ namespace isn.Controllers
{
ViewData["msg"] = "existant";
ViewData["ecode"] = 1;
logger.LogWarning("400 : existant");
_logger.LogWarning("400 : existant");
return base.BadRequest(new { error = ModelState });
}
else
@ -114,12 +114,12 @@ namespace isn.Controllers
source.MoveTo(fullpath);
files.Add(name);
string fullstringversion = version.ToFullString();
var pkgvers = dbContext.PackageVersions.Where
var pkgvers = _dbContext.PackageVersions.Where
(v => v.PackageId == package.Id && v.FullString == fullstringversion);
if (pkgvers.Count() > 0)
{
foreach (var v in pkgvers.ToArray())
dbContext.PackageVersions.Remove(v);
_dbContext.PackageVersions.Remove(v);
}
foreach (var type in types)
{
@ -133,11 +133,11 @@ namespace isn.Controllers
FullString = version.ToFullString(),
Type = type.Name
};
dbContext.PackageVersions.Add(pkgver);
_dbContext.PackageVersions.Add(pkgver);
}
await dbContext.SaveChangesAsync();
await _dbContext.SaveChangesAsync();
logger.LogInformation($"new package : {nuspec.Name}");
_logger.LogInformation($"new package : {nuspec.Name}");
}
}
using (var shacrypto = System.Security.Cryptography.SHA512.Create())
@ -163,8 +163,8 @@ namespace isn.Controllers
}
catch (Exception ex)
{
logger.LogError(ex.Message);
logger.LogError("Stack Trace: " + ex.StackTrace);
_logger.LogError(ex.Message);
_logger.LogError("Stack Trace: " + ex.StackTrace);
return new ObjectResult(new { ViewData, ex.Message })
{ StatusCode = 500 };
}