Feature auth update (#89)

* update auth

* changes files

* updating files

* fixed files

Author: Develop2Den

.github/workflows/deploy.yml

@@ -18,10 +18,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '21'
         distribution: 'adopt'
         architecture: x64
         cache: 'maven'

deploy/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.8'
 
 services:
   postgres_service:
+    container_name: postgres-chat-db
     image: postgres:16.3
     restart: always
     environment:

pom.xml

@@ -5,16 +5,17 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.1.1</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>3.4.1</version>
+		<relativePath/>
 	</parent>
 	<groupId>com.chat</groupId>
 	<artifactId>chatYourWay</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<name>chatYourWay</name>
 	<description>WebSocket chat</description>
 	<properties>
-		<java.version>17</java.version>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -67,7 +68,7 @@
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-			<scope>runtime</scope>
+			<version>42.7.4</version>
 		</dependency>
 
 		<!--Redis-->
@@ -85,8 +86,10 @@
 		<dependency>
 			<groupId>org.flywaydb</groupId>
 			<artifactId>flyway-core</artifactId>
+			<version>9.22.1</version>
 		</dependency>
 
+
 		<!--Others-->
 		<dependency>
 			<groupId>org.projectlombok</groupId>

src/main/java/com/chat/yourway/ChatYourWayApplication.java

@@ -1,5 +1,7 @@
 package com.chat.yourway;
 
+import io.swagger.v3.oas.annotations.OpenAPIDefinition;
+import io.swagger.v3.oas.annotations.info.Info;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.scheduling.annotation.EnableAsync;

src/main/java/com/chat/yourway/config/redis/RedisConfig.java

@@ -19,7 +19,7 @@ public class RedisConfig {
   @Bean
   public JedisConnectionFactory jedisConnectionFactory() {
     RedisStandaloneConfiguration redisStandaloneConfiguration = new RedisStandaloneConfiguration(
-        properties.getHost(), properties.getPort());
+            properties.getHost(), properties.getPort());
     if (properties.getProfile().equals("prod")) {
       redisStandaloneConfiguration.setPassword(properties.getPassword());
     }

src/main/java/com/chat/yourway/controller/rest/AuthenticationController.java

@@ -18,6 +18,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.Authentication;
 import org.springframework.web.bind.annotation.*;
 
@@ -83,15 +84,18 @@ public AuthResponseDto refreshToken(HttpServletRequest request) {
     }
 
     @Operation(summary = "Activate account", responses = {
-                    @ApiResponse(responseCode = "200", description = SUCCESSFULLY_ACTIVATED_ACCOUNT),
-                    @ApiResponse(responseCode = "404", description = EMAIL_TOKEN_NOT_FOUND,
-                            content = @Content(schema = @Schema(implementation = ApiErrorResponseDto.class)))
-            })
-    @PostMapping(path = ACTIVATE, consumes = APPLICATION_JSON_VALUE)
-    public void activateAccount() {
-        authService.activateAccount();
+            @ApiResponse(responseCode = "200", description = SUCCESSFULLY_ACTIVATED_ACCOUNT),
+            @ApiResponse(responseCode = "404", description = EMAIL_TOKEN_NOT_FOUND,
+                    content = @Content(schema = @Schema(implementation = ApiErrorResponseDto.class))),
+            @ApiResponse(responseCode = "400", description = "Invalid or expired token")
+    })
+    @PostMapping(path = ACTIVATE)
+    public ResponseEntity<String> activateAccount(@RequestParam("token") String token) {
+        authService.activateAccount(token); // Передаем токен для активации
+        return ResponseEntity.ok("Account successfully activated");
     }
 
+
     @Operation(summary = "Resend email", responses = {
             @ApiResponse(responseCode = "200", description = SUCCESSFULLY_ACTIVATED_ACCOUNT)
     })

src/main/java/com/chat/yourway/model/Contact.java

@@ -21,7 +21,7 @@ public class Contact implements UserDetails {
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
 
-    @Column(nullable = false)
+    @Column(nullable = false, unique = true)
     private String nickname;
 
     @Column(nullable = false)

src/main/java/com/chat/yourway/security/JwtAuthFilter.java

@@ -37,6 +37,14 @@ public class JwtAuthFilter extends OncePerRequestFilter {
   protected void doFilterInternal(@NonNull HttpServletRequest request,
                                   @NonNull HttpServletResponse response,
                                   @NonNull FilterChain filterChain) {
+
+    String path = request.getRequestURI();
+
+    if (path.startsWith("/auth/activate")) {
+      filterChain.doFilter(request, response);
+      return;
+    }
+
     if (isNotAuthorizationHeader(request) && isNotTokenParameter(request)) {
       log.warn("Request without authorization. Header or parameter does not contain {}", AUTHORIZATION);
       filterChain.doFilter(request, response);

src/main/java/com/chat/yourway/security/JwtService.java

@@ -31,6 +31,10 @@ public String extractEmail(String token) {
     return extractClaim(token, Claims::getSubject);
   }
 
+  public String extractEmailToken(String token) {
+    return extractClaim(token, Claims::getSubject);
+  }
+
   public String generateAccessToken(UserDetails userDetails) {
     return generateAccessTokenBuild(new HashMap<>(), userDetails);
   }

src/main/java/com/chat/yourway/service/ActivateAccountService.java

@@ -1,7 +1,10 @@
 package com.chat.yourway.service;
 
 import com.chat.yourway.dto.common.EmailMessageInfoDto;
+import com.chat.yourway.exception.ContactNotFoundException;
+import com.chat.yourway.exception.InvalidTokenException;
 import com.chat.yourway.model.Contact;
+import com.chat.yourway.security.JwtService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -17,16 +20,24 @@ public class ActivateAccountService {
     private final EmailSenderService emailSenderService;
     private final EmailMessageFactoryService emailMessageFactoryService;
     private final ContactService contactService;
+    private final JwtService jwtService;
 
     @Transactional
-    public void activateAccount() {
-        log.trace("Started activateAccount by email");
+    public void activateAccount(String token) {
+        log.trace("Started account activation for token: {}", token);
+
+        String email = jwtService.extractEmailToken(token);
+
+        Contact contact = contactService.findByEmail(email);
+        if (contact == null) {
+            log.warn("Contact not found for email: {}", email);
+            throw new ContactNotFoundException("Contact not found for email: " + email);
+        }
 
-        final var contact = contactService.getCurrentContact();
         contact.setActive(true);
         contactService.save(contact);
 
-        log.info("Account is activate for contact email [{}]", contact.getEmail());
+        log.info("Account successfully activated for email: {}", email);
     }
 
     public void sendVerifyEmail(Contact contact, String clientHost) {