FF-103 Logic for UserRegistration. (#32)

* WIP writing logic for UserRegistration.

* FF-103 wrote logic and unit tests.

* Added additional ExpectionHandler, and HealthCheck change.

* FF-103 added configuration key for password check.

* FF-103 Running cucumber tests works.

* FF-103 Reworked server response to use httpStatus messages instead of strings.

* FF-103 Implemented changes requested by @qvalentin, fixed some bugs.

* Fixed Maven Test Execution.

* updated version and date.

Co-authored-by: open-schnick <[email protected]>

Author: qvalentin

.run/JUnit Tests.run.xml

@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Run only Unit Tests" type="JUnit" factoryName="JUnit">
     <useClassPathOnly />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="ALTERNATIVE_JRE_PATH" value="11" />
     <option name="PACKAGE_NAME" value="" />
     <option name="MAIN_CLASS_NAME" value="" />

pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.4.0</version>
+        <version>2.3.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>de.filefighter</groupId>
     <artifactId>rest</artifactId>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <name>RestApi</name>
     <description>RestApi for FileFighter</description>
 
@@ -49,6 +49,11 @@
             <version>1.18.16</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+        </dependency>
+
         <!-- TESTING -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/de/filefighter/rest/RestApplication.java

@@ -4,18 +4,11 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.annotation.Bean;
-import org.springframework.web.client.RestTemplate;
 
 @SpringBootApplication
 @EnableConfigurationProperties(FileFighterProperties.class)
 public class RestApplication {
-	public static void main(String[] args) {
-		SpringApplication.run(RestApplication.class, args);
-	}
-
-	@Bean
-	public RestTemplate getRestTemplate() {
-		return new RestTemplate();
-	}
+    public static void main(String[] args) {
+        SpringApplication.run(RestApplication.class, args);
+    }
 }

src/main/java/de/filefighter/rest/configuration/FileFighterProperties.java

@@ -1,6 +1,5 @@
 package de.filefighter.rest.configuration;
 
-import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
@@ -13,6 +12,7 @@ public class FileFighterProperties {
      */
     private String version = "undefined";
     private String date = "undefined";
+    private boolean disablePasswordCheck = false;
 
     public String getVersion() {
         return version;
@@ -29,4 +29,12 @@ public String getDate() {
     public void setDate(String date) {
         this.date = date;
     }
-}
+
+    public boolean isDisablePasswordCheck() {
+        return disablePasswordCheck;
+    }
+
+    public void setDisablePasswordCheck(boolean disablePasswordCheck) {
+        this.disablePasswordCheck = disablePasswordCheck;
+    }
+}

src/main/java/de/filefighter/rest/configuration/PrepareDataBase.java

@@ -45,7 +45,7 @@ CommandLineRunner veryImportantFileFighterStartScript() {
             System.out.println(" |  _|   | | | | |  __/ |  _|   | | | (_| | | | | | | |_  |  __/ | |   ");
             System.out.println(" |_|     |_| |_|  \\___| |_|     |_|  \\__, | |_| |_|  \\__|  \\___| |_|   ");
             System.out.println("                                     |___/                             ");
-            System.out.println("                  Version v"+version+" Last updated at "+date+"               ");
+            System.out.println("                  Version v" + version + " Last updated at " + date + "               ");
             System.out.println("             Developed by Gimleux, Valentin, Open-Schnick.            ");
             System.out.println("           Development Blog: https://filefighter.github.io            ");
             System.out.println("       The code can be found at: https://www.github.com/filefighter    ");
@@ -102,7 +102,7 @@ CommandLineRunner initUserDataBaseDev(UserRepository repository) {
                             .lowercaseUsername("user")
                             .password("1234")
                             .refreshToken("rft1234")
-                            .groupIds(new long[]{0})
+                            .groupIds(new long[]{1})
                             .build()) +
                     repository.save(UserEntity
                             .builder()
@@ -155,7 +155,7 @@ CommandLineRunner initFileSystemDataBaseDev(FileSystemRepository repository) {
                             .name("root")
                             .size(420)
                             .typeId(FileSystemType.FOLDER.getId())
-                            .visibleForGroupIds(new long[]{-1,0,1})
+                            .visibleForGroupIds(new long[]{-1, 0, 1})
                             .build()) +
                     repository.save(FileSystemEntity.builder()
                             .createdByUserId(0)

src/main/java/de/filefighter/rest/configuration/RestConfiguration.java

@@ -16,6 +16,7 @@ public class RestConfiguration {
     public static final String FS_BASE_URI = "/filesystem/";
     public static final String FS_PATH_HEADER = "X-FF-PATH";
     public static final String USER_BASE_URI = "/users/";
+    public static final String DEFAULT_ERROR_PATH = "/error";
 
     @Bean
     public WebMvcConfigurer configurer(){

src/main/java/de/filefighter/rest/domain/common/Utils.java

@@ -2,19 +2,42 @@
 
 import de.filefighter.rest.rest.exceptions.RequestDidntMeetFormalRequirementsException;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
 public class Utils {
 
-    public static boolean stringIsValid(String s){
+    private Utils() {
+        // Prevent Instantiation
+    }
+
+    public static boolean stringIsValid(String s) {
         return !(null == s || s.isEmpty() || s.isBlank());
     }
 
-    public static String validateAuthorizationHeader(String header, String testString){
-        if(!stringIsValid(testString))
+    public static String validateAuthorizationHeader(String header, String testString) {
+        if (!stringIsValid(testString))
             throw new RequestDidntMeetFormalRequirementsException("Header does not contain a valid String.");
 
         if (!testString.matches("^" + header + "[^\\s](.*)$"))
             throw new RequestDidntMeetFormalRequirementsException("Header does not contain '" + header + "', or format is invalid.");
         String[] split = testString.split(header);
         return split[1];
     }
+
+    public static List<String> getLinesFromFile(File file) {
+        ArrayList<String> lines = new ArrayList<>();
+        try (BufferedReader br = new BufferedReader(new FileReader(file))) {
+            while (br.ready()) {
+                lines.add(br.readLine().replace(" ",""));
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return lines;
+    }
 }

src/main/java/de/filefighter/rest/domain/health/business/SystemHealthBusinessService.java

@@ -15,6 +15,7 @@ public class SystemHealthBusinessService {
     private final UserBusinessService userBusinessService;
     private final AccessTokenBusinessService accessTokenBusinessService;
     private final long serverStartedAt;
+    private DataIntegrity cachedIntegrity = DataIntegrity.STABLE;
 
     @Value("${filefighter.version}")
     String version;
@@ -41,13 +42,19 @@ private DataIntegrity calculateDataIntegrity() {
 
         // Risk / Unstable Cases.
         if(userCount < accessTokenCount){
-            return DataIntegrity.POSSIBLE_RISK;
+            this.triggerIntegrityChange(DataIntegrity.POSSIBLE_RISK);
         }
 
-        return DataIntegrity.STABLE;
+        return cachedIntegrity;
     }
 
     public long getCurrentEpochSeconds(){
         return Instant.now().getEpochSecond();
     }
+
+    public void triggerIntegrityChange(DataIntegrity integrity) {
+        if(cachedIntegrity.getCode() < integrity.getCode()){
+            this.cachedIntegrity = integrity;
+        }
+    }
 }

src/main/java/de/filefighter/rest/domain/health/data/SystemHealth.java

@@ -16,6 +16,16 @@ public class SystemHealth {
     private final String version;
 
     public enum DataIntegrity {
-        STABLE, POSSIBLE_RISK, UNSTABLE
+        STABLE(0), POSSIBLE_RISK(1), UNSTABLE(2);
+
+        private final int code;
+
+        DataIntegrity(int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return code;
+        }
     }
 }

src/main/java/de/filefighter/rest/domain/token/business/AccessTokenBusinessService.java

@@ -3,7 +3,6 @@
 import de.filefighter.rest.domain.token.data.dto.AccessToken;
 import de.filefighter.rest.domain.token.data.persistance.AccessTokenEntity;
 import de.filefighter.rest.domain.token.data.persistance.AccessTokenRepository;
-import de.filefighter.rest.domain.token.exceptions.AccessTokenNotFoundException;
 import de.filefighter.rest.domain.user.data.dto.User;
 import de.filefighter.rest.domain.user.exceptions.UserNotAuthenticatedException;
 import de.filefighter.rest.rest.exceptions.RequestDidntMeetFormalRequirementsException;
@@ -12,7 +11,6 @@
 import java.time.Instant;
 import java.util.UUID;
 
-import static de.filefighter.rest.configuration.RestConfiguration.AUTHORIZATION_BASIC_PREFIX;
 import static de.filefighter.rest.configuration.RestConfiguration.AUTHORIZATION_BEARER_PREFIX;
 import static de.filefighter.rest.domain.common.Utils.stringIsValid;
 import static de.filefighter.rest.domain.common.Utils.validateAuthorizationHeader;
@@ -91,7 +89,7 @@ public AccessToken validateAccessTokenValue(String accessTokenValue) {
         return accessTokenDtoService.createDto(accessTokenEntity);
     }
 
-    public String generateRandomTokenValue() {
+    public static String generateRandomTokenValue() {
         return UUID.randomUUID().toString();
     }