aboutsummaryrefslogtreecommitdiff
path: root/backend/api
diff options
context:
space:
mode:
Diffstat (limited to 'backend/api')
-rw-r--r--backend/api/api/Controllers/FileController.cs20
-rw-r--r--backend/api/api/Controllers/ModelController.cs14
-rw-r--r--backend/api/api/Models/FileModel.cs2
-rw-r--r--backend/api/api/Services/FileService.cs4
-rw-r--r--backend/api/api/Services/TempRemovalService.cs2
-rw-r--r--backend/api/api/Services/UserService.cs2
6 files changed, 27 insertions, 17 deletions
diff --git a/backend/api/api/Controllers/FileController.cs b/backend/api/api/Controllers/FileController.cs
index 89b4e473..0fe8415b 100644
--- a/backend/api/api/Controllers/FileController.cs
+++ b/backend/api/api/Controllers/FileController.cs
@@ -29,7 +29,7 @@ namespace api.Controllers
{
//get username from jwtToken
- string username;
+ string uploaderId;
string folderName;
var header = Request.Headers[HeaderNames.Authorization];
if (AuthenticationHeaderValue.TryParse(header, out var headerValue))
@@ -37,12 +37,12 @@ namespace api.Controllers
var scheme = headerValue.Scheme;
var parameter = headerValue.Parameter;
- username = _token.TokenToUsername(parameter);
- if (username == null)
+ uploaderId = _token.TokenToId(parameter);
+ if (uploaderId == null)
return null;
}else
return BadRequest();
- if (username == "")
+ if (uploaderId == "")
{
folderName = "TempFiles";
}
@@ -59,7 +59,7 @@ namespace api.Controllers
if (string.IsNullOrEmpty(ext) || ! permittedExtensions.Contains(ext)) {
return BadRequest("Wrong file type");
}
- var folderPath=Path.Combine(Directory.GetCurrentDirectory(),folderName, username);
+ var folderPath=Path.Combine(Directory.GetCurrentDirectory(),folderName, uploaderId);
//Check Directory
if (!Directory.Exists(folderPath))
{
@@ -82,7 +82,7 @@ namespace api.Controllers
}
FileModel fileModel= new FileModel();
fileModel.path=fullPath;
- fileModel.username=username;
+ fileModel.uploaderId= uploaderId;
fileModel.date = DateTime.Now.ToUniversalTime();
fileModel =_fileservice.Create(fileModel);
@@ -95,21 +95,21 @@ namespace api.Controllers
public async Task<ActionResult> DownloadFile(string id)
{
//Get Username
- string username;
+ string uploaderId;
var header = Request.Headers[HeaderNames.Authorization];
if (AuthenticationHeaderValue.TryParse(header, out var headerValue))
{
var scheme = headerValue.Scheme;
var parameter = headerValue.Parameter;
- username = _token.TokenToUsername(parameter);
- if (username == null)
+ uploaderId = _token.TokenToId(parameter);
+ if (uploaderId == null)
return null;
}
else
return BadRequest();
- string filePath = _fileservice.GetFilePath(id, username);
+ string filePath = _fileservice.GetFilePath(id, uploaderId);
if (filePath == null)
return BadRequest();
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index d8bc1515..210d37c8 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -33,8 +33,20 @@ namespace api.Controllers
[Authorize(Roles = "User,Guest")]
public async Task<ActionResult<string>> Test([FromBody] Model model)
{
+ string uploaderId;
+ var header = Request.Headers[HeaderNames.Authorization];
+ if (AuthenticationHeaderValue.TryParse(header, out var headerValue))
+ {
+ var scheme = headerValue.Scheme;
+ var parameter = headerValue.Parameter;
+ uploaderId = jwtToken.TokenToId(parameter);
+ if (uploaderId == null)
+ return null;
+ }
+ else
+ return BadRequest();
var dataset = _datasetService.GetOneDataset(model.datasetId);
- var filepath = _fileService.GetFilePath(dataset.fileId, dataset.username);
+ var filepath = _fileService.GetFilePath(dataset.fileId, uploaderId);
var result = await _mlService.SendModelAsync(model, filepath);
return Ok(result);
}
diff --git a/backend/api/api/Models/FileModel.cs b/backend/api/api/Models/FileModel.cs
index 30211372..1043309d 100644
--- a/backend/api/api/Models/FileModel.cs
+++ b/backend/api/api/Models/FileModel.cs
@@ -8,7 +8,7 @@ namespace api.Models
[BsonId]
[BsonRepresentation(BsonType.ObjectId)]
public string _id { get; set; }
- public string username { get; set; }
+ public string uploaderId { get; set; }
public string path { get; set; }
[BsonDateTimeOptions(Kind = DateTimeKind.Utc)]
public DateTime date { get; set; }
diff --git a/backend/api/api/Services/FileService.cs b/backend/api/api/Services/FileService.cs
index c5759953..24491124 100644
--- a/backend/api/api/Services/FileService.cs
+++ b/backend/api/api/Services/FileService.cs
@@ -25,13 +25,13 @@ namespace api.Services
return file;
}
- public string GetFilePath(string id, string username)
+ public string GetFilePath(string id, string uploaderId)
{
FileModel file;
if (_dataset.Find(x=>x.fileId==id && x.isPublic==true).FirstOrDefault()!=null)
file = _file.Find(x => x._id == id).FirstOrDefault();
else
- file = _file.Find(x => x._id == id && x.username == username).FirstOrDefault();
+ file = _file.Find(x => x._id == id && x.uploaderId == uploaderId).FirstOrDefault();
if (file == null)
return null;
return file.path;
diff --git a/backend/api/api/Services/TempRemovalService.cs b/backend/api/api/Services/TempRemovalService.cs
index 342304f0..9741ace2 100644
--- a/backend/api/api/Services/TempRemovalService.cs
+++ b/backend/api/api/Services/TempRemovalService.cs
@@ -19,7 +19,7 @@ namespace api.Services
}
public void DeleteTemps()
{
- List<FileModel> files = _file.Find(file => file.username == "").ToList();
+ List<FileModel> files = _file.Find(file => file.uploaderId == "").ToList();
foreach (var file in files)
{
if ((DateTime.Now.ToUniversalTime() - file.date).TotalDays >= 1)
diff --git a/backend/api/api/Services/UserService.cs b/backend/api/api/Services/UserService.cs
index 39b3a8d3..7ec6f4b2 100644
--- a/backend/api/api/Services/UserService.cs
+++ b/backend/api/api/Services/UserService.cs
@@ -65,11 +65,9 @@ namespace api.Services
{
var builderModel = Builders<Model>.Update;
var builderDataset = Builders<Dataset>.Update;
- var builderFileModel = Builders<FileModel>.Update;
var builderPredictor = Builders<Predictor>.Update;
_models.UpdateMany(x => x.username == username, builderModel.Set(x => x.username, user.Username));
_datasets.UpdateMany(x => x.username == username, builderDataset.Set(x => x.username, user.Username));
- _fileModels.UpdateMany(x => x.username == username, builderFileModel.Set(x => x.username, user.Username));
_predictors.UpdateMany(x => x.username == username, builderPredictor.Set(x => x.username, user.Username));
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-20 10:28:03 +0000