Mergovane grane za guest-Korisnik-Ispravka i redesign. Sredjeni konflikti.

8 files changed, 69 insertions, 50 deletions

diff --git a/backend/api/api/Controllers/AuthController.cs b/backend/api/api/Controllers/AuthController.cs
index 901454e1..df8a514c 100644
--- a/backend/api/api/Controllers/AuthController.cs
+++ b/backend/api/api/Controllers/AuthController.cs
@@ -45,7 +45,7 @@ namespace api.Controllers
         }
 
         [HttpPost("renewJwt")]
-        [Authorize(Roles = "User")]
+        [Authorize(Roles = "User,Guest")]
         public async Task<ActionResult<string>> RenewJwt() {
             var authorization = Request.Headers[HeaderNames.Authorization];
             
diff --git a/backend/api/api/Controllers/DatasetController.cs b/backend/api/api/Controllers/DatasetController.cs
index 58a903eb..44439bbe 100644
--- a/backend/api/api/Controllers/DatasetController.cs
+++ b/backend/api/api/Controllers/DatasetController.cs
@@ -136,7 +136,7 @@ namespace api.Controllers
             var existingDataset = _datasetService.GetOneDataset(dataset.uploaderId, dataset.name);
 
             if (existingDataset != null)
-                return NotFound($"Dateset with name = {dataset.name} exisits");
+                return NotFound($"Dataset with this name already exists");
             else
             {
                 FileModel fileModel = _fileService.getFile(dataset.fileId);
diff --git a/backend/api/api/Controllers/ModelController.cs b/backend/api/api/Controllers/ModelController.cs
index fb30a7a2..dd924bff 100644
--- a/backend/api/api/Controllers/ModelController.cs
+++ b/backend/api/api/Controllers/ModelController.cs
@@ -98,7 +98,7 @@ namespace api.Controllers
 
         // GET: api/<ModelController>/mymodels
         [HttpGet("mymodels")]
-        [Authorize(Roles = "User")]
+        [Authorize(Roles = "User,Guest")]
         public ActionResult<List<Model>> Get()
         {
             string uploaderId = getUserId();
diff --git a/backend/api/api/Models/IJwtToken.cs b/backend/api/api/Models/IJwtToken.cs
index 2afb6683..5c54e4e3 100644
--- a/backend/api/api/Models/IJwtToken.cs
+++ b/backend/api/api/Models/IJwtToken.cs
@@ -4,8 +4,8 @@ namespace api.Models
 {
     public interface IJwtToken
     {
-        string GenGuestToken();
-        string GenToken(AuthRequest user);
+        string GenGuestToken(string id);
+        string GenToken(User user);
         string RenewToken(string existingToken);
         string TokenToUsername(string token);
         public string TokenToId(string token);
diff --git a/backend/api/api/Models/JwtToken.cs b/backend/api/api/Models/JwtToken.cs
index 06b3a666..20b0bc73 100644
--- a/backend/api/api/Models/JwtToken.cs
+++ b/backend/api/api/Models/JwtToken.cs
@@ -19,16 +19,17 @@ namespace api.Models
 
         }
 
-        public string GenToken(AuthRequest user)
+        public string GenToken(User user)
         {
             var tokenHandler = new JwtSecurityTokenHandler();
             var key = Encoding.ASCII.GetBytes(_configuration.GetSection("AppSettings:JwtToken").Value);
-            var fullUser = _userService.GetUserByUsername(user.UserName);
+            string role=(user.isPermament)?"User":"Guest";
+            string name = (user.isPermament) ? user.Username : "";
             var tokenDescriptor = new SecurityTokenDescriptor
             {
-                Subject = new ClaimsIdentity(new[] { new Claim("name", fullUser.Username),
-                                                    new Claim("role", "User"),
-                                                    new Claim("id",fullUser._id)}),
+                Subject = new ClaimsIdentity(new[] { new Claim("name", name),
+                                                    new Claim("role", role),
+                                                    new Claim("id",user._id)}),
                 Expires = DateTime.UtcNow.AddMinutes(20),
                 SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
             };
@@ -39,13 +40,12 @@ namespace api.Models
 
         public string RenewToken(string existingToken)
         {
-            var userName = TokenToUsername(existingToken);
-            if (userName == null)
+            var id = TokenToId(existingToken);
+            if (id == null)
                 return null;
-            var authUser = new AuthRequest();
-            authUser.UserName = userName;
+            var user = _userService.GetUserById(id);
 
-            return GenToken(authUser);
+            return GenToken(user);
 
         }
 
@@ -100,15 +100,16 @@ namespace api.Models
 
         }
 
-        public string GenGuestToken()
+        public string GenGuestToken(string id)
         {
+            var user=_userService.GetUserById(id);
             var tokenHandler = new JwtSecurityTokenHandler();
             var key = Encoding.ASCII.GetBytes(_configuration.GetSection("AppSettings:JwtToken").Value);
             var tokenDescriptor = new SecurityTokenDescriptor
             {
                 Subject = new ClaimsIdentity(new[] { new Claim("name",""),
                                                     new Claim("role", "Guest"),
-                                                    new Claim("id","")}),
+                                                    new Claim("id",user._id)}),
                 Expires = DateTime.UtcNow.AddMinutes(20),
                 SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature)
             };
diff --git a/backend/api/api/Models/User.cs b/backend/api/api/Models/User.cs
index 1ae8e437..bea467fa 100644
--- a/backend/api/api/Models/User.cs
+++ b/backend/api/api/Models/User.cs
@@ -25,6 +25,8 @@ namespace api.Models
         public string LastName { get; set; }
         
         public string photoId { get; set; }
-        
+        public bool isPermament { get; set; }
+        public DateTime dateCreated { get; set; }
+
     }
 }
diff --git a/backend/api/api/Services/AuthService.cs b/backend/api/api/Services/AuthService.cs
index c7161dee..2d7d753d 100644
--- a/backend/api/api/Services/AuthService.cs
+++ b/backend/api/api/Services/AuthService.cs
@@ -25,7 +25,7 @@ namespace api.Services
                 return "Username doesn't exist";
             if (!PasswordCrypt.checkPassword(user.Password, u.Password))
                 return "Wrong password";
-            return _jwt.GenToken(user);
+            return _jwt.GenToken(u);
 
         }
         public string Register(RegisterRequest user)
@@ -37,6 +37,8 @@ namespace api.Services
             u.FirstName = user.firstName;
             u.LastName = user.lastName;
             u.photoId = "1";
+            u.isPermament = true;
+            u.dateCreated= DateTime.Now.ToUniversalTime();
             if (_users.Find(user => user.Username == u.Username).FirstOrDefault() != null)
                 return "Username Already Exists";
             if (_users.Find(user => user.Email == u.Email).FirstOrDefault() != null)
@@ -60,7 +62,12 @@ namespace api.Services
 
         public string GuestToken()
         {
-            return _jwt.GenGuestToken();
+            User u = new User();
+            u._id = "";
+            u.dateCreated = DateTime.Now.ToUniversalTime();
+            _users.InsertOne(u);
+            return _jwt.GenGuestToken(u._id);
+ 
         }
 
 
diff --git a/backend/api/api/Services/TempRemovalService.cs b/backend/api/api/Services/TempRemovalService.cs
index 302ca974..525ff386 100644
--- a/backend/api/api/Services/TempRemovalService.cs
+++ b/backend/api/api/Services/TempRemovalService.cs
@@ -10,6 +10,8 @@ namespace api.Services
         private readonly IMongoCollection<Model> _model;
         private readonly IMongoCollection<Dataset> _dataset;
         private readonly IMongoCollection<Experiment> _experiment;
+        private readonly IMongoCollection<User> _user;
+        private readonly IMongoCollection<Predictor> _predictor;
 
         public TempRemovalService(IUserStoreDatabaseSettings settings, IMongoClient mongoClient)
         {
@@ -18,43 +20,42 @@ namespace api.Services
             _model= database.GetCollection<Model>(settings.ModelCollectionName);
             _dataset = database.GetCollection<Dataset>(settings.DatasetCollectionName);
             _experiment= database.GetCollection<Experiment>(settings.ExperimentCollectionName);
+            _user = database.GetCollection<User>(settings.CollectionName);
+            _predictor = database.GetCollection<Predictor>(settings.PredictorCollectionName);
+
         }
-        public void DeleteTemps()
+        public void DeleteTemps()                
         {
-            List<FileModel> files = _file.Find(file => file.uploaderId == "").ToList();
-            foreach (var file in files)
+            List<User> tempUsers=_user.Find(u=>u.isPermament==false).ToList();
+            foreach (User user in tempUsers)
             {
-                if ((DateTime.Now.ToUniversalTime() - file.date).TotalDays >= 1)
+                if ((DateTime.Now.ToUniversalTime() - user.dateCreated).TotalMinutes < 1)
+                    continue;
+                List<Predictor> tempPredictors=_predictor.Find(p=>p.uploaderId==user._id).ToList();
+                List<Model> tempModels=_model.Find(m=>m.uploaderId==user._id).ToList();
+                List<Experiment> tempExperiment = _experiment.Find(e => e.uploaderId == user._id).ToList();
+                List<Dataset> tempDatasets = _dataset.Find(d => d.uploaderId == user._id).ToList();
+                List<FileModel> tempFiles = _file.Find(f => f.uploaderId == user._id).ToList();
+
+
+                foreach (Predictor predictor in tempPredictors)
+                    DeletePredictor(predictor._id);
+                foreach(Model model in tempModels)
+                    DeleteModel(model._id);
+                foreach(Experiment experiment in tempExperiment)
+                    DeleteExperiment(experiment._id);
+                foreach(Dataset dataset in tempDatasets)
+                    DeleteDataset(dataset._id);
+                foreach(FileModel file in tempFiles)
                 {
                     DeleteFile(file._id);
-                    List<Dataset> datasets = _dataset.Find(dataset => dataset.fileId == file._id && dataset.uploaderId=="").ToList();
-                    foreach(var dataset in datasets)
-                    {
-                        DeleteDataset(dataset._id);
-                        List<Experiment> experiments = _experiment.Find(experiment=>experiment.datasetId== dataset._id && experiment.uploaderId=="").ToList();
-                        foreach(var experiment in experiments)
-                        {
-                            DeleteExperiment(experiment._id);
-                            foreach(var modelId in experiment.ModelIds)
-                            {
-                                var delModel=_model.Find(model=> modelId== model._id && model.uploaderId=="").FirstOrDefault();
-                                if(delModel!= null)
-                                    DeleteModel(delModel._id);
-                            }
-                        }     
-                    }
-                    if (File.Exists(file.path))
+                    if(File.Exists(file.path))
                         File.Delete(file.path);
                 }
-            }
-            //Brisanje modela ukoliko gost koristi vec postojeci dataset
-            List<Model> models1= _model.Find(model =>model.uploaderId == "").ToList();
-            foreach(var model in models1)
-            {
-                if ((DateTime.Now.ToUniversalTime() - model.dateCreated.ToUniversalTime()).TotalDays >= 1)
-                {
-                    DeleteModel(model._id);
-                }
+                DeleteUser(user._id);
+
+
+
             }
             
 
@@ -79,6 +80,14 @@ namespace api.Services
         {
             _experiment.DeleteOne(experiment => experiment._id == id);
         }
+        public void DeletePredictor(string id)
+        {
+            _predictor.DeleteOne(predictor=> predictor._id == id);
+        }
+        public void DeleteUser(string id)
+        {
+            _user.DeleteOne(user=>user._id == id);
+        }
 
 
     }