Authentication and Authorization

pom.xml

@@ -10,74 +10,168 @@
     </parent>
     <groupId>pl.edu.agh.racing</groupId>
     <artifactId>c-model</artifactId>
-    <version>0.0.1</version>
+    <version>0.0.3</version>
     <name>c-model</name>
-    <description>Demo project for Spring Boot</description>
+    <description>C-Model app for AGH Racing Aerodynamics team</description>
 
     <properties>
         <java.version>11</java.version>
+        <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
+        <org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
+        <org.projectlombok.version>1.18.16</org.projectlombok.version>
+        <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>
 
     <dependencies>
+
+        <!-- Spring Boot Data Jpa dependency. Used to build the database -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
+
+        <!-- Spring Boot Security dependency. Used to secure the app -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-mail</artifactId>
+            <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
+
+        <!-- Spring Boot Web dependency. Used to create a web app -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-security</artifactId>
+            <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+
+        <!-- Spring Boot Thymeleaf dependency. Used to inject java code into HTML files -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-thymeleaf</artifactId>
+        </dependency>
+
+        <!-- Spring Boot Mail dependency. Used to send mails -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-mail</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- MySQL Connector dependency. Used to connect app with MySQL database -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- Lombok dependency. Used to reduce the amount of code -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!-- Validation api dependency. Used to validate data in database -->
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
             <version>2.0.1.Final</version>
         </dependency>
 
+        <!-- JWT related dependencies. Used in the implementation of authentication. -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-api</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-impl</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt-jackson</artifactId>
+            <version>0.11.2</version>
+        </dependency>
+
+        <!-- Spring Fox and Swagger dependencies. Used to document the api's -->
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger2</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.springfox</groupId>
+            <artifactId>springfox-swagger-ui</artifactId>
+            <version>2.9.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+        <!-- Spring Boot Test dependency. Used to test the app -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>junit</groupId>
-                    <artifactId>junit</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+
+        <!-- Spring Boot Security Test dependency. Used to test security of the app -->
         <dependency>
             <groupId>org.springframework.security</groupId>
             <artifactId>spring-security-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- H2 database dependency. Used to create an inmemory database during database tests -->
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
             <version>1.4.200</version>
             <scope>test</scope>
         </dependency>
+
     </dependencies>
 
     <build>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+                <configuration>
+                    <source>${java.version}</source> <!-- depending on your project -->
+                    <target>${java.version}</target> <!-- depending on your project -->
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${org.projectlombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>${lombok-mapstruct-binding.version}</version>
+                        </path>
+                        <!-- other annotation processors -->
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
@@ -87,6 +181,10 @@
                             <groupId>org.projectlombok</groupId>
                             <artifactId>lombok</artifactId>
                         </exclude>
+                        <exclude>
+                            <groupId>org.springframework.boot</groupId>
+                            <artifactId>spring-boot-configuration-processor</artifactId>
+                        </exclude>
                     </excludes>
                 </configuration>
             </plugin>

src/main/java/pl/edu/agh/racing/cmodel/CModelApplication.java

@@ -2,8 +2,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Import;
+import org.springframework.scheduling.annotation.EnableAsync;
+import pl.edu.agh.racing.cmodel.swagger.SwaggerConfiguration;
 
 @SpringBootApplication
+@EnableAsync
+@Import(SwaggerConfiguration.class)
 public class CModelApplication {
 
     public static void main(String[] args) {

src/main/java/pl/edu/agh/racing/cmodel/controller/AuthController.java

@@ -0,0 +1,54 @@
+package pl.edu.agh.racing.cmodel.controller;
+
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import pl.edu.agh.racing.cmodel.dto.request.RefreshTokenRequest;
+import pl.edu.agh.racing.cmodel.dto.response.AuthenticationResponse;
+import pl.edu.agh.racing.cmodel.dto.request.LoginRequest;
+import pl.edu.agh.racing.cmodel.dto.request.RegisterRequest;
+import pl.edu.agh.racing.cmodel.service.AuthService;
+import pl.edu.agh.racing.cmodel.service.RefreshTokenService;
+
+import javax.validation.Valid;
+
+import static org.springframework.http.HttpStatus.OK;
+
+@CrossOrigin(maxAge = 3600)
+@RestController
+@RequestMapping("/api/auth")
+@AllArgsConstructor
+public class AuthController {
+
+    private final AuthService authService;
+    private final RefreshTokenService refreshTokenService;
+
+    @PostMapping("/signup")
+    public ResponseEntity<String> signup(@RequestBody RegisterRequest registerRequest) {
+        authService.signup(registerRequest);
+        return new ResponseEntity<>("User Registration Successful",
+                OK);
+    }
+
+    @GetMapping("/accountVerification/{token}")
+    public ResponseEntity<String> verifyAccount(@PathVariable String token) {
+        authService.verifyAccount(token);
+        return new ResponseEntity<>("Account Has Activated Successfully", OK);
+    }
+
+    @PostMapping("/login")
+    public AuthenticationResponse login(@RequestBody LoginRequest loginRequest) {
+        return authService.login(loginRequest);
+    }
+
+    @PostMapping("refresh/token")
+    public AuthenticationResponse refreshTokens(@Valid @RequestBody RefreshTokenRequest refreshTokenRequest) {
+        return authService.refreshToken(refreshTokenRequest);
+    }
+
+    @PostMapping("/logout")
+    public ResponseEntity<String> logout(@Valid @RequestBody RefreshTokenRequest refreshTokenRequest) {
+        refreshTokenService.deleteRefreshToken(refreshTokenRequest.getRefreshToken());
+        return ResponseEntity.status(OK).body("Refresh Token Deleted Successfully!!");
+    }
+}

src/main/java/pl/edu/agh/racing/cmodel/controller/SimulationController.java

@@ -0,0 +1,42 @@
+package pl.edu.agh.racing.cmodel.controller;
+
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import pl.edu.agh.racing.cmodel.dto.SimulationDto;
+import pl.edu.agh.racing.cmodel.service.SimulationService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/simulations")
+@AllArgsConstructor
+@CrossOrigin(maxAge = 3600)
+public class SimulationController {
+
+    private final SimulationService simulationService;
+
+    @PostMapping
+    public ResponseEntity<Void> createSimulation(@RequestBody SimulationDto simulationDto){
+        simulationService.save(simulationDto);
+        return new ResponseEntity<>(HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<SimulationDto>> getAllSimulations(){
+        return ResponseEntity.status(HttpStatus.OK).body(simulationService.getAllSimulations());
+    }
+
+    @GetMapping("/pages/{pageNumber}")
+    public ResponseEntity<List<SimulationDto>> getAllSimulationsWithPagination(@PathVariable int pageNumber){
+        return ResponseEntity.status(HttpStatus.OK).body(simulationService.getAllSimulationWithPagination(pageNumber));
+    }
+
+    @GetMapping("/by-id/{simulationId}")
+    public ResponseEntity<SimulationDto> getSimulationById(@PathVariable Long simulationId){
+        return ResponseEntity.status(HttpStatus.OK).body(simulationService.getSimulationById(simulationId));
+    }
+
+
+}

src/main/java/pl/edu/agh/racing/cmodel/controller/TestController.java

@@ -0,0 +1,40 @@
+package pl.edu.agh.racing.cmodel.controller;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/api/test")
+public class TestController {
+
+    @GetMapping("/all")
+    public String allAccess() {
+        return "Public Content.";
+    }
+
+    @GetMapping("/newbie")
+    @PreAuthorize("hasRole('NEWBIE') or hasRole('USER') or hasRole('MODERATOR') or hasRole('ADMIN')")
+    public String newbieAccess() {
+        return "Newbie Content.";
+    }
+
+    @GetMapping("/user")
+    @PreAuthorize("hasRole('USER') or hasRole('MODERATOR') or hasRole('ADMIN')")
+    public String userAccess() {
+        return "User Content.";
+    }
+
+    @GetMapping("/moderator")
+    @PreAuthorize("hasRole('MODERATOR') or hasRole('ADMIN')")
+    public String moderatorAccess() {
+        return "Moderator Content.";
+    }
+
+    @GetMapping("/admin")
+    @PreAuthorize("hasRole('ADMIN')")
+    public String adminAccess() {
+        return "Admin Content.";
+    }
+}

src/main/java/pl/edu/agh/racing/cmodel/dto/NotificationEmailDto.java

@@ -0,0 +1,14 @@
+package pl.edu.agh.racing.cmodel.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class NotificationEmailDto {
+    private String subject;
+    private String recipient;
+    private String body;
+}

src/main/java/pl/edu/agh/racing/cmodel/dto/SimulationDto.java

@@ -0,0 +1,28 @@
+package pl.edu.agh.racing.cmodel.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.Instant;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SimulationDto {
+    private Long id;
+    private String name;
+    private String fw;
+    private String rw;
+    private String s;
+    private String diff;
+    private String u;
+    private String n;
+    private Double df;
+    private Double d;
+    private Double balance;
+    private Double mrfChlodnica;
+    private Long statusId;
+    private Instant createDateTime;
+    private Instant updateDateTime;
+}