Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop

4 files changed, 13 insertions, 14 deletions

diff --git a/Backend/Api/Api/Interfaces/IJwtService.cs b/Backend/Api/Api/Interfaces/IJwtService.cs
index adb83a2..1a8fb0a 100644
--- a/Backend/Api/Api/Interfaces/IJwtService.cs
+++ b/Backend/Api/Api/Interfaces/IJwtService.cs
@@ -6,7 +6,6 @@ namespace Api.Interfaces
     {
         string GenToken(User user);
         string TokenToId(string token);
-        Task<string> RenewToken(string existingToken);
         public string GenEmailToken(User user);
         public string EmailTokenToId(string token);
     }
diff --git a/Backend/Api/Api/Interfaces/IUserService.cs b/Backend/Api/Api/Interfaces/IUserService.cs
index 33c0889..8faad45 100644
--- a/Backend/Api/Api/Interfaces/IUserService.cs
+++ b/Backend/Api/Api/Interfaces/IUserService.cs
@@ -11,5 +11,6 @@ namespace Api.Interfaces
         Task<long> updateUser(User user);
         Task<User> deleteUser(String email);
         Task<User> getUserById(string id);
+        Task<string> RenewToken(string existingToken);
     }
 }
diff --git a/Backend/Api/Api/Services/JwtService.cs b/Backend/Api/Api/Services/JwtService.cs
index 42716fa..37ec88e 100644
--- a/Backend/Api/Api/Services/JwtService.cs
+++ b/Backend/Api/Api/Services/JwtService.cs
@@ -13,11 +13,9 @@ namespace Api.Services
     public class JwtService : IJwtService
     {
         private readonly IConfiguration _config;
-        private readonly IUserService _userService;
-        public JwtService(IConfiguration config,IUserService userService)
+        public JwtService(IConfiguration config)
         {
             _config = config;
-            _userService = userService;
         }
 
         public string GenToken(User user)
@@ -58,16 +56,6 @@ namespace Api.Services
             }
 
         }
-        public async Task<string> RenewToken(string existingToken)
-        {
-            var id = TokenToId(existingToken);
-            if (id == null)
-                return null;
-            var user = await _userService.getUserById(id);
-
-            return GenToken(user);
-
-        }
         public string GenEmailToken(User user)
         {
             var tokenHandler = new JwtSecurityTokenHandler();
diff --git a/Backend/Api/Api/Services/UserService.cs b/Backend/Api/Api/Services/UserService.cs
index b632ebc..1260814 100644
--- a/Backend/Api/Api/Services/UserService.cs
+++ b/Backend/Api/Api/Services/UserService.cs
@@ -109,5 +109,16 @@ namespace Api.Services
             }
             return false;
         }
+
+        public async Task<string> RenewToken(string existingToken)
+        {
+            var id = _jwtService.TokenToId(existingToken);
+            if (id == null)
+                return null;
+            var user = await getUserById(id);
+
+            return _jwtService.GenToken(user);
+
+        }
     }
 }