Spring Application v5

Author: Pastor

heroes/.gitignore

@@ -1 +1,2 @@
 /pg
+/grafana-data

heroes/configuration/grafana/datasources.yml

@@ -0,0 +1,8 @@
+apiVersion: 1
+
+datasources:
+  - name: Prometheus
+    type: prometheus
+    url: http://prometheus:9090
+    isDefault: true
+    access: proxy

heroes/configuration/postgres/pg_init.sql

@@ -0,0 +1,3 @@
+CREATE DATABASE rooms;
+\c rooms;
+SET search_path TO public;

heroes/configuration/prometheus/prometheus.yml

@@ -0,0 +1,8 @@
+global:
+  scrape_interval: 5s
+
+scrape_configs:
+  - job_name: 'heroes-application'
+    metrics_path: '/actuator/prometheus'
+    static_configs:
+      - targets: ['host.docker.internal:9097']

heroes/docker-compose.yml

@@ -4,15 +4,30 @@ services:
         container_name: heroes-db
         restart: always
         environment:
-            POSTGRES_DB: postgres
+            POSTGRES_DB: rooms
             POSTGRES_USER: postgres
             POSTGRES_PASSWORD: postgres
         ports:
             - "25432:5432"
         volumes:
             - ./pg:/var/lib/postgresql/data
+            - ./configuration/postgres/pg_init.sql:/docker-entrypoint-initdb.d/init.sql
         healthcheck:
-            test: [ "CMD-SHELL", "pg_isready -U postgres -d postgres" ]
+            test: [ "CMD-SHELL", "pg_isready -U postgres -d rooms" ]
             interval: 5s
             timeout: 5s
             retries: 5
+    prometheus:
+        image: prom/prometheus
+        ports:
+            - "19090:9090"
+        volumes:
+            - ./configuration/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
+
+    grafana:
+        image: grafana/grafana
+        ports:
+            - "13000:3000"
+        volumes:
+            - ./grafana-data:/var/lib/grafana
+            - ./configuration/grafana/datasources.yml:/etc/grafana/provisioning/datasources/datasources.yml

heroes/src/main/java/ru/mifi/practice/voln/configuration/SecurityConfiguration.java

@@ -128,10 +128,10 @@ protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull Ht
             }
 
             var jwt = authHeader.substring(BEARER_PREFIX.length());
-            var username = jwtService.extractUserName(jwt);
+            var userId = jwtService.extractUserId(jwt);
 
-            if (StringUtils.hasText(username) && SecurityContextHolder.getContext().getAuthentication() == null) {
-                UserDetails userDetails = userService.loadUserByUsername(username);
+            if (SecurityContextHolder.getContext().getAuthentication() == null && userId.isPresent()) {
+                UserDetails userDetails = userService.loadUserById(userId.get());
                 if (jwtService.isTokenValid(jwt, userDetails)) {
                     SecurityContext context = SecurityContextHolder.createEmptyContext();
                     UsernamePasswordAuthenticationToken authToken = new UsernamePasswordAuthenticationToken(

heroes/src/main/java/ru/mifi/practice/voln/controller/ChatController.java

@@ -41,64 +41,42 @@ public ChatController(UserPresenceService userPresenceService) {
     }
 
     @GetMapping("/api/chat/connect")
-    public SseEmitter connect(@RequestParam String username,
-                              HttpServletRequest request) {
-
-        // Генерируем уникальный ID сессии
+    public SseEmitter connect(@RequestParam String username, HttpServletRequest request) {
         UUID sessionId = UUID.randomUUID();
-
-        // Проверяем, не занято ли имя пользователя (опционально)
         if (userPresenceService.isUsernameTaken(username)) {
             throw new ResponseStatusException(
                 HttpStatus.CONFLICT,
                 "Имя пользователя уже занято"
             );
         }
 
-        SseEmitter emitter = new SseEmitter(60L * 1000 * 60); // 60 минут timeout
-
-        // Создаем пользователя
+        SseEmitter emitter = new SseEmitter(60L * 1000 * 60);
         RoomUser user = userPresenceService.addUser(username, sessionId, emitter);
-
-        // Отправляем информацию о пользователе
         Map<String, Object> userInfo = new HashMap<>();
         userInfo.put("sessionId", sessionId);
         userInfo.put("username", username);
         userInfo.put("connectedAt", user.connected());
 
         try {
-            // Отправляем данные о соединении
             emitter.send(SseEmitter.event()
                 .name("connected")
                 .data(userInfo));
-
-            // Отправляем историю сообщений
             for (RoomMessage message : messageHistory) {
                 emitter.send(SseEmitter.event()
                     .name("message")
                     .data(message));
             }
-
-            // Отправляем текущий список пользователей
             sendUserListUpdate();
 
         } catch (IOException e) {
             userPresenceService.removeUser(sessionId);
             emitter.completeWithError(e);
         }
+        emitter.onCompletion(() -> handleUserDisconnect(sessionId, username, "disconnected"));
 
-        // Обработчики событий
-        emitter.onCompletion(() -> {
-            handleUserDisconnect(sessionId, username, "disconnected");
-        });
-
-        emitter.onTimeout(() -> {
-            handleUserDisconnect(sessionId, username, "timeout");
-        });
+        emitter.onTimeout(() -> handleUserDisconnect(sessionId, username, "timeout"));
 
-        emitter.onError((e) -> {
-            handleUserDisconnect(sessionId, username, "error");
-        });
+        emitter.onError((e) -> handleUserDisconnect(sessionId, username, "error"));
 
         return emitter;
     }

heroes/src/main/java/ru/mifi/practice/voln/domain/entity/AuthorityEntity.java

@@ -12,8 +12,10 @@
 import jakarta.persistence.Table;
 import jakarta.persistence.UniqueConstraint;
 import lombok.Getter;
+import lombok.ToString;
 import org.springframework.security.core.GrantedAuthority;
 
+@ToString(of = {"authority", "user"})
 @Getter
 @Entity
 @Table(name = "authorities", uniqueConstraints = @UniqueConstraint(columnNames = {"user_id", "authority"}))

heroes/src/main/java/ru/mifi/practice/voln/domain/entity/UserEntity.java

@@ -12,12 +12,14 @@
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
 import java.util.UUID;
 
+@ToString(exclude = "authorities")
 @Builder(toBuilder = true)
 @Getter
 @Entity

heroes/src/main/java/ru/mifi/practice/voln/service/JwtService.java

@@ -2,7 +2,6 @@
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 import lombok.RequiredArgsConstructor;
@@ -14,6 +13,8 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.function.Function;
 
 @Service
@@ -29,21 +30,26 @@ public String extractUserName(String token) {
         return extractClaim(token, Claims::getSubject);
     }
 
+    public Optional<UUID> extractUserId(String token) {
+        return Optional.ofNullable(extractClaim(token, claims -> claims.get("user_id", String.class)))
+            .map(UUID::fromString);
+    }
+
     public String generateToken(UserDetails userDetails) {
         Map<String, Object> claims = new HashMap<>();
-        if (userDetails instanceof UserEntity customUserDetails) {
-            claims.put("id", customUserDetails.getId());
-            claims.put("email", customUserDetails.getEmail());
-            claims.put("authorities", customUserDetails.getAuthorities());
+        if (userDetails instanceof UserEntity entity) {
+            claims.put("user_id", entity.getId());
+            claims.put("username", entity.getUsername());
+            claims.put("email", entity.getEmail());
+            claims.put("authorities", entity.getAuthorities());
         }
         return generateToken(claims, userDetails);
     }
 
     private String generateToken(Map<String, Object> extraClaims, UserDetails userDetails) {
-        return Jwts.builder().setClaims(extraClaims).setSubject(userDetails.getUsername())
-            .setIssuedAt(new Date(System.currentTimeMillis()))
-            .setExpiration(new Date(System.currentTimeMillis() + 100000 * 60 * 24))
-            .signWith(getSigningKey(), SignatureAlgorithm.HS256).compact();
+        return Jwts.builder().claims(extraClaims).subject(userDetails.getUsername()).issuedAt(new Date(System.currentTimeMillis()))
+            .expiration(new Date(System.currentTimeMillis() + 100000 * 60 * 24))
+            .signWith(getSigningKey()).compact();
     }
 
     public boolean isTokenValid(String token, UserDetails userDetails) {