Merge branch 'refs/heads/service-layer' into api-auth

1 files changed, 9 insertions, 15 deletions

diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/AuthController.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/AuthController.java
index aa27e3f..1a545f6 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/AuthController.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/controller/AuthController.java
@@ -1,8 +1,7 @@
 package com.ufund.api.ufundapi.controller;
 
-import com.ufund.api.ufundapi.model.UserAuth;
-import com.ufund.api.ufundapi.persistence.UserAuthDAO;
-import com.ufund.api.ufundapi.persistence.UserDAO;
+import com.ufund.api.ufundapi.service.AuthService;
+import com.ufund.api.ufundapi.service.UserService;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -13,12 +12,10 @@ import java.util.Map;
 @RestController
 @RequestMapping("auth")
 public class AuthController {
-    private final UserDAO userDAO;
-    private final UserAuthDAO userAuthDAO;
+    private final AuthService authService;
 
-    public AuthController(UserDAO userDAO, UserAuthDAO userAuthDAO) {
-        this.userDAO = userDAO;
-        this.userAuthDAO = userAuthDAO;
+    public AuthController(AuthService authService) {
+        this.authService = authService;
     }
 
     /**
@@ -31,15 +28,12 @@ public class AuthController {
         String username = params.get("username");
         String password = params.get("password");
         try {
-            var usr = userDAO.getUser(username);
-            if (usr == null || !usr.verifyPassword(password)) {
-                return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
-            }
-            var userAuth = UserAuth.generate(username);
-            userAuthDAO.addUserAuth(userAuth);
-            return new ResponseEntity<>(userAuth.getKey(), HttpStatus.OK);
+            String key = authService.login(username, password);
+            return new ResponseEntity<>(key, HttpStatus.OK);
         } catch (IOException ex) {
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+        } catch (IllegalAccessException e) {
+            return new ResponseEntity<>(HttpStatus.UNAUTHORIZED);
         }
     }