Cambio a login rest controller

Author: JLRR2019

backend/gamelink/src/main/java/urjc/gamelink/Controllers/GamelinkWebController.java

@@ -76,31 +76,6 @@ public String home(Model model, HttpSession session) {
         return "home";
     }
 
-<<<<<<< HEAD
-    @GetMapping("/news/{page}")
-    public String ajaxMoreNewsLoad(Model model, HttpSession session, @PathVariable int page) {
-
-        Page<News> news = ns.findAll(PageRequest.of(page, 9)); 
-    
-        model.addAttribute("new", news);
-
-        return "newsTemplate";
-
-    }
-
-    @GetMapping("/videogames/{page}")
-    public String ajaxMoreVideogamesLoad(Model model, HttpSession session, @PathVariable int page) {
-
-        Page<Videogame> videogames = vs.findAll(PageRequest.of(page, 9)); 
-    
-        model.addAttribute("games", videogames);
-
-        return "videogameTemplate";
-
-    }
-
-=======
->>>>>>> f635e8654a634cfe8e85bf08c814c2649f442266
     @GetMapping("/about")
     public String about(Model model){
 

backend/gamelink/src/main/java/urjc/gamelink/Controllers/LoginRestController.java

@@ -18,36 +18,33 @@
 import urjc.gamelink.Configuration.Security.jwt.AuthResponse.Status;
 
 
-
+@RestController
+@RequestMapping("/api/auth")
 public class LoginRestController {
 
-    @RestController
-    @RequestMapping("/api")
-    public class LRestController {
-        
-        @Autowired
-        private UserLoginService userService;
-    
-        @PostMapping("/login")
-        public ResponseEntity<AuthResponse> login(
-                @CookieValue(name = "accessToken", required = false) String accessToken,
-                @CookieValue(name = "refreshToken", required = false) String refreshToken,
-                @RequestBody LoginRequest loginRequest) {
-            
-            return userService.login(loginRequest, accessToken, refreshToken);
-        }
-    
-        @PostMapping("/refresh")
-        public ResponseEntity<AuthResponse> refreshToken(
-                @CookieValue(name = "refreshToken", required = false) String refreshToken) {
-    
-            return userService.refresh(refreshToken);
-        }
-    
-        @PostMapping("/logout")
-        public ResponseEntity<AuthResponse> logOut(HttpServletRequest request, HttpServletResponse response) {
-    
-            return ResponseEntity.ok(new AuthResponse(Status.SUCCESS, userService.logout(request, response)));
-        }
+    @Autowired
+    private UserLoginService userService;
+
+    @PostMapping("/login")
+    public ResponseEntity<AuthResponse> login(
+            @CookieValue(name = "accessToken", required = false) String accessToken,
+            @CookieValue(name = "refreshToken", required = false) String refreshToken,
+            @RequestBody LoginRequest loginRequest) {
+
+        return userService.login(loginRequest, accessToken, refreshToken);
     }
+
+    @PostMapping("/refresh")
+    public ResponseEntity<AuthResponse> refreshToken(
+            @CookieValue(name = "refreshToken", required = false) String refreshToken) {
+
+        return userService.refresh(refreshToken);
+    }
+
+    @PostMapping("/logout")
+    public ResponseEntity<AuthResponse> logOut(HttpServletRequest request, HttpServletResponse response) {
+
+        return ResponseEntity.ok(new AuthResponse(Status.SUCCESS, userService.logout(request, response)));
+    }
+
 }