filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated

Browse Source 
Signed-off-by: Marcin Woźniak <y0rune@aol.com>
This commit is contained in:
Marcin Woźniak 2020-12-04 15:42:28 +01:00
parent b897fce416
commit 6dfb99f253
Signed by: y0rune
GPG Key ID: F204C385F57EB348
5 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
restservice/src/main/java/com/plannaplan/App.java
View File

@ -29,20 +29,7 @@ public class App {
@EventListener(ApplicationReadyEvent.class) @EventListener(ApplicationReadyEvent.class)
public void importData() { public void importData() {
User filip = new User();
filip.setEmail("filizy@st.amu.edu.pl");
filip.setName("Filip");
filip.setSurname("Izydorczyk");
filip.setRole(UserRoles.STUDENT);
this.userService.save(filip);
User hub = new User();
hub.setEmail("hubwrz1@st.amu.edu.pl");
hub.setName("Hubert");
hub.setSurname("Wrzesiński");
hub.setRole(UserRoles.STUDENT);
this.userService.save(hub);
User mac = new User(); User mac = new User();
mac.setEmail("macglo2@st.amu.edu.pl"); mac.setEmail("macglo2@st.amu.edu.pl");
mac.setName("Maciej"); mac.setName("Maciej");

4
restservice/src/main/java/com/plannaplan/controllers/TokenController.java
View File

@ -8,6 +8,7 @@ import com.plannaplan.security.cas.CustomUAMCasValidator;
import com.plannaplan.services.UserService; import com.plannaplan.services.UserService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.CrossOrigin;
@ -24,7 +25,8 @@ import io.swagger.annotations.ApiParam;
@Api(tags = { "Token" }, value = "Token", description = "Enpoints to get authorization.") @Api(tags = { "Token" }, value = "Token", description = "Enpoints to get authorization.")
public class TokenController { public class TokenController {
private final static String SERVICE_URL = "https://wmi.plannaplan.pl"; @Value("${plannaplan.frontendUrl}")
private String SERVICE_URL;
@Autowired @Autowired
private UserService userService; private UserService userService;

4
restservice/src/main/resources/application.properties
View File

@ -9,4 +9,6 @@ spring.jackson.serialization.fail-on-empty-beans=false
spring.main.allow-bean-definition-overriding=true spring.main.allow-bean-definition-overriding=true
spring.jackson.default-property-inclusion = NON_NULL spring.jackson.default-property-inclusion = NON_NULL
server.port=1285 server.port=1285
plannaplan.frontendUrl = http://localhost:3000

8
restservice/src/test/java/com/plannaplan/security/cas/CustomUAMCasValidatorTest.java
View File

@ -1,11 +1,17 @@
package com.plannaplan.security.cas; package com.plannaplan.security.cas;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Value;
public class CustomUAMCasValidatorTest { public class CustomUAMCasValidatorTest {
@Value("${plannaplan.frontendUrl}")
private String serviceUrl;
@Test @Test
public void shouldValidateWithDomain() { public void shouldValidateWithDomain() {
CustomUAMCasValidator validator = new CustomUAMCasValidator("https://wmi.plannaplan.pl", "ST-54649-5x4h09vzUpEIyAGmf1sz-cas.amu.edu.pl");
CustomUAMCasValidator validator = new CustomUAMCasValidator(serviceUrl, "ST-54649-5x4h09vzUpEIyAGmf1sz-cas.amu.edu.pl");
validator.validate(); validator.validate();

9
restservice/src/test/java/com/plannaplan/security/cas/DefaultUAMCasValidatorTest.java
View File

@ -4,15 +4,20 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.Ignore; import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.annotation.Value;
public class DefaultUAMCasValidatorTest { public class DefaultUAMCasValidatorTest {
@Value("${plannaplan.frontendUrl}")
private String serviceUrl;
@Test @Test
@Ignore @Ignore
public void shouldValidateTicket() { public void shouldValidateTicket() {
// you need to privide fresh ticket to make this test pass that's why it is // you need to privide fresh ticket to make this test pass that's why it is
// marked as ignored // marked as ignored
final DefaultUAMCasValidator validator = new DefaultUAMCasValidator("http://localhost:3000",
final DefaultUAMCasValidator validator = new DefaultUAMCasValidator(serviceUrl,
"ST-572267-cbgKrcJLd0tdCubeLqdW-cas.amu.edu.pl"); "ST-572267-cbgKrcJLd0tdCubeLqdW-cas.amu.edu.pl");
try { try {
System.out.println(validator.validate()); System.out.println(validator.validate());
@ -24,7 +29,7 @@ public class DefaultUAMCasValidatorTest {
@Test @Test
public void shouldNotValidateTicket() { public void shouldNotValidateTicket() {
final DefaultUAMCasValidator validator = new DefaultUAMCasValidator("http://localhost:3000", "notticket"); final DefaultUAMCasValidator validator = new DefaultUAMCasValidator(serviceUrl, "notticket");
try { try {
assertTrue(validator.validate().getEmail().trim().equals("")); assertTrue(validator.validate().getEmail().trim().equals(""));
} catch (CasValidationExcepiton e) { } catch (CasValidationExcepiton e) {