This is the codeAbility Sharing Platform! Learn more about the codeAbility Sharing Platform.

Skip to content
Snippets Groups Projects
Commit 4bca1a63 authored by Eduard Frankford's avatar Eduard Frankford
Browse files

removed classpath from git and eclipse.prefs and changed pom to update h2... 

removed classpath from git and eclipse.prefs and changed pom to update h2 database because of vulnerability in old version + changed scope because test scope lead to build failures in vscode
parent 145a1070
2 merge requests!105Preparing März Release,!93make website mobile friendly and in general more responsive
Hide whitespace changes
Inline Side-by-side
.classpath deleted 100644 → 0
+ 0
− 55
View file @ 145a1070
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
<attributes>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" path="target/generated-sources/annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources/test-annotations">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
<attribute name="ignore_optional_problems" value="true"/>
<attribute name="m2e-apt" value="true"/>
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
.gitignore
+ 1
− 0
View file @ 4bca1a63
......@@ -38,6 +38,7 @@ local.properties
.loadpath
.factorypath
/src/main/resources/rebel.xml
.settings/org.eclipse.jdt.apt.core.prefs
# External tool builders
.externalToolBuilders/**
......
.settings/org.eclipse.jdt.apt.core.prefs deleted 100644 → 0
+ 0
− 4
View file @ 145a1070
eclipse.preferences.version=1
org.eclipse.jdt.apt.aptEnabled=true
org.eclipse.jdt.apt.genSrcDir=target\\generated-sources\\annotations
org.eclipse.jdt.apt.genTestSrcDir=target\\generated-test-sources\\test-annotations
pom.xml
+ 2
− 2
View file @ 4bca1a63
......@@ -60,7 +60,7 @@
https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-dependencies/${spring-boot.version} -->
<liquibase.version>4.6.1</liquibase.version>
<liquibase-hibernate5.version>4.6.1</liquibase-hibernate5.version>
<h2.version>1.4.200</h2.version>
<h2.version>2.1.210</h2.version>
<validation-api.version>2.0.1.Final</validation-api.version>
<jaxb-runtime.version>2.3.3</jaxb-runtime.version>
<archunit-junit5.version>0.22.0</archunit-junit5.version>
......@@ -397,7 +397,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
<!-- <scope>test</scope> -->
</dependency>
<!-- jhipster-needle-maven-add-dependency -->
</dependencies>
......
src/test/java/at/ac/uibk/gitsearch/web/rest/AccountResourceIT.java
+ 89
− 47
View file @ 4bca1a63
......@@ -9,14 +9,23 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import at.ac.uibk.gitsearch.IntegrationTest;
import at.ac.uibk.gitsearch.config.Constants;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.repository.AuthorityRepository;
import at.ac.uibk.gitsearch.repository.UserRepository;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.UserService;
import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
import at.ac.uibk.gitsearch.service.dto.PasswordChangeDTO;
import at.ac.uibk.gitsearch.web.rest.vm.KeyAndPasswordVM;
import at.ac.uibk.gitsearch.web.rest.vm.ManagedUserVM;
import java.time.Instant;
import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import org.apache.commons.lang3.RandomStringUtils;
import org.junit.Ignore;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -27,18 +36,6 @@ import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.transaction.annotation.Transactional;
import at.ac.uibk.gitsearch.IntegrationTest;
import at.ac.uibk.gitsearch.config.Constants;
import at.ac.uibk.gitsearch.domain.User;
import at.ac.uibk.gitsearch.repository.AuthorityRepository;
import at.ac.uibk.gitsearch.repository.UserRepository;
import at.ac.uibk.gitsearch.security.AuthoritiesConstants;
import at.ac.uibk.gitsearch.service.UserService;
import at.ac.uibk.gitsearch.service.dto.AdminUserDTO;
import at.ac.uibk.gitsearch.service.dto.PasswordChangeDTO;
import at.ac.uibk.gitsearch.web.rest.vm.KeyAndPasswordVM;
import at.ac.uibk.gitsearch.web.rest.vm.ManagedUserVM;
/**
* Integration tests for the {@link AccountResource} REST controller.
*/
......@@ -139,8 +136,12 @@ class AccountResourceIT {
assertThat(userRepository.findOneByLogin("test-register-valid")).isEmpty();
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(validUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(validUser))
.with(csrf().asHeader())
)
.andExpect(status().isCreated());
assertThat(userRepository.findOneByLogin("test-register-valid")).isPresent();
......@@ -162,15 +163,19 @@ class AccountResourceIT {
invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
Optional<User> user = userRepository.findOneByEmailIgnoreCase("funky@example.com");
assertThat(user).isEmpty();
}
@Test()
@Test
@Disabled("Self registration is not enabled")
@Transactional
void testRegisterInvalidEmail() throws Exception {
......@@ -186,8 +191,12 @@ class AccountResourceIT {
invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
Optional<User> user = userRepository.findOneByLogin("bob");
......@@ -210,8 +219,12 @@ class AccountResourceIT {
invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
Optional<User> user = userRepository.findOneByLogin("bob");
......@@ -234,8 +247,12 @@ class AccountResourceIT {
invalidUser.setAuthorities(Collections.singleton(AuthoritiesConstants.USER));
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(invalidUser))
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
Optional<User> user = userRepository.findOneByLogin("bob");
......@@ -274,8 +291,12 @@ class AccountResourceIT {
// First user
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(firstUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(firstUser))
.with(csrf().asHeader())
)
.andExpect(status().isCreated());
// Second (non activated) user
......@@ -311,8 +332,12 @@ class AccountResourceIT {
// Register first user
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(firstUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(firstUser))
.with(csrf().asHeader())
)
.andExpect(status().isCreated());
Optional<User> testUser1 = userRepository.findOneByLogin("test-register-duplicate-email");
......@@ -390,8 +415,12 @@ class AccountResourceIT {
validUser.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
restAccountMockMvc
.perform(post("/api/register").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(validUser))
.with(csrf().asHeader()))
.perform(
post("/api/register")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(validUser))
.with(csrf().asHeader())
)
.andExpect(status().isCreated());
Optional<User> userDup = userRepository.findOneWithAuthoritiesByLogin("badguy");
......@@ -448,8 +477,12 @@ class AccountResourceIT {
userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
restAccountMockMvc
.perform(post("/api/account").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader()))
.perform(
post("/api/account")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader())
)
.andExpect(status().isOk());
User updatedUser = userRepository.findOneWithAuthoritiesByLogin(user.getLogin()).orElse(null);
......@@ -486,9 +519,12 @@ class AccountResourceIT {
userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
restAccountMockMvc
.perform(post("/api/account").contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader()))
.perform(
post("/api/account")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
assertThat(userRepository.findOneByEmailIgnoreCase("invalid email")).isNotPresent();
......@@ -524,7 +560,12 @@ class AccountResourceIT {
userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
restAccountMockMvc
.perform(post("/api/account").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(userDTO)).with(csrf().asHeader()))
.perform(
post("/api/account")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
User updatedUser = userRepository.findOneByLogin("save-existing-email").orElse(null);
......@@ -553,8 +594,12 @@ class AccountResourceIT {
userDTO.setAuthorities(Collections.singleton(AuthoritiesConstants.ADMIN));
restAccountMockMvc
.perform(post("/api/account").contentType(MediaType.APPLICATION_JSON).content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader()))
.perform(
post("/api/account")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(userDTO))
.with(csrf().asHeader())
)
.andExpect(status().isOk());
User updatedUser = userRepository.findOneByLogin("save-existing-email-and-login").orElse(null);
......@@ -577,7 +622,7 @@ class AccountResourceIT {
post("/api/account/change-password")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO("1" + currentPassword, "new password")))
.with(csrf().asHeader())
.with(csrf().asHeader())
)
.andExpect(status().isBadRequest());
......@@ -602,7 +647,7 @@ class AccountResourceIT {
post("/api/account/change-password")
.contentType(MediaType.APPLICATION_JSON)
.content(TestUtil.convertObjectToJsonBytes(new PasswordChangeDTO(currentPassword, "new password")))
.with(csrf().asHeader())
.with(csrf().asHeader())
)
.andExpect(status().isOk());
......@@ -697,8 +742,7 @@ class AccountResourceIT {
userRepository.saveAndFlush(user);
restAccountMockMvc
.perform(post("/api/account/reset-password/init").content("password-reset@example.com")
.with(csrf().asHeader()))
.perform(post("/api/account/reset-password/init").content("password-reset@example.com").with(csrf().asHeader()))
.andExpect(status().isOk());
}
......@@ -713,16 +757,14 @@ class AccountResourceIT {
userRepository.saveAndFlush(user);
restAccountMockMvc
.perform(post("/api/account/reset-password/init").content("password-reset-upper-case@EXAMPLE.COM")
.with(csrf().asHeader()))
.perform(post("/api/account/reset-password/init").content("password-reset-upper-case@EXAMPLE.COM").with(csrf().asHeader()))
.andExpect(status().isOk());
}
@Test
void testRequestPasswordResetWrongEmail() throws Exception {
restAccountMockMvc
.perform(post("/api/account/reset-password/init").content("password-reset-wrong-email@example.com")
.with(csrf().asHeader()))
.perform(post("/api/account/reset-password/init").content("password-reset-wrong-email@example.com").with(csrf().asHeader()))
.andExpect(status().isOk());
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment