Skip to content
Snippets Groups Projects
Commit 09d327c9 authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Configured TokenFilter. Retrieved user groups in CreateNodeController. Changes on unit tests

parent c3ec5823
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 71 additions and 101 deletions
src/main/java/it/inaf/oats/vospace/BaseNodeController.java 0 → 100644
+ 27
− 0
View file @ 09d327c9
package it.inaf.oats.vospace;
import javax.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
public abstract class BaseNodeController {
@Autowired
private HttpServletRequest servletRequest;
/**
* Slash is a special character in defining REST endpoints and trying to
* define a PathVariable containing slashes doesn't work, so the endpoint
* has been defined using "/nodes/**" instead of "/nodes/{path}" and the
* path is extracted manually parsing the request URL.
*/
protected String getPath() {
String requestURL = servletRequest.getRequestURL().toString();
String[] split = requestURL.split("/nodes/");
String path = "/";
if (split.length == 2) {
path += split[1];
}
return path;
}
}
src/main/java/it/inaf/oats/vospace/CreateNodeController.java
+ 15
− 27
View file @ 09d327c9
package it.inaf.oats.vospace;
import it.inaf.ia2.aa.data.User;
import net.ivoa.xml.vospace.v2.Node;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Autowired;
import it.inaf.oats.vospace.persistence.NodeDAO;
import net.ivoa.xml.vospace.v2.Property;
import java.util.List;
import org.springframework.web.bind.annotation.PutMapping;
@RestController
public class CreateNodeController {
public class CreateNodeController extends BaseNodeController {
@Autowired
NodeDAO node_dao;
private NodeDAO nodeDao;
@PostMapping(value = "/{path}",
@PutMapping(value = {"/nodes", "/nodes/**"},
consumes = {MediaType.APPLICATION_XML_VALUE, MediaType.APPLICATION_JSON_VALUE},
produces = {MediaType.APPLICATION_XML_VALUE, MediaType.APPLICATION_JSON_VALUE})
public Node createNode(@PathVariable("path") String path, @RequestBody Node node) {
System.out.println("In createNodeController");
node_dao.createNode(node);
return node;
}
private class RequestWrapper {
List<Property> nodeProperty;
String nodeId;
String nodeType;
public Node createNode(@RequestBody Node node, User principal) {
String path = getPath();
List<String> userGroups = principal.getGroups();
nodeDao.createNode(node);
return node;
}
}
src/main/java/it/inaf/oats/vospace/ListNodeController.java
+ 2
− 19
View file @ 09d327c9
......@@ -12,7 +12,7 @@ import javax.servlet.http.HttpServletRequest;
import org.springframework.http.MediaType;
@RestController
public class ListNodeController {
public class ListNodeController extends BaseNodeController {
@Autowired
private NodeDAO nodeDAO;
......@@ -20,24 +20,7 @@ public class ListNodeController {
@GetMapping(value = {"/nodes", "/nodes/**"},
produces = {MediaType.APPLICATION_XML_VALUE, MediaType.APPLICATION_JSON_VALUE, MediaType.TEXT_XML_VALUE})
public ResponseEntity<Node> listNode(HttpServletRequest request) {
String path = getPath(request);
String path = getPath();
return ResponseEntity.ok(nodeDAO.listNode(path));
}
/**
* Slash is a special character in defining REST endpoints and trying to
* define a PathVariable containing slashes doesn't work, so the endpoint
* has been defined using "/nodes/**" instead of "/nodes/{path}" and the
* path is extracted manually parsing the request URL.
*/
private String getPath(HttpServletRequest request) {
String requestURL = request.getRequestURL().toString();
String[] split = requestURL.split("/nodes/");
String path = "/";
if (split.length == 2) {
path += split[1];
}
return path;
}
}
src/main/java/it/inaf/oats/vospace/PrivateController.java deleted 100644 → 0
+ 0
− 23
View file @ c3ec5823
package it.inaf.oats.vospace;
import javax.servlet.http.HttpServletRequest;
import net.ivoa.xml.vospace.v2.Node;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import it.inaf.ia2.aa.data.User;
@RestController
public class PrivateController {
@GetMapping(value = "/private",
produces = {MediaType.APPLICATION_JSON_VALUE})
public User getUser(HttpServletRequest request) {
User user = (User)request.getUserPrincipal();
return user;
}
}
src/main/java/it/inaf/oats/vospace/VospaceApplication.java
+ 4
− 4
View file @ 09d327c9
......@@ -4,7 +4,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import it.inaf.ia2.aa.LoginFilter;
import it.inaf.ia2.aa.TokenFilter;
@SpringBootApplication
public class VospaceApplication {
......@@ -14,10 +14,10 @@ public class VospaceApplication {
}
@Bean
public FilterRegistrationBean loginFilterRegistration() {
public FilterRegistrationBean tokenFilterRegistration() {
FilterRegistrationBean registration = new FilterRegistrationBean();
registration.setFilter(new LoginFilter());
registration.addUrlPatterns("/private/*");
registration.setFilter(new TokenFilter());
registration.addUrlPatterns("/*");
return registration;
}
}
src/test/java/it/inaf/oats/vospace/CreateNodeControllerTest.java
+ 23
− 28
View file @ 09d327c9
package it.inaf.oats.vospace;
import it.inaf.oats.vospace.persistence.NodeDAO;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import net.ivoa.xml.vospace.v2.Property;
import net.ivoa.xml.vospace.v2.UnstructuredDataNode;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import org.mockito.InjectMocks;
import static org.mockito.Mockito.verify;
import org.mockito.Spy;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.junit.jupiter.api.Disabled;
@ExtendWith(MockitoExtension.class)
import static org.mockito.ArgumentMatchers.any;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.boot.test.mock.mockito.SpyBean;
@SpringBootTest
@AutoConfigureMockMvc
public class CreateNodeControllerTest {
@InjectMocks
@Spy
@MockBean
private NodeDAO nodeDao;
@SpyBean
@Autowired
private CreateNodeController controller;
@Autowired
private MockMvc mockMvc;
@BeforeEach
public void init() {
mockMvc = MockMvcBuilders.standaloneSetup(controller).build();
}
@Test
@Disabled
public void testFromJsonToXml() throws Exception {
String requestBody = getResourceFileContent("create-unstructured-data-node.json");
mockMvc.perform(post("/mypath")
mockMvc.perform(put("/nodes/mydata1")
.content(requestBody)
.contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_XML))
......@@ -51,11 +49,10 @@ public class CreateNodeControllerTest {
}
@Test
@Disabled
public void testFromXmlToJson() throws Exception {
String requestBody = getResourceFileContent("create-unstructured-data-node.xml");
mockMvc.perform(post("/mypath")
mockMvc.perform(put("/nodes/mydata1")
.content(requestBody)
.contentType(MediaType.APPLICATION_XML)
.accept(MediaType.APPLICATION_JSON))
......@@ -66,11 +63,10 @@ public class CreateNodeControllerTest {
}
@Test
@Disabled
public void testFromXmlToXml() throws Exception {
String requestBody = getResourceFileContent("create-unstructured-data-node.xml");
mockMvc.perform(post("/mypath")
mockMvc.perform(put("/nodes/mydata1")
.content(requestBody)
.contentType(MediaType.APPLICATION_XML)
.accept(MediaType.APPLICATION_XML))
......@@ -81,11 +77,10 @@ public class CreateNodeControllerTest {
}
@Test
@Disabled
public void testFromJsonToJson() throws Exception {
String requestBody = getResourceFileContent("create-unstructured-data-node.json");
mockMvc.perform(post("/mypath")
mockMvc.perform(put("/nodes/mydata1")
.content(requestBody)
.contentType(MediaType.APPLICATION_JSON)
.accept(MediaType.APPLICATION_JSON))
......@@ -96,14 +91,14 @@ public class CreateNodeControllerTest {
}
private void verifyArguments() {
verify(controller).createNode(eq("mypath"),
verify(controller).createNode(
argThat(node -> {
UnstructuredDataNode udn = (UnstructuredDataNode) node;
Property property = udn.getProperties().getProperty().get(0);
return "vos:UnstructuredDataNode".equals(udn.getType())
&& "test value".equals(property.getValue())
&& "ivo://ivoa.net/vospace/core#description".equals(property.getUri());
}));
}), any());
}
protected static String getResourceFileContent(String fileName) throws Exception {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment