Skip to content
Snippets Groups Projects
Commit 6a91d8fc authored by Stian Lyng's avatar Stian Lyng
Browse files

finished 5

parent 67140b12
No related branches found
No related tags found
No related merge requests found
Pipeline #202970 passed
......@@ -57,4 +57,13 @@ public class UserResource {
return userDAO.addUser(user);
}
@PUT
@Path("{userId}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public boolean editUser(@PathParam("userId") int userId, User user){
UserDAO userDAO = new UserDAO();
return userDAO.editUser(userId, user.getUsername(), user.getPassword());
}
}
document.getElementById("newUsername").value = sessionStorage.getItem("username");
document.getElementById("newPassword").value = sessionStorage.getItem("password");
document.getElementById("cancelButton").addEventListener("click", function(){
window.location.href = "../app.html";
});
......@@ -8,7 +10,11 @@ document.getElementById("cancelButton").addEventListener("click", function(){
*/
function editUser (event) {
event.preventDefault();
let newInformation = {};
let newInformation = {
username: newUsername,
password: newPassword,
};
fetch('../api/user/'+sessionStorage.getItem("userId"), {
method: "PUT",
......@@ -18,6 +24,8 @@ function editUser (event) {
.then(response => response.json())
.then(response => {
if (response === true) {
sessionStorage.setItem("userId", user.userId);
sessionStorage.setItem("username", user.username);
alert("Bruker oppdatert");
window.location.href = "../app.html";
} else {
......@@ -25,4 +33,6 @@ function editUser (event) {
}
})
.catch(error => console.error(error));
}
\ No newline at end of file
......@@ -27,7 +27,7 @@
autocomplete="off"
type="password">
<button class="btn">Lagre</button>
<button class="btn" id="saveButton">Lagre</button>
<button class="btn" id="cancelButton" type="button">Avbryt</button>
</form>
</div>
......
......@@ -13,6 +13,7 @@ import jakarta.ws.rs.core.Response;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
public class UserResourceTest extends JerseyTest {
private final UserResource userResource = new UserResource();
......@@ -43,14 +44,15 @@ public class UserResourceTest extends JerseyTest {
assertEquals("application/json",output.getHeaderString("Content-type"));
}
/*
@Test
public void testEditUser () {
user2.setUserId(10);
user2.setUsername("test");
Response output = target("user/"+2).request().put(Entity.entity(user2, MediaType.APPLICATION_JSON));
assertEquals("Should return status 200", 200, output.getStatus());
assertEquals( 200, output.getStatus());
assertEquals("application/json",output.getHeaderString("Content-type"));
assertNotEquals("testUsername",user2.getUsername());
}*/
assertNotEquals("Fisken", user2.getUsername());
//assertNotEquals("testUsername",user2.getUsername());
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment