diff --git a/src/main/java/dao/UserDAO.java b/src/main/java/dao/UserDAO.java
index 18b503bdd10fa1092c53c83f7ae2c8de005e6840..288f80c8b55a8b5c9fdb3030efb2d957c86e5370 100644
--- a/src/main/java/dao/UserDAO.java
+++ b/src/main/java/dao/UserDAO.java
@@ -184,9 +184,7 @@ public class UserDAO {
* @return a random salt
*/
public byte[] generateSalt() {
- byte [] randomBytes = new byte[16];
- new SecureRandom().nextBytes(randomBytes);
- return randomBytes;
+ return null;
}
/**
@@ -196,23 +194,7 @@ public class UserDAO {
* @return hashedPassword, null if unsuccessful
*/
public String hashPassword(String password, byte[] salt) {
- MessageDigest md = null;
- try {
- md = MessageDigest.getInstance("SHA-512");
- } catch (NoSuchAlgorithmException e) {
- e.printStackTrace();
- }
- md.update(salt);
- byte[] hashedSaltedPassword = md.digest(password.getBytes(StandardCharsets.UTF_8));
- return byteArrayToString(hashedSaltedPassword);
- }
-
- public String byteArrayToString(final byte [] bytes) {
- StringBuilder stringBuilder = new StringBuilder();
- for(int i = 0; i < bytes.length; i++){
- stringBuilder.append(Integer.toString((bytes[i] & 0xff) + 0x100, 16).substring(1));
- }
- return stringBuilder.toString();
+ return null;
}
/**
diff --git a/src/main/webapp/js/index.js b/src/main/webapp/js/index.js
index 7b408f35cee437a8514d5d94103a4e0da5afe244..8fc5c4ba84d09fef234447349524b36e5b58eb46 100644
--- a/src/main/webapp/js/index.js
+++ b/src/main/webapp/js/index.js
@@ -16,7 +16,6 @@ function login(event){
event.preventDefault();
let user = {
"username": document.getElementById('username').value,
- "password": document.getElementById('password').value
};
fetch('../api/user', {
diff --git a/src/test/java/MessageDAOTest.java b/src/test/java/MessageDAOTest.java
index ddec2fcef0a0c3a2c51c2b94aa5828af40557d72..fde44e4fe41af9fc818f0b53663aeac1eaeae6c9 100644
--- a/src/test/java/MessageDAOTest.java
+++ b/src/test/java/MessageDAOTest.java
@@ -1,11 +1,6 @@
import dao.Database;
import dao.MessageDAO;
import data.Message;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.TestProperties;
-
-import jakarta.ws.rs.core.Application;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -21,7 +16,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
-public class MessageDAOTest extends JerseyTest {
+public class MessageDAOTest {
private Connection connection;
private MessageDAO messageDAO;
private Statement statement;
@@ -145,16 +140,6 @@ public class MessageDAOTest extends JerseyTest {
}
}
-
- @Override
- public Application configure() {
- enable(TestProperties.LOG_TRAFFIC);
- enable(TestProperties.DUMP_ENTITY);
- forceSet(TestProperties.CONTAINER_PORT, "0");
- return new ResourceConfig(MessageDAO.class);
- }
-
-
@Test
public void testGetMessage () {
List<Message> messageList = messageDAO.getMessages(user1,user2);
diff --git a/src/test/java/MessageResourceTest.java b/src/test/java/MessageResourceTest.java
index 6ff1ae69d2a8079582c411b7e7257d3e843bd424..899dbf3b93d8332b11bac0b6be112225b1ed4e0f 100644
--- a/src/test/java/MessageResourceTest.java
+++ b/src/test/java/MessageResourceTest.java
@@ -2,7 +2,7 @@ import data.Message;
import org.glassfish.jersey.server.ResourceConfig;
import org.glassfish.jersey.test.JerseyTest;
import org.glassfish.jersey.test.TestProperties;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.BeforeEach;
import resources.MessageResource;
@@ -11,8 +11,8 @@ import jakarta.ws.rs.core.Application;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class MessageResourceTest extends JerseyTest {
private int user1 = 1, user2 = 2;
@@ -34,7 +34,7 @@ public class MessageResourceTest extends JerseyTest {
@Test
public void testGetMessages(){
Response output = target("message/"+user1+"/"+user2).request().get();
- assertEquals("Should return status 200", 200, output.getStatus());
+ assertEquals(200, output.getStatus());
assertEquals("application/json",output.getHeaderString("Content-type"));
assertNotNull(output.getEntity());
diff --git a/src/test/java/UserDAOTest.java b/src/test/java/UserDAOTest.java
index e025ec42f7e30aa6e335c90931f2ef96ade91d9f..444c56b5f4c5cd3a2460b3cc7d4d372b4628caaa 100644
--- a/src/test/java/UserDAOTest.java
+++ b/src/test/java/UserDAOTest.java
@@ -1,11 +1,6 @@
import dao.Database;
import dao.UserDAO;
import data.User;
-import org.glassfish.jersey.server.ResourceConfig;
-import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.TestProperties;
-
-import jakarta.ws.rs.core.Application;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -19,7 +14,7 @@ import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
-public class UserDAOTest extends JerseyTest {
+public class UserDAOTest {
private Connection connection;
private Statement statement;
private UserDAO userDAO;
@@ -146,14 +141,6 @@ public class UserDAOTest extends JerseyTest {
}
}
- @Override
- public Application configure () {
- enable(TestProperties.LOG_TRAFFIC);
- enable(TestProperties.DUMP_ENTITY);
- forceSet(TestProperties.CONTAINER_PORT, "0");
- return new ResourceConfig(UserDAO.class);
- }
-
@Test
public void testGetUsers () {
List<User> userlist = userDAO.getUsers();
@@ -196,27 +183,4 @@ public class UserDAOTest extends JerseyTest {
assertEquals(expectedUsername,actualUsername);
assertNotEquals(beforeNewUser,afterNewUser);
}
-
- @Test
- public void testGenerateSalt(){
- byte[] bytes1 = userDAO.generateSalt();
- byte[] bytes2 = userDAO.generateSalt();
- assertNotEquals(bytes1.toString(),bytes2.toString());
- }
-
- @Test
- public void testHashPassword(){
- byte[] salt1 = userDAO.generateSalt();
- byte[] salt2 = userDAO.generateSalt();
- String password1 = "password";
- String password2 = "password2";
- String hashedPass1 = userDAO.hashPassword(password1, salt1);
- String hashedPass1_1 = userDAO.hashPassword(password1, salt1);
- assertEquals(hashedPass1,hashedPass1_1);
- String hashedPass2 = userDAO.hashPassword(password2, salt1);
- assertNotEquals(hashedPass1,hashedPass2);
- String hashedPass2_2 = userDAO.hashPassword(password2, salt2);
- assertNotEquals(hashedPass1,hashedPass2_2);
- assertNotEquals(hashedPass2,hashedPass2_2);
- }
}
\ No newline at end of file
diff --git a/src/test/java/UserResourceTest.java b/src/test/java/UserResourceTest.java
index d29738327d118b3b8d7962b8bd4489944c339295..c42bbb8335f4dc68167d8b6ccf0d5614e1e32124 100644
--- a/src/test/java/UserResourceTest.java
+++ b/src/test/java/UserResourceTest.java
@@ -11,7 +11,8 @@ import jakarta.ws.rs.core.Application;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertEquals;
public class UserResourceTest extends JerseyTest {
private final UserResource userResource = new UserResource();
@@ -29,7 +30,7 @@ public class UserResourceTest extends JerseyTest {
@Test
public void testNewUser(){
Response output = target("/user").request().post(Entity.entity(user, MediaType.APPLICATION_JSON));
- assertEquals("Should return status 200",200,output.getStatus());
+ assertEquals(200,output.getStatus());
assertEquals("application/json",output.getHeaderString("Content-type"));
assertEquals("username", userResource.newUser(user).getUsername());
}
@@ -37,8 +38,8 @@ public class UserResourceTest extends JerseyTest {
@Test
public void testGetUsers(){
Response output = target("/user").request().get();
- assertEquals("should return status 200", 200, output.getStatus());
- assertNotNull("Should return user list", output.getEntity().toString());
+ assertEquals(200, output.getStatus());
+ assertNotNull(output.getEntity().toString());
assertEquals("application/json",output.getHeaderString("Content-type"));
}