From 466b54924b5d80eba620f723b2cbf4a89c2947f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Ko=C5=A1=C5=A5=C3=A1l?= <55306515+Katzzer@users.noreply.github.com> Date: Wed, 11 Sep 2024 22:30:46 +0200 Subject: [PATCH 01/14] Create docker-image.yml --- .github/workflows/docker-image.yml | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/docker-image.yml diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml new file mode 100644 index 0000000..3079b69 --- /dev/null +++ b/.github/workflows/docker-image.yml @@ -0,0 +1,37 @@ +name: create docker image and push it to DockerHub + +on: + push: + branches: [ main ] + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up JDK + uses: actions/setup-java@v1 + with: + java-version: 1.17 + - + name: Build with Maven + run: mvn clean install + - + name: Set up Docker Build + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: . + push: true + tags: pavelkostal/food-app:latest From 405106b18efd5f0d72a356cd8d7e707895b8ae74 Mon Sep 17 00:00:00 2001 From: BOUALI Ali Date: Sat, 6 Apr 2024 14:20:43 +0200 Subject: [PATCH 02/14] Create LICENCE --- LICENCE | 1 + 1 file changed, 1 insertion(+) create mode 100644 LICENCE diff --git a/LICENCE b/LICENCE new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/LICENCE @@ -0,0 +1 @@ + From a372c94d30a2dd9dbfe094d6aa1a352c6858baf8 Mon Sep 17 00:00:00 2001 From: BOUALI Ali Date: Sat, 6 Apr 2024 14:22:00 +0200 Subject: [PATCH 03/14] Update LICENSE --- LICENSE | 201 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. From 76806dff5ae37527f54a637d0395f6aab579af12 Mon Sep 17 00:00:00 2001 From: BOUALI Ali Date: Sat, 6 Apr 2024 14:23:08 +0200 Subject: [PATCH 04/14] Delete undefined LICENCE --- LICENCE | 1 - 1 file changed, 1 deletion(-) delete mode 100644 LICENCE diff --git a/LICENCE b/LICENCE deleted file mode 100644 index 8b13789..0000000 --- a/LICENCE +++ /dev/null @@ -1 +0,0 @@ - From a74f739a81a4ed0ea601f85b634c2589c95adb08 Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Wed, 11 Sep 2024 22:03:49 +0200 Subject: [PATCH 05/14] Update database credentials and configuration Modified the `application.yml` and `docker-compose.yml` files to use 'postgres' as the database username and password. Also changed the JPA hibernate `ddl-auto` configuration from 'create-drop' to 'update' for better consistency during development. --- docker-compose.yml | 4 ++-- src/main/resources/application.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8c2973b..fd11cbc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: container_name: postgres-sql image: postgres environment: - POSTGRES_USER: username - POSTGRES_PASSWORD: password + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres PGDATA: /data/postgres volumes: - postgres:/data/postgres diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 71b71d1..18f827c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,12 +1,12 @@ spring: datasource: - url: jdbc:postgresql://localhost:5432/jwt_security - username: username - password: password + url: jdbc:postgresql://localhost:5432/postgres + username: postgres + password: postgres driver-class-name: org.postgresql.Driver jpa: hibernate: - ddl-auto: create-drop + ddl-auto: update show-sql: false properties: hibernate: From 0cbabeeeb99f7a00d924bc8ea9aefc46c9351b29 Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Wed, 11 Sep 2024 23:01:34 +0200 Subject: [PATCH 06/14] Add PostgreSQL service to Docker workflow Incorporated PostgreSQL service to the GitHub Actions workflow for building Docker images. The setup ensures the database is ready before Maven builds, supporting integration tests. Adjusted formatting and fixed Java version specification. --- .github/workflows/docker-image.yml | 57 +++++++++++++++++++++--------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 3079b69..3fdb0fa 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,37 +1,62 @@ -name: create docker image and push it to DockerHub +name: Create Docker Image and Push It to DockerHub on: push: - branches: [ main ] + branches: [main] jobs: docker: runs-on: ubuntu-latest + services: + db: + image: postgres:13 + env: + POSTGRES_USER: postgres + POSTGRES_PASSWORD: password + POSTGRES_DB: testdb + ports: + - 5432:5432 + options: >- + --health-cmd pg_isready + --health-interval 10s + --health-timeout 5s + --health-retries 5 + steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v2 - - - name: Set up JDK + + - name: Set up JDK uses: actions/setup-java@v1 with: - java-version: 1.17 - - - name: Build with Maven + java-version: 17 + + - name: Wait for PostgreSQL to be ready + run: | + while ! pg_isready -h localhost -p 5432; do + echo "$(date) - waiting for database to start" + sleep 2 + done + + - name: Build with Maven run: mvn clean install - - - name: Set up Docker Build + env: + SPRING_DATASOURCE_URL: jdbc:postgresql://localhost:5432/testdb + SPRING_DATASOURCE_USERNAME: postgres + SPRING_DATASOURCE_PASSWORD: password + + - name: Set up Docker Build uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub + + - name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and push + + - name: Build and push uses: docker/build-push-action@v2 with: context: . push: true - tags: pavelkostal/food-app:latest + tags: pavelkostal/food-app:latest \ No newline at end of file From 2eb10be41e52b5721f3ef194378c1523c5f667b5 Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Wed, 11 Sep 2024 23:03:42 +0200 Subject: [PATCH 07/14] Add Dockerfile for Java application Introduce a Dockerfile to containerize a Java application using OpenJDK 17 on Alpine Linux. The Dockerfile copies the JAR file from the build artifacts and sets the entry point to run the application. --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..adf7480 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:17-alpine +ARG JAR_FILE=api/target/*.jar +COPY ${JAR_FILE} api.jar +ENTRYPOINT ["java","-jar","/api.jar"] \ No newline at end of file From 4d8c2b910114675728521fbbbcd62effa4333b4c Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Wed, 11 Sep 2024 23:06:51 +0200 Subject: [PATCH 08/14] Simplify JAR file path in Dockerfile Updated the ARG JAR_FILE to eliminate the 'api/' prefix, ensuring consistency with the copy command. Also added spacing in ENTRYPOINT for better readability. --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index adf7480..f192ae3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM openjdk:17-alpine -ARG JAR_FILE=api/target/*.jar +ARG JAR_FILE=target/*.jar COPY ${JAR_FILE} api.jar -ENTRYPOINT ["java","-jar","/api.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-jar", "/api.jar"] \ No newline at end of file From 7c3892f0db4886b590214529b8d3d98436d14ae4 Mon Sep 17 00:00:00 2001 From: katzz Date: Sun, 15 Sep 2024 16:09:26 +0200 Subject: [PATCH 09/14] Add user existence check during registration Implemented a check to verify if a user with the same email already exists during registration. If a duplicate user is detected, a custom exception is thrown and an appropriate error message is returned to the client. --- .../security/auth/AuthenticationController.java | 13 ++++++++++--- .../security/auth/AuthenticationResponse.java | 6 ++++++ .../security/auth/AuthenticationService.java | 17 ++++++++++++----- .../UserAlreadyExistsException.java | 7 +++++++ .../java/com/alibou/security/user/User.java | 12 ++++-------- 5 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/alibou/security/customException/UserAlreadyExistsException.java diff --git a/src/main/java/com/alibou/security/auth/AuthenticationController.java b/src/main/java/com/alibou/security/auth/AuthenticationController.java index e1d5107..2ff0e0d 100644 --- a/src/main/java/com/alibou/security/auth/AuthenticationController.java +++ b/src/main/java/com/alibou/security/auth/AuthenticationController.java @@ -1,8 +1,10 @@ package com.alibou.security.auth; +import com.alibou.security.customException.UserAlreadyExistsException; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -20,10 +22,16 @@ public class AuthenticationController { @PostMapping("/register") public ResponseEntity register( - @RequestBody RegisterRequest request + @RequestBody RegisterRequest request ) { - return ResponseEntity.ok(service.register(request)); + try { + return ResponseEntity.ok(service.register(request)); + } catch (UserAlreadyExistsException e) { + return ResponseEntity.status(HttpStatus.CONFLICT) + .body(new AuthenticationResponse(e.getMessage())); + } } + @PostMapping("/authenticate") public ResponseEntity authenticate( @RequestBody AuthenticationRequest request @@ -39,5 +47,4 @@ public void refreshToken( service.refreshToken(request, response); } - } diff --git a/src/main/java/com/alibou/security/auth/AuthenticationResponse.java b/src/main/java/com/alibou/security/auth/AuthenticationResponse.java index c10bbb6..7b104b9 100644 --- a/src/main/java/com/alibou/security/auth/AuthenticationResponse.java +++ b/src/main/java/com/alibou/security/auth/AuthenticationResponse.java @@ -16,4 +16,10 @@ public class AuthenticationResponse { private String accessToken; @JsonProperty("refresh_token") private String refreshToken; + @JsonProperty("error") + private String errorMessage; + + public AuthenticationResponse(String errorMessage) { + this.errorMessage = errorMessage; + } } diff --git a/src/main/java/com/alibou/security/auth/AuthenticationService.java b/src/main/java/com/alibou/security/auth/AuthenticationService.java index 53193a7..68b3633 100644 --- a/src/main/java/com/alibou/security/auth/AuthenticationService.java +++ b/src/main/java/com/alibou/security/auth/AuthenticationService.java @@ -1,10 +1,10 @@ package com.alibou.security.auth; import com.alibou.security.config.JwtService; +import com.alibou.security.customException.UserAlreadyExistsException; import com.alibou.security.token.Token; import com.alibou.security.token.TokenRepository; import com.alibou.security.token.TokenType; -import com.alibou.security.user.Role; import com.alibou.security.user.User; import com.alibou.security.user.UserRepository; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,10 +14,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.security.web.authentication.WebAuthenticationDetailsSource; import org.springframework.stereotype.Service; import java.io.IOException; @@ -39,13 +36,18 @@ public AuthenticationResponse register(RegisterRequest request) { .password(passwordEncoder.encode(request.getPassword())) .role(request.getRole()) .build(); + + if (checkIfUserExists(user)) { + throw new UserAlreadyExistsException("User already exist with email: " + request.getEmail()); + } + var savedUser = repository.save(user); var jwtToken = jwtService.generateToken(user); var refreshToken = jwtService.generateRefreshToken(user); saveUserToken(savedUser, jwtToken); return AuthenticationResponse.builder() .accessToken(jwtToken) - .refreshToken(refreshToken) + .refreshToken(refreshToken) .build(); } @@ -79,6 +81,11 @@ private void saveUserToken(User user, String jwtToken) { tokenRepository.save(token); } + private boolean checkIfUserExists(User user) { + return repository.findByEmail(user.getEmail()) + .isPresent(); + } + private void revokeAllUserTokens(User user) { var validUserTokens = tokenRepository.findAllValidTokenByUser(user.getId()); if (validUserTokens.isEmpty()) diff --git a/src/main/java/com/alibou/security/customException/UserAlreadyExistsException.java b/src/main/java/com/alibou/security/customException/UserAlreadyExistsException.java new file mode 100644 index 0000000..22e8ee8 --- /dev/null +++ b/src/main/java/com/alibou/security/customException/UserAlreadyExistsException.java @@ -0,0 +1,7 @@ +package com.alibou.security.customException; + +public class UserAlreadyExistsException extends RuntimeException { + public UserAlreadyExistsException(String message) { + super(message); + } +} diff --git a/src/main/java/com/alibou/security/user/User.java b/src/main/java/com/alibou/security/user/User.java index bc4e086..b31c5ab 100644 --- a/src/main/java/com/alibou/security/user/User.java +++ b/src/main/java/com/alibou/security/user/User.java @@ -1,13 +1,8 @@ package com.alibou.security.user; import com.alibou.security.token.Token; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; +import jakarta.persistence.*; + import java.util.Collection; import java.util.List; import lombok.AllArgsConstructor; @@ -15,7 +10,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; @Data @@ -31,6 +25,8 @@ public class User implements UserDetails { private Integer id; private String firstname; private String lastname; + + @Column(unique = true) private String email; private String password; From 9a6a605560cb9cb88a4e23d52fc800472898f4dc Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Wed, 11 Sep 2024 23:20:19 +0200 Subject: [PATCH 10/14] Add food-app service and set Docker Compose version to 3.8 Updated the docker-compose.yml to use version 3.8. Added a new service named 'food-app' with its necessary configuration, including environment variables, ports, networks, dependencies, and restart policy. --- docker-compose.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index fd11cbc..6f0ec43 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,5 @@ +version: '3.8' + services: postgres: container_name: postgres-sql @@ -29,6 +31,20 @@ services: - postgres restart: unless-stopped + food-app: + image: pavelkostal/food-app + environment: + SPRING_DATASOURCE_URL: jdbc:postgresql://postgres-sql:5432/postgres + SPRING_DATASOURCE_USERNAME: postgres + SPRING_DATASOURCE_PASSWORD: postgres + ports: + - "8080:8080" + networks: + - postgres + depends_on: + - postgres + restart: unless-stopped + networks: postgres: driver: bridge From b77aee44e73f029e99e425a749924454ef351ec6 Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Sun, 15 Sep 2024 21:06:13 +0200 Subject: [PATCH 11/14] Add logging functionality to the authentication service Integrated the `@Slf4j` annotation to enable logging in `AuthenticationService.java` and `SecurityApplication.java`. Logging now captures user existence checks and registration token creation, replacing print statements with log entries. --- .../alibou/security/SecurityApplication.java | 23 ++++++++++++++++--- .../security/auth/AuthenticationService.java | 3 +++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/alibou/security/SecurityApplication.java b/src/main/java/com/alibou/security/SecurityApplication.java index 1448cff..446a595 100644 --- a/src/main/java/com/alibou/security/SecurityApplication.java +++ b/src/main/java/com/alibou/security/SecurityApplication.java @@ -1,8 +1,10 @@ package com.alibou.security; +import com.alibou.security.auth.AuthenticationResponse; import com.alibou.security.auth.AuthenticationService; import com.alibou.security.auth.RegisterRequest; -import com.alibou.security.user.Role; +import com.alibou.security.customException.UserAlreadyExistsException; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -14,6 +16,7 @@ @SpringBootApplication @EnableJpaAuditing(auditorAwareRef = "auditorAware") +@Slf4j public class SecurityApplication { public static void main(String[] args) { @@ -32,7 +35,14 @@ public CommandLineRunner commandLineRunner( .password("password") .role(ADMIN) .build(); - System.out.println("Admin token: " + service.register(admin).getAccessToken()); + + AuthenticationResponse registerAdmin; + try { + registerAdmin = service.register(admin); + log.info("Admin token: {}", registerAdmin.getAccessToken()); + } catch (UserAlreadyExistsException e) { + // do nothing + } var manager = RegisterRequest.builder() .firstname("Admin") @@ -41,7 +51,14 @@ public CommandLineRunner commandLineRunner( .password("password") .role(MANAGER) .build(); - System.out.println("Manager token: " + service.register(manager).getAccessToken()); + + AuthenticationResponse registerManger; + try { + registerManger = service.register(manager); + log.info("Manager token: {}", registerManger.getAccessToken()); + } catch (UserAlreadyExistsException e) { + // do nothing + } }; } diff --git a/src/main/java/com/alibou/security/auth/AuthenticationService.java b/src/main/java/com/alibou/security/auth/AuthenticationService.java index 68b3633..83fb9a4 100644 --- a/src/main/java/com/alibou/security/auth/AuthenticationService.java +++ b/src/main/java/com/alibou/security/auth/AuthenticationService.java @@ -11,6 +11,7 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -19,6 +20,7 @@ import java.io.IOException; +@Slf4j @Service @RequiredArgsConstructor public class AuthenticationService { @@ -38,6 +40,7 @@ public AuthenticationResponse register(RegisterRequest request) { .build(); if (checkIfUserExists(user)) { + log.info("User already exist with email: {}", request.getEmail()); throw new UserAlreadyExistsException("User already exist with email: " + request.getEmail()); } From 230a48ee3d3fa5009639de12d59ccda704333d2b Mon Sep 17 00:00:00 2001 From: Katzz Win11 PC Date: Sun, 15 Sep 2024 21:17:58 +0200 Subject: [PATCH 12/14] Update version to 0.0.2-SNAPSHOT and add logging for user creation Updated project version in pom.xml to 0.0.2-SNAPSHOT. Added logs to indicate the creation of 'Admin' and 'Manager' users in SecurityApplication.java. Corrected the manager's first and last name in the registration request. --- pom.xml | 2 +- src/main/java/com/alibou/security/SecurityApplication.java | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9c14b26..c5b31a7 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.alibou security - 0.0.1-SNAPSHOT + 0.0.2-SNAPSHOT security Demo project for Spring Boot diff --git a/src/main/java/com/alibou/security/SecurityApplication.java b/src/main/java/com/alibou/security/SecurityApplication.java index 446a595..8a5af49 100644 --- a/src/main/java/com/alibou/security/SecurityApplication.java +++ b/src/main/java/com/alibou/security/SecurityApplication.java @@ -28,6 +28,7 @@ public CommandLineRunner commandLineRunner( AuthenticationService service ) { return args -> { + log.info("Creating user Admin with role admin"); var admin = RegisterRequest.builder() .firstname("Admin") .lastname("Admin") @@ -44,9 +45,10 @@ public CommandLineRunner commandLineRunner( // do nothing } + log.info("Creating user Manager with role manager"); var manager = RegisterRequest.builder() - .firstname("Admin") - .lastname("Admin") + .firstname("Manager") + .lastname("Manger") .email("manager@mail.com") .password("password") .role(MANAGER) From 9079ddf152f4569616417fab81109aaa3fdf2d11 Mon Sep 17 00:00:00 2001 From: katzz Date: Wed, 18 Sep 2024 22:07:32 +0200 Subject: [PATCH 13/14] Set user role to USER during registration Updated the `register` method in `AuthenticationController` to set the user role to `USER` by default. This ensures that all new users are assigned the `USER` role upon registration. --- .../java/com/alibou/security/auth/AuthenticationController.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/alibou/security/auth/AuthenticationController.java b/src/main/java/com/alibou/security/auth/AuthenticationController.java index 2ff0e0d..f6da8b1 100644 --- a/src/main/java/com/alibou/security/auth/AuthenticationController.java +++ b/src/main/java/com/alibou/security/auth/AuthenticationController.java @@ -1,6 +1,7 @@ package com.alibou.security.auth; import com.alibou.security.customException.UserAlreadyExistsException; +import com.alibou.security.user.Role; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; @@ -24,6 +25,7 @@ public class AuthenticationController { public ResponseEntity register( @RequestBody RegisterRequest request ) { + request.setRole(Role.USER); try { return ResponseEntity.ok(service.register(request)); } catch (UserAlreadyExistsException e) { From 07a97c851241d8c48ed9a2c38f4fe0019c3b8aa2 Mon Sep 17 00:00:00 2001 From: katzz Date: Mon, 14 Oct 2024 17:57:39 +0200 Subject: [PATCH 14/14] Add CorsConfig class to handle CORS settings This commit introduces a new CorsConfig class to manage Cross-Origin Resource Sharing (CORS) settings. It allows credentials, supports all headers and methods, and specifically allows requests from "http://localhost:3000". This enhances security and flexibility in handling CORS requests. --- .../alibou/security/config/CorsConfig.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 src/main/java/com/alibou/security/config/CorsConfig.java diff --git a/src/main/java/com/alibou/security/config/CorsConfig.java b/src/main/java/com/alibou/security/config/CorsConfig.java new file mode 100644 index 0000000..1ce302d --- /dev/null +++ b/src/main/java/com/alibou/security/config/CorsConfig.java @@ -0,0 +1,22 @@ +package com.alibou.security.config; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import org.springframework.web.filter.CorsFilter; + +@Configuration +public class CorsConfig { + + @Bean + public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + config.addAllowedOriginPattern("*"); + config.addAllowedHeader("*"); + config.addAllowedMethod("*"); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } +} \ No newline at end of file