Merge remote-tracking branch 'origin/main' into list-and-cupboard-component-refactor

# Conflicts:
#	ufund-api/src/main/java/com/ufund/api/ufundapi/controller/CupboardController.java
#	ufund-api/src/main/java/com/ufund/api/ufundapi/model/Need.java
#	ufund-ui/src/app/components/cupboard/cupboard.component.ts
#	ufund-ui/src/app/components/need-list/need-list.component.ts
#	ufund-ui/src/app/models/Need.ts

1 files changed, 18 insertions, 19 deletions

diff --git a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java
index 55cf7a9..4f58b12 100644
--- a/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java
+++ b/ufund-api/src/test/java/com/ufund/api/ufundapi/service/AuthServiceTest.java
@@ -11,7 +11,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
-import com.ufund.api.ufundapi.DuplicateKeyException;
 import com.ufund.api.ufundapi.model.User;
 import com.ufund.api.ufundapi.model.UserAuth;
 import com.ufund.api.ufundapi.persistence.UserAuthDAO;
@@ -41,39 +40,39 @@ public class AuthServiceTest {
     }
 
     @Test
-    public void testAuthenticate() throws IOException {
+    public void testKeyIsValid() throws IOException {
         // Mock
         when(mockAuthDAO.getUserAuth(key)).thenReturn(new UserAuth(key, username, null));
         when(mockUserService.getUser(username)).thenReturn(user);
 
         // Analyze
-        assertDoesNotThrow(() -> authService.authenticate(username, key));
+        assertDoesNotThrow(() -> authService.keyHasAccessToUser(username, key));
 
     }
 
-//    @Test
-//    public void testAuthenticateMismatchName() throws IOException {
-//        // Mock
-//        when(mockAuthDAO.getUserAuth(key)).thenReturn(new UserAuth(key, "EvilFish", null));
-//        when(mockUserService.getUser("EvilFish")).thenReturn(user);
-//
-//        // Analyze
-//        assertThrows(IllegalAccessException.class, () -> authService.authenticate(username, key));
-//
-//    }
+    @Test
+    public void testKeyIsValidMismatchName() throws IOException {
+        // Mock
+        when(mockAuthDAO.getUserAuth(key)).thenReturn(new UserAuth(key, "EvilFish", null));
+        when(mockUserService.getUser("EvilFish")).thenReturn(user);
+
+        // Analyze
+        assertThrows(IllegalAccessException.class, () -> authService.keyHasAccessToUser(username, key));
+
+    }
 
     @Test
-    public void testAuthenticateMissingUserAuth() throws IOException {
+    public void testKeyIsValidMissingUserAuth() throws IOException {
         // Mock
         when(mockAuthDAO.getUserAuth(key)).thenReturn(null);
 
         // Analyze
-        assertThrows(IllegalAccessException.class, () -> authService.authenticate(username, key));
+        assertThrows(IllegalAccessException.class, () -> authService.keyHasAccessToUser(username, key));
         
     }
 
     @Test
-    public void testLogin() throws IOException, DuplicateKeyException, IllegalAccessException {
+    public void testLogin() throws IOException {
         // Mock
         when(mockUserService.getUser(username)).thenReturn(user);
                 
@@ -83,7 +82,7 @@ public class AuthServiceTest {
     }
 
     @Test
-    public void testLoginNullUser() throws IOException, DuplicateKeyException, IllegalAccessException {
+    public void testLoginNullUser() throws IOException {
         // Mock
         when(mockUserService.getUser(username)).thenReturn(null);
 
@@ -92,7 +91,7 @@ public class AuthServiceTest {
     }
 
     @Test
-    public void testLoginMismatchPasswords() throws IOException, DuplicateKeyException, IllegalAccessException {
+    public void testLoginMismatchPasswords() throws IOException {
         // Mock
         when(mockUserService.getUser(username)).thenReturn(User.create(username, "fries"));
 
@@ -101,7 +100,7 @@ public class AuthServiceTest {
     }
 
     @Test
-    public void testLogout() throws IOException, DuplicateKeyException, IllegalAccessException {
+    public void testLogout() {
         // Analyze
         assertDoesNotThrow(() -> authService.logout(key));