Merge branch 'dev' into NCBACK-27

# Conflicts:
#	src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java

.env

@@ -1,10 +1,10 @@
 POSTGRES_DB=no_copy_
-POSTGRES_USER=postgres
+POSTGRES_USER=ncp_db
-POSTGRES_PASSWORD=postgres
+POSTGRES_PASSWORD=ncpDbApp
 POSTGRES_PORT=5432
 POSTGRES_HOST=postgres
 
 REDIS_HOST=redis
 REDIS_PORT=6379
 
-SERVER_PORT=8080
+SERVER_PORT=8080

Dockerfile

@@ -16,4 +16,4 @@ RUN mkdir -p /data/uploads && chmod 755 /data/uploads
 
 EXPOSE 8080
 
-CMD ["java", "-jar", "app.jar"]
+CMD ["java", "-jar", "app.jar"]

README.md

@@ -0,0 +1,68 @@
+Создаем сеть:
+docker network create app-network
+
+Войти в БД:
+docker exec -it postgres psql -U ncp_db -d no_copy_
+
+Выполнить команду:
+\du
+
+Должен быть один пользователь:
+                                    List of roles
+Role name |                         Attributes
+-----------+------------------------------------------------------------
+ncp_db    | Superuser, Create role, Create DB, Replication, Bypass RLS
+
+суперпользователь БД:
+postgres/postgres 
+пользователь бд для бэка
+ncp_db / ncpDbApp
+
+Подключение к БД для приложения,если volume не существует :
+
+Создаться автоматически.
+
+Если уже существует volume :
+
+docker exec -it postgres psql -U postgres -d postgres
+
+CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+
+GRANT ALL PRIVILEGES ON DATABASE no_copy_ TO ncp_db;
+
+\du
+
+\q
+
+-------
+
+psql -U postgres -d no_copy_
+
+-- база
+
+GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
+
+-- схема
+
+GRANT USAGE ON SCHEMA public TO ncp_db;
+
+-- существующие таблицы
+
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
+
+-- существующие sequence (очень важно для id)
+
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
+
+-- будущие таблицы
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON TABLES TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON SEQUENCES TO ncp_db;
+
+
+Зайти в контейнер:
+docker exec -it {name} bash
+

build.gradle

@@ -31,6 +31,10 @@ dependencies {
 	implementation 'org.mapstruct:mapstruct:1.5.5.Final'
 	implementation 'commons-validator:commons-validator:1.7'
 
+	implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.0'
+	implementation 'tools.jackson.core:jackson-core:3.0.3'
+	implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
+
 	annotationProcessor 'org.mapstruct:mapstruct-processor:1.5.5.Final'
 	annotationProcessor 'org.projectlombok:lombok'
 

docker-compose.yaml

@@ -18,7 +18,7 @@ services:
     restart: unless-stopped
 
   db:
-    image: postgres:17
+    image: postgres:17.7
     restart: always
     deploy:
       resources:
@@ -30,14 +30,15 @@ services:
           memory: 1G
     environment:
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_SHARED_BUFFERS: 512MB
       POSTGRES_EFFECTIVE_CACHE_SIZE: 1536MB
     ports:
       - "54320:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
+      - ./init-scripts:/docker-entrypoint-initdb.d:ro
     container_name: postgres
     networks:
       app-network:
@@ -58,13 +59,17 @@ services:
     environment:
       FILE_STORAGE_PATH: /data/uploads
       MAX_FILE_SIZE: 10737418240
-      FILE_CHUNK_SIZE: 1048576
+      FILE_CHUNK_SIZE: 1000000
       POSTGRES_DB: no_copy_
-      POSTGRES_USER: postgres
+      POSTGRES_USER: ${POSTGRES_USER}
-      POSTGRES_PASSWORD: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_PORT: 5432
       POSTGRES_HOST: db
       STORAGE_SERVICE_URL: http://storage:8081
+      SPRING_PROFILES_ACTIVE: docker
+      YANDEX_API_KEY: AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q
+      YANDEX_FOLDER_ID: b1gokpdbm6qfpsou8pcd
+      YANDEX_SEARCH_URL: "https://searchapi.api.cloud.yandex.net/v2/image/search_by_image"
     depends_on:
       - db
     ports:
@@ -77,6 +82,10 @@ services:
           - api
     volumes:
       - uploads_data:/data/uploads:rw
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d no_copy_" ]
+      interval: 10s
+      retries: 5
 
   grafana:
     image: grafana/grafana:10.3.1
@@ -120,7 +129,7 @@ services:
   prometheus:
     image: prom/prometheus:latest
     container_name: prometheus
-    deploy:  # ← ДОБАВЛЕНО
+    deploy:
       resources:
         limits:
           cpus: '0.5'
@@ -148,7 +157,7 @@ services:
   loki:
     image: grafana/loki:2.9.2
     container_name: loki
-    deploy:  # ← ДОБАВЛЕНО
+    deploy:
       resources:
         limits:
           cpus: '1.0'
@@ -173,7 +182,7 @@ services:
   tempo:
     image: grafana/tempo:2.4.1
     container_name: tempo
-    deploy:  # ← ДОБАВЛЕНО
+    deploy:
       resources:
         limits:
           cpus: '0.5'

infrastructure/jenkins/deploy.groovy

@@ -7,7 +7,6 @@ pipeline {
                 defaultValue: 'dev',
                 description: 'Ветка для деплоя'
         )
-
         string(
                 name: 'SERVER',
                 defaultValue: '92.242.61.23',
@@ -31,6 +30,7 @@ pipeline {
             }
         }
 
+
         stage('Deploy with docker-compose') {
             steps {
                 script {
@@ -39,170 +39,73 @@ pipeline {
                                     credentialsId: 'server-root-password',
                                     usernameVariable: 'SSH_USER',
                                     passwordVariable: 'SSH_PASS'
-                            )
+                            ),
+                            string(credentialsId: 'DB_USER', variable: 'DB_USER'),
+                            string(credentialsId: 'DB_PASSWORD', variable: 'DB_PASSWORD')
                     ]) {
                         sh """
-                            echo "Deploying branch: ${params.BRANCH}"
+                    echo "Deploying branch: ${params.BRANCH}"
-                            
+                    
-                            echo "Copying files to server..."
+                    echo "Copying files to server..."
-                            sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
+                    sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "mkdir -p /opt/deployments/${params.BRANCH}"
-                            sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
+                    sshpass -p '$SSH_PASS' scp -r -o StrictHostKeyChecking=no ./* $SSH_USER@$SERVER:/opt/deployments/${params.BRANCH}/
-                            
+                    
-                            sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
+                    sshpass -p '$SSH_PASS' ssh -o StrictHostKeyChecking=no $SSH_USER@$SERVER "
-                                cd /opt/deployments/${params.BRANCH}
+                        cd /opt/deployments/${params.BRANCH}
-                                
+                        
-                                echo '========================================'
+                        echo '1. Остановка старого приложения...'
-                                echo 'Step 1: Checking current state...'
+                        docker stop app-backend 2>/dev/null || echo 'Контейнер не найден'
-                                echo '========================================'
+                        docker rm app-backend 2>/dev/null || echo 'Контейнер не найден'
-                                
+                        
-                                docker ps --filter 'name=postgres|app-backend|storage|grafana|prometheus|loki|tempo|alloy' --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
+                        echo '2. Удаление старых образов...'
-                                
+                        docker images --filter 'reference=*app*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'Нет образов для удаления'
-                                echo '========================================'
+                        
-                                echo 'Step 2: Setup environment for compatibility...'
+                        echo '3. Создание сети если нужно...'
-                                echo '========================================'
+                        docker network create app-network 2>/dev/null || echo 'Сеть уже существует'
-                                
+                        
-                                docker network create app-network 2>/dev/null || echo 'Network app-network already exists'
+                        echo '4. Запуск инфраструктуры...'
-                                
+                        docker-compose up -d db storage
-                                echo 'COMPOSE_COMPATIBILITY=true' > .env
+                        
-                                
+                        echo '5. Ожидание PostgreSQL...'
-                                echo '========================================'
+                        sleep 10
-                                echo 'Step 3: Force cleanup old application...'
+                        
-                                echo '========================================'
+                        echo '6. Сборка нового образа приложения...'
-                                
+                        docker build --no-cache -t app-backend:latest .
-                                docker-compose --compatibility down 2>/dev/null || echo 'No previous compose stack'
+                        
-                                
+                        echo '7. Запуск приложения...'
-                                docker images --filter 'reference=*app-backend*' -q | xargs -r docker rmi -f 2>/dev/null || echo 'No images to remove'
+                        docker run -d \\
-                                
+                          --name app-backend \\
-                                echo '========================================'
+                          --network app-network \\
-                                echo 'Step 4: Verify files and fix compose...'
+                          --network-alias app \\
-                                echo '========================================'
+                          -p 80:8080 \\
-                                
+                          -v uploads_data:/data/uploads:rw \\
-                                if [ ! -f docker-compose.yaml ]; then
+                          -e POSTGRES_DB=no_copy_ \\
-                                    echo 'ERROR: docker-compose.yaml not found!'
+                          -e POSTGRES_USER=$DB_USER \\
-                                    ls -la
+                          -e POSTGRES_PASSWORD=$DB_PASSWORD \\
-                                    exit 1
+                          -e POSTGRES_PORT=5432 \\
-                                fi
+                          -e POSTGRES_HOST=db \\
-                                
+                          --restart unless-stopped \\
-                                echo 'Checking docker-compose.yaml syntax...'
+                          app-backend:latest
-                                docker-compose --compatibility config 2>&1 | head -20 || echo 'Config check output'
+                        
-                                
+                        echo '8. Запуск мониторинга...'
-                                echo '========================================'
+                        docker-compose up -d grafana prometheus loki tempo alloy
-                                echo 'Step 5: Start infrastructure services...'
+                        
-                                echo '========================================'
+                        echo '9. Проверка...'
-                                
+                        sleep 5
-                                echo 'Starting PostgreSQL with resource limits...'
+                        
-                                docker-compose --compatibility up -d db
+                        echo 'Статус контейнеров:'
-                                
+                        docker ps --format 'table {{.Names}}\\t{{.Image}}\\t{{.Status}}'
-                                echo 'Starting storage service...'
+                        
-                                docker-compose --compatibility up -d storage
+                        echo '10. Проверка health...'
-                                
+                        if curl -s -f http://localhost:80/health > /dev/null 2>&1; then
-                                echo 'Waiting for PostgreSQL to be ready...'
+                            echo 'Приложение работает'
-                                for i in {1..30}; do
+                            echo 'URL: http://${params.SERVER}:80'
-                                    if docker-compose --compatibility exec db pg_isready -U postgres 2>/dev/null; then
+                        else
-                                        echo 'PostgreSQL is ready'
+                            echo 'Проверка health не удалась'
-                                        break
+                            docker logs app-backend --tail=20
-                                    fi
+                        fi
-                                    echo 'Waiting... attempt ' \$i
+                    "
-                                    sleep 2
+                """
-                                done
-                                
-                                echo '========================================'
-                                echo 'Step 6: Build application image...'
-                                echo '========================================'
-                                
-                                if [ ! -f Dockerfile ]; then
-                                    echo 'ERROR: Dockerfile not found!'
-                                    exit 1
-                                fi
-                                
-                                echo 'Building Docker image...'
-                                docker build --no-cache -t app-backend:latest . 2>&1 | tail -30
-                                
-                                echo 'Image created successfully'
-                                docker images app-backend:latest --format 'table {{.Repository}}\\t{{.Tag}}\\t{{.Size}}\\t{{.CreatedAt}}'
-                                
-                                echo '========================================'
-                                echo 'Step 7: Start application with resource limits...'
-                                echo '========================================'
-                                
-                                docker volume create uploads_data 2>/dev/null || echo 'Volume uploads_data already exists'
-                                
-                                echo 'Starting main application...'
-                                docker-compose --compatibility up -d app
-                                
-                                echo 'Waiting for application to start...'
-                                sleep 15
-                                
-                                echo '========================================'
-                                echo 'Step 8: Start monitoring stack...'
-                                echo '========================================'
-                                
-                                docker-compose --compatibility up -d grafana prometheus loki tempo alloy
-                                
-                                echo '========================================'
-                                echo 'Step 9: Verify deployment...'
-                                echo '========================================'
-                                
-                                echo 'All containers status:'
-                                docker-compose --compatibility ps
-                                
-                                echo ''
-                                echo 'Resource limits check:'
-                                echo 'App backend limits:'
-                                docker inspect app-backend --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
-                                
-                                echo ''
-                                echo 'PostgreSQL limits:'
-                                docker inspect postgres --format='{{.HostConfig.Memory}} {{.HostConfig.CpuQuota}} {{.HostConfig.CpuPeriod}}' 2>/dev/null || echo 'Cannot inspect'
-                                
-                                echo ''
-                                echo 'Container resource usage:'
-                                docker stats --no-stream --format 'table {{.Name}}\\t{{.CPUPerc}}\\t{{.MemUsage}}\\t{{.MemPerc}}' postgres app-backend storage 2>/dev/null || echo 'Stats not available'
-                                
-                                echo '========================================'
-                                echo 'Step 10: Health checks...'
-                                echo '========================================'
-                                
-                                echo 'Application health check...'
-                                for i in {1..10}; do
-                                    if curl -s -f http://localhost:80/health 2>/dev/null; then
-                                        echo '✓ Application health check PASSED'
-                                        break
-                                    elif [ \$i -eq 10 ]; then
-                                        echo '✗ Application health check FAILED'
-                                        echo 'Last logs:'
-                                        docker-compose --compatibility logs --tail=20 app
-                                    else
-                                        echo 'Waiting for application... attempt ' \$i
-                                        sleep 5
-                                    fi
-                                done
-                                
-                                echo 'Checking monitoring services...'
-                                if curl -s -f http://localhost:3000/api/health 2>/dev/null; then
-                                    echo '✓ Grafana is healthy'
-                                else
-                                    echo '⚠ Grafana may be starting'
-                                fi
-                                
-                                if curl -s -f http://localhost:9090/-/healthy 2>/dev/null; then
-                                    echo '✓ Prometheus is healthy'
-                                fi
-                                
-                                echo '========================================'
-                                echo 'Deployment Summary:'
-                                echo '========================================'
-                                echo 'Application URL: http://${params.SERVER}:80'
-                                echo 'Grafana: http://${params.SERVER}:3000 (admin/admin)'
-                                echo 'Prometheus: http://${params.SERVER}:9090'
-                                echo 'Loki: http://${params.SERVER}:3100'
-                                echo ''
-                                echo 'To view logs: docker-compose logs -f app'
-                                echo 'To view all containers: docker-compose ps'
-                                echo 'To stop: docker-compose down'
-                                echo '========================================'
-                            "
-                        """
                     }
                 }
             }
@@ -213,8 +116,6 @@ pipeline {
         success {
             echo "Deployment successful"
             echo "Application URL: http://${params.SERVER}:80"
-            echo "Grafana: http://${params.SERVER}:3000"
-            echo "Prometheus: http://${params.SERVER}:9090"
         }
         failure {
             echo "Deployment failed for branch ${params.BRANCH}"

init-scripts/01-init.sql

@@ -0,0 +1,19 @@
+DO $$
+BEGIN
+   IF NOT EXISTS (SELECT FROM pg_roles WHERE rolname = 'ncp_db') THEN
+      CREATE USER ncp_db WITH PASSWORD 'ncpDbApp';
+END IF;
+END
+$$;
+
+GRANT CONNECT ON DATABASE no_copy_ TO ncp_db;
+GRANT USAGE ON SCHEMA public TO ncp_db;
+
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO ncp_db;
+GRANT ALL PRIVILEGES ON ALL SEQUENCES IN SCHEMA public TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON TABLES TO ncp_db;
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA public
+GRANT ALL ON SEQUENCES TO ncp_db;

src/main/java/ru/soune/nocopy/configuration/HandlerConfig.java

@@ -16,7 +16,9 @@ public class HandlerConfig {
             LoginRequestHandler login,
             FileUploadHandler upload,
             FileEntityHandler file,
-            LogoutRequestHandler logoutHandler
+            LogoutRequestHandler logoutHandler,
+            ImageFoundRequestHandler imageFoundRequestHandler,
+            AuthRequestHandler authRequestHandler
     ) {
         Map<Integer, RequestHandler> map = new HashMap<>();
         map.put(20001, login);
@@ -24,6 +26,8 @@ public class HandlerConfig {
         map.put(20004, upload);
         map.put(20005, file);
         map.put(20006, logoutHandler);
+        map.put(20007, imageFoundRequestHandler);
+        map.put(20008, authRequestHandler);
 
         return map;
     }

src/main/java/ru/soune/nocopy/configuration/JacksonConfig.java

@@ -35,6 +35,8 @@ public class JacksonConfig {
 
         mapper.registerModule(javaTimeModule);
         mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+        mapper.configure(com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        mapper.enable(SerializationFeature.INDENT_OUTPUT);
 
         return mapper;
     }

src/main/java/ru/soune/nocopy/controller/ApiController.java

@@ -19,12 +19,11 @@ import ru.soune.nocopy.dto.file.ChunkUploadResponse;
 import ru.soune.nocopy.dto.file.CompleteUploadResponse;
 import ru.soune.nocopy.dto.file.FileEntityResponse;
 import ru.soune.nocopy.dto.file.UploadProgress;
-import ru.soune.nocopy.entity.auth.AuthToken;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.entity.file.UploadStatus;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.*;
-import ru.soune.nocopy.repository.AuthTokenRepository;
+import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
@@ -48,7 +47,7 @@ public class ApiController {
 
     private final FileEntityService fileEntityService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final AuthService authService;
 
     @PostMapping("/v{version}/data")
     public ResponseEntity<?> handlePostRequest(@RequestBody BaseRequest request,
@@ -71,6 +70,9 @@ public class ApiController {
             return ResponseEntity.ok().body(response);
         } catch (ValidationException e) {
             return createValidationErrorResponse(e.getBindingResult(), e.getMsgId());
+        } catch (NotFoundAuthToken e) {
+            return ResponseEntity.ok().body(new BaseResponse(msgId, MessageCode.AUTH_TOKEN_NOT_FOUND.getCode(),
+                    MessageCode.AUTH_TOKEN_NOT_FOUND.getDescription(), new HashMap<>()));
         } catch (NotValidFieldException e) {
             throw e;
         } catch (Exception e) {
@@ -257,7 +259,7 @@ public class ApiController {
                         errorData));
             }
 
-            Long userId = getUserIdFromToken(tokenHeader);
+            Long userId = authService.useUserAuthToken(tokenHeader);
             FileEntityResponse entityResponse = fileEntityService.getById(fileId, version);
 
             if (!entityResponse.getUserId().equals(userId)) {
@@ -379,11 +381,4 @@ public class ApiController {
                 mimeType.startsWith("video") ||
                 mimeType.startsWith("audio");
     }
-
-    private Long getUserIdFromToken(String tokenHeader) {
-        String token = tokenHeader.replace("Bearer ", "");
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        return authToken.getUser().getId();
-    }
 }

src/main/java/ru/soune/nocopy/controller/UserController.java

@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.*;
 import ru.soune.nocopy.dto.ChangePasswordRequest;
 import ru.soune.nocopy.dto.UserDTO;
 import ru.soune.nocopy.dto.UserRequest;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.InvalidUserEmail;
 import ru.soune.nocopy.exception.NotFoundAuthToken;

src/main/java/ru/soune/nocopy/controller/VkAuthController.java

@@ -1,93 +0,0 @@
-package ru.soune.nocopy.controller;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ru.soune.nocopy.dto.BaseResponse;
-import ru.soune.nocopy.dto.LoginAnswer;
-import ru.soune.nocopy.dto.MessageCode;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.entity.auth.AuthToken;
-import ru.soune.nocopy.service.AuthService;
-import ru.soune.nocopy.service.VkOAuthService;
-import ru.soune.nocopy.service.auth.ExternalAuthUserService;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/api")
-@RequiredArgsConstructor
-@Slf4j
-public class VkAuthController {
-
-    private final VkOAuthService vkOAuthService;
-
-    private final AuthService authService;
-
-    private final ExternalAuthUserService externalAuthUserService;
-
-    @GetMapping("/v{version}/vk/authorization/{code}/{state}/{codeVerifier}/{deviceId}")
-    public BaseResponse vkAuth(@PathVariable("code") String code,
-                                              @PathVariable("state") String state,
-                                              @PathVariable("codeVerifier") String codeVerifier,
-                                              @PathVariable("deviceId") String deviceId) {
-        try {
-            Map<String, Object> authMap = vkOAuthService.authTokenMap(code, state, codeVerifier, deviceId);
-            ObjectMapper mapper = new ObjectMapper();
-
-            String bodyJson = (String) authMap.get("body");
-            Map<String, Object> body = mapper.readValue(bodyJson, Map.class);
-
-            String accessToken = (String) body.get("access_token");
-            long vkUserId = ((Number) body.get("user_id")).longValue();
-            Integer expiresIn = (Integer) body.get("expires_in");
-            String refreshToken = (String) body.get("refresh_token");
-
-            Map<String, Object> vkUserInfo = vkOAuthService.userVkInfo(accessToken);
-            log.info("vkUserInfo {}", vkUserInfo);
-
-            String userInfoBodyJson = (String) vkUserInfo.get("body");
-            Map<String, Object> userInfoBody = mapper.readValue(userInfoBodyJson, Map.class);
-            Map<String, Object> user = (Map<String, Object>) userInfoBody.get("user");
-
-            String firstName = (String) user.get("first_name");
-            String lastName = (String) user.get("last_name");
-            String fullName = firstName + " " + lastName;
-
-            User userEntity = externalAuthUserService.findOrCreateUserFromVK(Long.toString(vkUserId), fullName,
-                    null, accessToken, refreshToken, expiresIn);
-
-            AuthToken ourToken = authService.createTokenForUser(userEntity);
-
-            LoginAnswer loginAnswer = new LoginAnswer();
-            loginAnswer.setToken(ourToken.getToken());
-            loginAnswer.setFieldErrors(new ArrayList<>());
-
-            return new BaseResponse(20009, MessageCode.SUCCESS.getCode(),
-                    MessageCode.SUCCESS.getDescription(), loginAnswer);
-        } catch (Exception e) {
-            log.error("VK auth error: ", e);
-
-            LoginAnswer loginAnswer = new LoginAnswer();
-            loginAnswer.setToken(null);
-
-            List<Map<String, String>> errors = new ArrayList<>();
-            Map<String, String> error = new HashMap<>();
-            error.put("field", "vk_auth");
-            error.put("message", e.getMessage());
-            errors.add(error);
-
-            loginAnswer.setFieldErrors(errors);
-
-            return new BaseResponse(20009, MessageCode.SUCCESS.getCode(),
-                    MessageCode.SUCCESS.getDescription(), loginAnswer);
-        }
-    }
-}
-

src/main/java/ru/soune/nocopy/dto/AuthResponse.java

@@ -0,0 +1,10 @@
+package ru.soune.nocopy.dto;
+
+import java.time.LocalDateTime;
+
+public record AuthResponse (
+        boolean success,
+        String message,
+        String token,
+        LocalDateTime expiresAt
+) {}

src/main/java/ru/soune/nocopy/dto/BaseRequest.java

@@ -1,9 +1,11 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseRequest {
     @JsonProperty("version")
     Integer version;

src/main/java/ru/soune/nocopy/dto/BaseResponse.java

@@ -1,11 +1,13 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 @Data
 @AllArgsConstructor
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class BaseResponse {
     @JsonProperty("msg_id")
     private Integer msgId;

src/main/java/ru/soune/nocopy/dto/LoginRequest.java

@@ -1,5 +1,6 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.Size;
@@ -10,6 +11,7 @@ import lombok.NoArgsConstructor;
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class LoginRequest {
 
     @NotBlank(message = "error.not.blank") @Email(message = "error.not.email") @Size(max = 128)

src/main/java/ru/soune/nocopy/dto/MessageCode.java

@@ -10,6 +10,7 @@ public enum MessageCode {
     FILE_UPLOAD_ERROR(2, "File upload error"),
     FILE_DOWNLOAD_ERROR(2, "File download error"),
     FILE_DOWNLOAD_ERROR_NOT_CORRECT_FIELD(2, "Not correct field"),
+    IMAGE_FOUND_ERROR(2, "Image found error"),
     INVALID_JSON_BODY(2, "Invalid fields in JSON object"),
     INCOMPLETE_UPLOAD(2, "Not load all chunks"),
     MSG_ID_NOT_FOUND(4, "Message id not found"),
@@ -18,6 +19,7 @@ public enum MessageCode {
     AUTH_EMAIL_NOT_FOUND(4, "Email not found"),
     AUTH_EMAIL_OR_TOKEN_NOT_FOUND(4, "Email or Token not found "),
     AUTH_TOKEN_MISMATCH(4, "Token mismatch"),
+    AUTH_TOKEN_NOT_FOUND(4, "Token not found"),
     FILE_NOT_FOUND(4, "File not found"),
     AUTH_PASSWORD_NOT_MATCHES(2, "Password does not match");
 

src/main/java/ru/soune/nocopy/dto/RegRequest.java

@@ -1,10 +1,12 @@
 package ru.soune.nocopy.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import jakarta.validation.constraints.*;
 import lombok.Data;
 
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class RegRequest {
     @NotEmpty(message = "Full name is required")
     private String fullName;

src/main/java/ru/soune/nocopy/dto/TokenProcessRequest.java

@@ -0,0 +1,11 @@
+package ru.soune.nocopy.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class TokenProcessRequest {
+
+    @JsonProperty("token")
+    private String token;
+}

src/main/java/ru/soune/nocopy/dto/UserRequest.java

@@ -10,6 +10,7 @@ import ru.soune.nocopy.entity.GenderType;
 import java.time.LocalDate;
 
 @Data
+@JsonFormat(with = JsonFormat.Feature.ACCEPT_CASE_INSENSITIVE_PROPERTIES)
 public class UserRequest {
     @Size(min = 2)
     private String fullName;

src/main/java/ru/soune/nocopy/dto/file/ImageSearchRequest.java

@@ -0,0 +1,10 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class ImageSearchRequest {
+    @JsonProperty("file_id")
+    private String fileId;
+}

src/main/java/ru/soune/nocopy/dto/file/YandexSearchResponse.java

@@ -0,0 +1,36 @@
+package ru.soune.nocopy.dto.file;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import java.util.List;
+
+@Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class YandexSearchResponse {
+
+    @JsonProperty("images")
+    private List<ImageResult> images;
+
+    @Data
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class ImageResult {
+        @JsonProperty("url")
+        private String url;
+
+        @JsonProperty("pageUrl")
+        private String pageUrl;
+
+        @JsonProperty("pageTitle")
+        private String pageTitle;
+
+        @JsonProperty("width")
+        private Integer width;
+
+        @JsonProperty("height")
+        private Integer height;
+
+        @JsonProperty("host")
+        private String host;
+    }
+}

src/main/java/ru/soune/nocopy/entity/AuthToken.java

@@ -1,10 +1,9 @@
-package ru.soune.nocopy.entity.auth;
+package ru.soune.nocopy.entity;
 
 import jakarta.persistence.*;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import ru.soune.nocopy.entity.User;
 
 import java.time.LocalDateTime;
 
@@ -42,8 +41,4 @@ public class AuthToken {
 
     @Column(name = "is_active")
     private Boolean isActive = true;
-
-    public boolean isValid() {
-        return Boolean.TRUE.equals(isActive) && expiresAt.isAfter(LocalDateTime.now());
-    }
 }

src/main/java/ru/soune/nocopy/entity/User.java

@@ -6,14 +6,11 @@ import jakarta.validation.constraints.Size;
 import lombok.*;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import ru.soune.nocopy.entity.auth.AuthToken;
-import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Optional;
 
 @Entity
 @Table(name = "users")
@@ -22,19 +19,18 @@ import java.util.Optional;
 @NoArgsConstructor
 @AllArgsConstructor
 @ToString
-@Builder
 @EntityListeners(AuditingEntityListener.class)
 public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Long Id;
 
     @Column(name = "full_name", nullable = false)
     private String fullName;
 
-    @Size(max = 255)
+    @Size(max = 1024)
-    @Column(name = "email", nullable = false, length = 255, unique = true)
+    @Column(name = "email", nullable = false, length = 1024, unique = true)
     private String email;
 
     @Column(name = "company")
@@ -94,14 +90,4 @@ public class User {
     @JsonIgnore
     @ToString.Exclude
     private List<ImageProtection> imageProtections = new ArrayList<>();
-
-    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
-    @ToString.Exclude
-    private List<ExternalAuthProvider> externalAuthProviders = new ArrayList<>();
-
-    public Optional<ExternalAuthProvider> getProvider(ExternalAuthProvider.ProviderType providerType) {
-        return externalAuthProviders.stream()
-                .filter(p -> p.getProviderType() == providerType)
-                .findFirst();
-    }
 }

src/main/java/ru/soune/nocopy/entity/auth/ExternalAuthProvider.java

@@ -1,89 +0,0 @@
-package ru.soune.nocopy.entity.auth;
-
-import jakarta.persistence.*;
-import lombok.*;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-import ru.soune.nocopy.entity.User;
-
-import java.time.LocalDateTime;
-
-@Entity
-@Table(name = "external_auth_providers",
-        uniqueConstraints = @UniqueConstraint(
-                columnNames = {"provider_type", "provider_user_id"}
-        ),
-        indexes = {
-                @Index(name = "idx_provider_type_user_id",
-                        columnList = "provider_type, provider_user_id"),
-                @Index(name = "idx_user_id_provider_type",
-                        columnList = "user_id, provider_type")
-        })
-@Getter @Setter
-@NoArgsConstructor
-@AllArgsConstructor
-@Builder
-@EntityListeners(AuditingEntityListener.class)
-public class ExternalAuthProvider {
-
-    public enum ProviderType {
-        VK, YANDEX
-    }
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "user_id", nullable = false, foreignKey = @ForeignKey(name = "fk_extauth_user"))
-    @ToString.Exclude
-    private User user;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "provider_type", nullable = false, length = 20)
-    private ProviderType providerType;
-
-    @Column(name = "provider_user_id", nullable = false, length = 255)
-    private String providerUserId;
-
-    @Column(name = "access_token", length = 2048)
-    private String accessToken;
-
-    @Column(name = "refresh_token", length = 2048)
-    private String refreshToken;
-
-    @Column(name = "token_expires_at")
-    private LocalDateTime tokenExpiresAt;
-
-    @Column(name = "email", length = 255)
-    private String email;
-
-    @Column(name = "phone", length = 20)
-    private String phoneNumber;
-
-    @CreatedDate
-    @Column(name = "linked_at", updatable = false)
-    private LocalDateTime linkedAt;
-
-    @Column(name = "last_used_at")
-    private LocalDateTime lastUsedAt;
-
-    @Column(name = "is_active")
-    @Builder.Default
-    private Boolean isActive = true;
-
-    @PrePersist
-    public void prePersist() {
-        if (this.linkedAt == null) {
-            this.linkedAt = LocalDateTime.now();
-        }
-        if (this.lastUsedAt == null) {
-            this.lastUsedAt = LocalDateTime.now();
-        }
-    }
-
-    @PreUpdate
-    public void preUpdate() {
-        this.lastUsedAt = LocalDateTime.now();
-    }
-}

src/main/java/ru/soune/nocopy/entity/file/FileType.java

@@ -7,21 +7,10 @@ import java.util.List;
 
 @Getter
 public enum FileType {
-    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp")),
+    IMAGE("image", Arrays.asList("jpg", "jpeg", "png", "gif", "bmp", "webp", "jfif")),
     VIDEO("video", Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv", "webm", "m4v", "mpg", "mpeg",
             "3gp", "3g2", "f4v", "m2ts", "mts", "vob", "ogv", "divx")),
-    AUDIO("audio", Arrays.asList("mp3", "wav", "flac")),
+    AUDIO("audio", Arrays.asList("mp3", "wav", "flac"));
-    DOCUMENT("document", Arrays.asList(
-            "pdf", "txt", "rtf",
-            "doc", "docx", "xls", "xlsx", "ppt", "pptx", "pps", "ppsx", "dot", "dotx", "xlt", "xltx", "pot", "potx",
-            "odt", "ods", "odp", "odg", "odf", "odb", "odc", "odi", "odm", "ott", "ots", "otp", "otg", "oth",
-            "sxw", "sxc", "sxi", "sxd", "sxg", "stc", "sti", "stw", "sxm",
-            "pages", "numbers", "key",
-            "csv", "tsv", "xml", "html", "htm", "tex", "md", "markdown",
-            "epub", "mobi", "azw", "azw3", "fb2",
-            "wps", "wpt", "et", "dps", "vsd", "vsdx",
-            "java", "py", "cpp", "c", "h", "js", "css", "php", "sql", "json", "yaml", "yml", "sh", "bat",
-            "one", "note"));
 
     private final String displayName;
     private final List<String> allowedExtensions;

src/main/java/ru/soune/nocopy/handler/AuthRequestHandler.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.TokenProcessRequest;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
+import ru.soune.nocopy.service.auth.AuthService;
+
+import java.util.Map;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class AuthRequestHandler implements RequestHandler {
+
+    private final ObjectMapper objectMapper;
+
+    private final AuthService authService;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws NotFoundAuthToken {
+        TokenProcessRequest tokenProcessRequest = objectMapper.convertValue(request.getMessageBody(),
+                TokenProcessRequest.class);
+
+        authService.useUserAuthToken(tokenProcessRequest.getToken());
+
+        return new BaseResponse(request.getMsgId(),
+                MessageCode.SUCCESS.getCode(),
+                "Token processed successfully",
+                Map.of("token", tokenProcessRequest.getToken()));
+    }
+}

src/main/java/ru/soune/nocopy/handler/FileEntityHandler.java

@@ -6,13 +6,12 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.entity.auth.AuthToken;
 import ru.soune.nocopy.entity.file.FileEntity;
 import ru.soune.nocopy.entity.file.FileStatus;
 import ru.soune.nocopy.exception.FileEntityNotFoundException;
 import ru.soune.nocopy.exception.NotFoundAuthToken;
-import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileEntityRepository;
+import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileEntityService;
 import ru.soune.nocopy.service.file.FileStatsService;
 
@@ -26,9 +25,9 @@ public class FileEntityHandler implements RequestHandler {
 
     private final FileEntityService fileEntityService;
 
-    private final FileStatsService fileStatsService;
+    private final AuthService authService;
 
-    private final AuthTokenRepository authTokenRepository;
+    private final FileStatsService fileStatsService;
 
     private final ObjectMapper objectMapper;
 
@@ -62,7 +61,8 @@ public class FileEntityHandler implements RequestHandler {
                             .action(action)
                             .availableActions(Arrays.asList(
                                     "file_info", "file_by_session", "user_files",
-                                    "search_files", "storage_usage", "delete_file"))
+                                    "search_files", "storage_usage", "delete_file",
+                                    "user_files_info"))
                             .build();
 
                     return new BaseResponse(request.getMsgId(),
@@ -80,7 +80,7 @@ public class FileEntityHandler implements RequestHandler {
     }
 
     private BaseResponse handleGetFilesUserInfo(BaseRequest request, FileEntityRequest fileRequest) {
-        Long userId = getUserIdFromToken(fileRequest.getToken());
+        Long userId = authService.useUserAuthToken(fileRequest.getToken());
         FileInfoUserResponse userFileStats = fileStatsService.getUserFileStats(userId);
 
         return new BaseResponse(request.getMsgId(),
@@ -91,7 +91,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileInfo(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId =  authService.useUserAuthToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getById(fileRequest.getFileId(), request.getVersion());
 
             if (!fileInfo.getUserId().equals(userId)) {
@@ -122,7 +122,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetFileBySession(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             FileEntityResponse fileInfo = fileEntityService.getByUploadSessionId(fileRequest.getUploadSessionId(),
                     request.getVersion());
 
@@ -154,7 +154,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetUserFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -181,7 +181,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleSearchFiles(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
             int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
 
@@ -228,7 +228,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleGetStorageUsage(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             long usage = fileEntityService.getUserStorageUsed(userId);
 
             StorageUsageResponse response = StorageUsageResponse.builder()
@@ -258,7 +258,7 @@ public class FileEntityHandler implements RequestHandler {
 
     private BaseResponse handleDeleteFile(BaseRequest request, FileEntityRequest fileRequest) {
         try {
-            Long userId = getUserIdFromToken(fileRequest.getToken());
+            Long userId = authService.useUserAuthToken(fileRequest.getToken());
             String fileId = fileRequest.getFileId();
             FileEntityResponse fileInfo = fileEntityService.getById(fileId, request.getVersion());
             DeleteFileResponse response;
@@ -305,20 +305,6 @@ public class FileEntityHandler implements RequestHandler {
         }
     }
 
-    private Long getUserIdFromToken(String token) {
-        if (token == null || token.isBlank()) {
-            throw new NotFoundAuthToken("Token is required");
-        }
-
-        if (token.startsWith("Bearer ")) {
-            token = token.replace("Bearer ", "");
-        }
-
-        AuthToken authToken = authTokenRepository.findByToken(token)
-                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
-        return authToken.getUser().getId();
-    }
-
     private String formatFileSize(long size) {
         if (size < 1024) return size + " B";
         int exp = (int) (Math.log(size) / Math.log(1024));

src/main/java/ru/soune/nocopy/handler/FileUploadHandler.java

@@ -10,13 +10,14 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.FieldError;
 import ru.soune.nocopy.dto.*;
 import ru.soune.nocopy.dto.file.*;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.file.FileType;
 import ru.soune.nocopy.entity.file.FileUploadSession;
 import ru.soune.nocopy.exception.*;
 import ru.soune.nocopy.handler.validator.FileUploadRequestValidator;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.FileUploadSessionRepository;
+import ru.soune.nocopy.service.auth.AuthService;
 import ru.soune.nocopy.service.file.FileUploadService;
 
 import java.util.*;
@@ -28,6 +29,8 @@ import java.util.stream.Collectors;
 public class FileUploadHandler implements RequestHandler {
     private final FileUploadService fileUploadService;
 
+    private final AuthService authService;
+
     private final AuthTokenRepository authTokenRepository;
 
     private final FileUploadSessionRepository fileUploadSessionRepository;
@@ -86,10 +89,9 @@ public class FileUploadHandler implements RequestHandler {
                         MessageCode.INVALID_TOKEN.getDescription(), Map.of("token", token));
             }
 
-            AuthToken authToken = tokenOptional.orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+            Long userId = authService.useUserAuthToken(token);
-
             BindingResult bindingResult = new BeanPropertyBindingResult(fileRequest, "fileRequest");
-            fileUploadRequestValidator.validate(fileRequest, bindingResult);
+                    fileUploadRequestValidator.validate(fileRequest, bindingResult);
 
             if (bindingResult.hasErrors()) {
                 Map<String, String> fieldErrors = bindingResult.getFieldErrors()
@@ -105,7 +107,7 @@ public class FileUploadHandler implements RequestHandler {
             }
 
             FileUploadSession session = fileUploadService.initUpload(
-                    authToken.getUser().getId(),
+                    userId,
                     fileRequest.getFileName(),
                     fileRequest.getFileType(),
                     fileRequest.getExtension(),

src/main/java/ru/soune/nocopy/handler/ImageFoundRequestHandler.java

@@ -0,0 +1,36 @@
+package ru.soune.nocopy.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import ru.soune.nocopy.dto.BaseRequest;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.ImageSearchRequest;
+import ru.soune.nocopy.dto.file.YandexSearchResponse;
+import ru.soune.nocopy.service.YandexSearchService;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class ImageFoundRequestHandler implements RequestHandler {
+
+    private final ObjectMapper objectMapper;
+
+    private final YandexSearchService yandexSearchService;
+
+    @Override
+    public BaseResponse handle(BaseRequest request) throws Exception {
+        ImageSearchRequest imageSearchRequest = objectMapper.convertValue(request.getMessageBody(),
+                ImageSearchRequest.class);
+
+        String fileId = imageSearchRequest.getFileId();
+
+        YandexSearchResponse response = yandexSearchService.searchByFileEntity(fileId);
+
+        return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
+                MessageCode.SUCCESS.getDescription(), response);
+    }
+}

src/main/java/ru/soune/nocopy/handler/LoginRequestHandler.java

@@ -4,10 +4,10 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -17,7 +17,9 @@ import java.util.Map;
 public class LoginRequestHandler implements RequestHandler {
 
     private final UserRepository userRepository;
+
     private final AuthService authService;
+
     private final ObjectMapper objectMapper;
 
     @Override
@@ -34,9 +36,12 @@ public class LoginRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.login(loginRequest);
+        String token = authToken.getToken();
 
         LoginAnswer loginAnswer = new LoginAnswer();
-        loginAnswer.setToken(authToken.getToken());
+        loginAnswer.setToken(token);
+
+        authService.useUserAuthToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), loginAnswer);

src/main/java/ru/soune/nocopy/handler/LogoutRequestHandler.java

@@ -4,12 +4,12 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Objects;
 import java.util.Optional;

src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java

@@ -7,12 +7,12 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BeanPropertyBindingResult;
 import org.springframework.validation.BindingResult;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.exception.ValidationException;
 import ru.soune.nocopy.handler.validator.RegRequestValidator;
 import ru.soune.nocopy.repository.UserRepository;
-import ru.soune.nocopy.service.AuthService;
+import ru.soune.nocopy.service.auth.AuthService;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -52,9 +52,11 @@ public class RegRequestHandler implements RequestHandler {
         }
 
         AuthToken authToken = authService.register(regRequest);
+        String token = authToken.getToken();
+        authService.useUserAuthToken(token);
 
         RegAnswer regAnswer = new RegAnswer();
-        regAnswer.setToken(authToken.getToken());
+        regAnswer.setToken(token);
 
         return new BaseResponse(request.getMsgId(), MessageCode.SUCCESS.getCode(),
                 MessageCode.SUCCESS.getDescription(), regAnswer);

src/main/java/ru/soune/nocopy/handler/validator/RegRequestValidator.java

@@ -13,7 +13,7 @@ import java.util.*;
 
 @Component
 public class RegRequestValidator implements Validator {
-    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()]{0,200}$";
+    private static final String COMPANY_REGEX = "^[a-zA-Zа-яА-ЯёЁ0-9\\s\\-&.,'()\"\"«»„‟”“”‘'’‹›❛❜❝❞〝〞〟]{1,200}$";
 
     private static final String NAME_REGEX = "^[a-zA-Zа-яА-ЯёЁ\\s\\-'.]{2,100}$";
 
@@ -74,21 +74,6 @@ public class RegRequestValidator implements Validator {
             errors.rejectValue("companyName", "companyName.invalid.chars",
                     "Company name contains invalid characters");
         }
-
-        validateForbiddenWords(trimmedCompany, "companyName", errors,
-                Arrays.asList("admin", "root", "system", "test"));
-    }
-
-    private void validateForbiddenWords(String text, String fieldName,
-                                        Errors errors, List<String> forbiddenWords) {
-        String lowerText = text.toLowerCase();
-        for (String word : forbiddenWords) {
-            if (lowerText.contains(word)) {
-                errors.rejectValue(fieldName, fieldName + ".forbidden.word",
-                        "Contains forbidden word: " + word);
-                break;
-            }
-        }
     }
 
     private void validateEmail(String email, Errors errors) {

src/main/java/ru/soune/nocopy/repository/AuthTokenRepository.java

@@ -2,13 +2,15 @@ package ru.soune.nocopy.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 
-import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Optional;
 
 @Repository
 public interface AuthTokenRepository extends JpaRepository<AuthToken, Long> {
-    Optional<AuthToken> findByTokenAndExpiresAtAfter(String token, LocalDate expiresAtAfter);
+    List<AuthToken> findByExpiresAtBefore(LocalDateTime expiresAtBefore);
+    Optional<AuthToken> findByLastUsedAtBefore(LocalDateTime lastUsedAt);
     Optional<AuthToken> findByToken(String token);
 }

src/main/java/ru/soune/nocopy/repository/ExternalAuthProviderRepository.java

@@ -1,25 +0,0 @@
-package ru.soune.nocopy.repository;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
-
-import java.util.List;
-import java.util.Optional;
-
-@Repository
-public interface ExternalAuthProviderRepository extends JpaRepository<ExternalAuthProvider, Long> {
-
-    Optional<ExternalAuthProvider> findByProviderTypeAndProviderUserId(
-            ExternalAuthProvider.ProviderType providerType,
-            String providerUserId
-    );
-
-    List<ExternalAuthProvider> findByUser(User user);
-
-    boolean existsByProviderTypeAndProviderUserId(
-            ExternalAuthProvider.ProviderType providerType,
-            String providerUserId
-    );
-}

src/main/java/ru/soune/nocopy/repository/FileEntityRepository.java

@@ -14,6 +14,7 @@ import java.util.Optional;
 public interface FileEntityRepository extends JpaRepository<FileEntity, String> {
 
     List<FileEntity> findByUserId(Long userId);
+    Optional<FileEntity> findByUserIdAndChecksum(Long userId,  String imageHash);
 
     List<FileEntity> findByUserIdAndStatus(Long userId, FileStatus status);
 

src/main/java/ru/soune/nocopy/repository/UserRepository.java

@@ -2,10 +2,7 @@ package ru.soune.nocopy.repository;
 
 import jakarta.validation.constraints.Size;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
 
 import java.util.Optional;
 
@@ -13,10 +10,4 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
     boolean existsByEmail(String email);
     boolean existsByPhone(@Size(min = 11, max = 14) String phone);
-    @Query("SELECT u FROM User u JOIN u.externalAuthProviders p " +
-            "WHERE p.providerType = :providerType AND p.providerUserId = :providerUserId")
-    Optional<User> findByExternalProvider(
-            @Param("providerType") ExternalAuthProvider.ProviderType providerType,
-            @Param("providerUserId") String providerUserId
-    );
 }

src/main/java/ru/soune/nocopy/service/VkOAuthService.java

@@ -1,69 +0,0 @@
-package ru.soune.nocopy.service;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.*;
-import org.springframework.stereotype.Service;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class VkOAuthService {
-    @Value("${auth.vk.oauth2}")
-    String oauthVkPath;
-
-    @Value("${auth.vk.user_info}")
-    String vkUserInfo;
-
-    @Value("${auth.vk.client_id}")
-    String clientId;
-
-    @Value("${auth.vk.redirect_uri}")
-    String redirectUri;
-
-    public Map<String, Object> authTokenMap(String code, String state, String codeVerifier, String deviceId) {
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        params.add("grant_type", "authorization_code");
-        params.add("code_verifier", codeVerifier);
-        params.add("redirect_uri", redirectUri);
-        params.add("code", code);
-        params.add("client_id", clientId);
-        params.add("device_id", deviceId);
-        params.add("state", state);
-        params.add("scope", "email,phone");
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
-        return sendRequest(params, headers,oauthVkPath);
-    }
-
-    public Map<String, Object> userVkInfo(String accessToken) {
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        params.add("access_token", accessToken);
-        params.add("client_id", clientId);
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-
-
-        return sendRequest(params, headers, vkUserInfo);
-    }
-
-    private Map<String, Object> sendRequest(MultiValueMap<String, String> params, HttpHeaders headers, String url) {
-        Map<String, Object> info = new HashMap<>();
-        RestTemplate restTemplate = new RestTemplate();
-        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST,
-                new HttpEntity<>(params, headers), String.class);
-
-        info.put("status", response.getStatusCodeValue());
-        info.put("body", response.getBody());
-        info.put("headers", response.getHeaders());
-        info.put("success", response.getStatusCode().is2xxSuccessful());
-
-        return info;
-    }
-}

src/main/java/ru/soune/nocopy/service/YandexSearchService.java

@@ -0,0 +1,162 @@
+package ru.soune.nocopy.service;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import jakarta.annotation.PostConstruct;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import ru.soune.nocopy.dto.BaseResponse;
+import ru.soune.nocopy.dto.MessageCode;
+import ru.soune.nocopy.dto.file.YandexSearchResponse;
+import ru.soune.nocopy.entity.file.FileEntity;
+import ru.soune.nocopy.exception.FileEntityNotFoundException;
+import ru.soune.nocopy.exception.NotValidFieldException;
+import ru.soune.nocopy.repository.FileEntityRepository;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Base64;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class YandexSearchService {
+    private final FileEntityRepository fileEntityRepository;
+
+    private final ObjectMapper objectMapper;
+
+    @Value("${yandex.api-key}")
+    private String apiKey;
+
+    @Value("${yandex.folder-id}")
+    private String folderId;
+
+    @Value("${yandex.search-url}")
+    private String searchUrl;
+
+    @PostConstruct
+    public void init() {
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+        objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+    }
+
+    public YandexSearchResponse searchByFileEntity(String fileId) throws IOException {
+        FileEntity fileEntity = fileEntityRepository.findById(fileId)
+                .orElseThrow(() -> {
+                    throw new NotValidFieldException("File not found", new BaseResponse(20007,
+                            MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
+                            Map.of("fileId",fileId)));
+                });
+        byte[] fileBytes;
+
+        if (!isImageFile(fileEntity)) {
+            log.error("File not image: {}", fileEntity.getMimeType());
+            throw new NotValidFieldException("File not image", new BaseResponse(20007,
+                    MessageCode.INVALID_FIELD.getCode(), MessageCode.INVALID_FIELD.getDescription(),
+                    Map.of("file_type", fileEntity.getMimeType())));
+        }
+
+        try {
+            fileBytes = readFileFromDisk(fileEntity);
+        } catch (IOException e) {
+            throw new NotValidFieldException("File not found or cannot read file", new BaseResponse(20007,
+                    MessageCode.FILE_NOT_FOUND.getCode(), MessageCode.FILE_NOT_FOUND.getDescription(),
+                    Map.of("fileId", fileId,
+                            "filePath", fileEntity.getFilePath())));
+        }
+
+        return callYandexApi(fileBytes);
+    }
+
+    private boolean isImageFile(FileEntity fileEntity) {
+        String mimeType = fileEntity.getMimeType();
+        return mimeType != null && mimeType.startsWith("image");
+    }
+
+    private byte[] readFileFromDisk(FileEntity fileEntity) throws IOException {
+        Path filePath = Path.of(fileEntity.getFilePath());
+
+        if (!Files.exists(filePath)) {
+            throw new IOException("File not found: " + fileEntity.getFilePath());
+        }
+
+        if (!Files.isReadable(filePath)) {
+            throw new IOException("Cannot read file: " + fileEntity.getFilePath());
+        }
+
+        return Files.readAllBytes(filePath);
+    }
+
+    private YandexSearchResponse callYandexApi(byte[] imageBytes) throws IOException {
+        String imageBase64 = Base64.getEncoder().encodeToString(imageBytes);
+        String jsonRequest = String.format("{\"folderId\":\"%s\",\"data\":\"%s\",\"page\":0,\"showSimilarImages\":true}",
+                folderId, imageBase64);
+
+        URL url = new URL(searchUrl);
+        HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+        try {
+            connection.setRequestMethod("POST");
+            connection.setRequestProperty("Authorization", "Api-Key " + apiKey);
+            connection.setRequestProperty("Content-Type", "application/json");
+            connection.setRequestProperty("Accept", "application/json");
+            connection.setConnectTimeout(30000);
+            connection.setReadTimeout(30000);
+            connection.setDoOutput(true);
+
+            try (OutputStream os = connection.getOutputStream()) {
+                byte[] input = jsonRequest.getBytes("utf-8");
+                os.write(input, 0, input.length);
+                os.flush();
+            }
+
+            int responseCode = connection.getResponseCode();
+
+            String responseBody;
+            if (responseCode == HttpURLConnection.HTTP_OK) {
+                try (BufferedReader br = new BufferedReader(
+                        new InputStreamReader(connection.getInputStream(), "utf-8"))) {
+                    responseBody = readAll(br);
+                }
+            } else {
+                try (BufferedReader br = new BufferedReader(
+                        new InputStreamReader(connection.getErrorStream(), "utf-8"))) {
+                    responseBody = readAll(br);
+                }
+                throw new IOException("Error Yandex API: " + responseCode + " - " + responseBody);
+            }
+
+            return parseJsonResponse(responseBody);
+
+        } finally {
+            connection.disconnect();
+        }
+    }
+
+    private String readAll(BufferedReader reader) throws IOException {
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            sb.append(line);
+        }
+        return sb.toString();
+    }
+
+    private YandexSearchResponse parseJsonResponse(String json) {
+        YandexSearchResponse response = null;
+        try {
+            response = objectMapper.readValue(json, YandexSearchResponse.class);
+        } catch (JsonProcessingException e) {
+                throw new RuntimeException(e);
+        }
+
+        return response;
+    }
+}

src/main/java/ru/soune/nocopy/service/auth/AuthService.java

@@ -1,13 +1,13 @@
-package ru.soune.nocopy.service;
+package ru.soune.nocopy.service.auth;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.context.MessageSource;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import ru.soune.nocopy.dto.*;
-import ru.soune.nocopy.entity.auth.AuthToken;
+import ru.soune.nocopy.entity.AuthToken;
 import ru.soune.nocopy.entity.User;
+import ru.soune.nocopy.exception.NotFoundAuthToken;
 import ru.soune.nocopy.exception.NotValidFieldException;
 import ru.soune.nocopy.repository.AuthTokenRepository;
 import ru.soune.nocopy.repository.UserRepository;
@@ -29,8 +29,6 @@ public class AuthService {
 
     private final PasswordEncoder passwordEncoder;
 
-    private final MessageSource messageSource;
-
     private final SecureRandom secureRandom = new SecureRandom();
 
     @Transactional
@@ -82,23 +80,29 @@ public class AuthService {
     }
 
     @Transactional
-    public void logout(String token) {
+    public Long useUserAuthToken(String token) {
-        authTokenRepository.findByToken(token)
+        if (token == null || token.isBlank()) {
-                .ifPresent(authTokenRepository::delete);
+            throw new NotFoundAuthToken("Token is required");
+        }
+
+        if (token.startsWith("Bearer ")) {
+            token = token.replace("Bearer ", "");
+        }
+
+        AuthToken authToken = authTokenRepository.findByToken(token)
+                .orElseThrow(() -> new NotFoundAuthToken("Token not found"));
+        authToken.setLastUsedAt(LocalDateTime.now());
+        authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
+
+        authTokenRepository.save(authToken);
+
+        return authToken.getUser().getId();
     }
 
     @Transactional
-    public AuthToken createTokenForUser(User user) {
+    public void logout(String token) {
-        AuthToken authToken = new AuthToken();
+        authTokenRepository.findByToken(token)
-        authToken.setToken(generateAuthToken());
+                .ifPresent(authTokenRepository::delete);
-        authToken.setUser(user);
-        authToken.setExpiresAt(LocalDateTime.now().plusHours(1));
-        authToken.setIsActive(true);
-
-        user.setLastLoginAt(LocalDateTime.now());
-        userRepository.save(user);
-
-        return authTokenRepository.save(authToken);
     }
 
     private String generateAuthToken() {

src/main/java/ru/soune/nocopy/service/auth/CleanupTokenSessionsService.java

@@ -0,0 +1,37 @@
+package ru.soune.nocopy.service.auth;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+import ru.soune.nocopy.entity.AuthToken;
+import ru.soune.nocopy.repository.AuthTokenRepository;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class CleanupTokenSessionsService {
+    @Autowired
+    private AuthTokenRepository authTokenRepository;
+
+    @Value("${file.storage.auth-token-life-hours}")
+    private int authTokenLife;
+
+    @Transactional
+    @Scheduled(fixedDelay = 30000)
+    public void cleanupExpiredTokens() {
+        LocalDateTime now = LocalDateTime.now();
+
+        List<AuthToken> expiredTokens = authTokenRepository.findByExpiresAtBefore(now);
+
+        if (!expiredTokens.isEmpty()) {
+            authTokenRepository.deleteAll(expiredTokens);
+        }
+    }
+}

src/main/java/ru/soune/nocopy/service/auth/ExternalAuthUserService.java

@@ -1,102 +0,0 @@
-package ru.soune.nocopy.service.auth;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.entity.auth.ExternalAuthProvider;
-import ru.soune.nocopy.repository.ExternalAuthProviderRepository;
-import ru.soune.nocopy.repository.UserRepository;
-
-import java.time.LocalDateTime;
-import java.util.Optional;
-
-@Service
-@RequiredArgsConstructor
-public class ExternalAuthUserService {
-    private final UserRepository userRepository;
-
-    private final ExternalAuthProviderRepository externalAuthProviderRepository;
-
-    @Transactional
-    public User findOrCreateUserFromVK(String vkUserId, String fullName, String email,
-                                       String vkAccessToken, String vkRefreshToken, Integer expiresIn) {
-
-        Optional<User> existingByVkId = userRepository.findByExternalProvider(ExternalAuthProvider.ProviderType.VK,
-                vkUserId);
-
-        if (existingByVkId.isPresent()) {
-            User user = existingByVkId.get();
-            updateVKProvider(user, vkAccessToken, vkRefreshToken, expiresIn, email);
-
-            return user;
-        }
-
-        if (email != null && !email.isBlank()) {
-            Optional<User> existingByEmail = userRepository.findByEmail(email);
-
-            if (existingByEmail.isPresent()) {
-                User user = existingByEmail.get();
-                linkVKProvider(user, vkUserId, vkAccessToken, vkRefreshToken, expiresIn, email);
-
-                return user;
-            }
-        }
-
-        return createNewUserWithVK(vkUserId, fullName, email, vkAccessToken, vkRefreshToken, expiresIn);
-    }
-
-    private User createNewUserWithVK(String vkUserId, String fullName, String email,
-                                     String vkAccessToken, String vkRefreshToken, Integer expiresIn) {
-        User newUser = User.builder()
-                .fullName(fullName)
-                .email(email)
-                .password("generateRandomPassword()")
-                .isActive(true)
-                .build();
-
-        User savedUser = userRepository.save(newUser);
-
-        linkVKProvider(savedUser, vkUserId, vkAccessToken, vkRefreshToken, expiresIn, email);
-
-        return savedUser;
-    }
-
-    private void linkVKProvider(User user, String vkUserId, String vkAccessToken, String vkRefreshToken,
-                                Integer expiresIn, String email) {
-        ExternalAuthProvider provider = ExternalAuthProvider.builder()
-                .user(user)
-                .providerType(ExternalAuthProvider.ProviderType.VK)
-                .providerUserId(vkUserId)
-                .accessToken(vkAccessToken)
-                .refreshToken(vkRefreshToken)
-                .tokenExpiresAt(LocalDateTime.now().plusSeconds(expiresIn))
-                .email(email)
-                .isActive(true)
-                .build();
-
-        externalAuthProviderRepository.save(provider);
-
-        user.getExternalAuthProviders().add(provider);
-    }
-
-    private void updateVKProvider(User user, String vkAccessToken, String vkRefreshToken,
-                                  Integer expiresIn, String email) {
-        Optional<ExternalAuthProvider> existingProvider = user.getProvider(ExternalAuthProvider.ProviderType.VK);
-
-        if (existingProvider.isPresent()) {
-            ExternalAuthProvider provider = existingProvider.get();
-            provider.setAccessToken(vkAccessToken);
-            provider.setTokenExpiresAt(LocalDateTime.now().plusSeconds(expiresIn));
-            provider.setEmail(email);
-            provider.setRefreshToken(vkRefreshToken);
-            provider.setLastUsedAt(LocalDateTime.now());
-
-            externalAuthProviderRepository.save(provider);
-        }
-    }
-
-    private String generateRandomPassword() {
-        return java.util.UUID.randomUUID().toString();
-    }
-}

src/main/java/ru/soune/nocopy/service/file/FileUploadServiceImpl.java

@@ -102,7 +102,7 @@ public class FileUploadServiceImpl implements FileUploadService {
         int totalChunks = (int) Math.ceil((double) fileSize / chunkSize);
         log.debug("File will be split into {} chunks (chunk size: {} bytes)",
                 totalChunks, chunkSize);
-        Long chunkSize = totalChunks == 1 ? fileSize : 1048576L;
+        Long chunkSize = totalChunks == 1 ? fileSize : 1000000L;
 
         FileUploadSession session = FileUploadSession.builder()
                 .userId(userId)

src/main/resources/application.yaml

@@ -24,21 +24,14 @@ spring:
 file:
   storage:
     base-path: ${FILE_STORAGE_PATH:/data/uploads}
-    #    chunk-size: ${FILE_CHUNK_SIZE:5242880}  # 5MB
+    chunk-size: ${FILE_CHUNK_SIZE:1000000}  # 1MB
-    chunk-size: ${FILE_CHUNK_SIZE:1048576}  # 15MB
     max-file-size: ${MAX_FILE_SIZE:10737418240}  # 10GB
     max-retry-attempts: ${MAX_RETRY_ATTEMPTS:3}
     chunk-timeout-ms: ${CHUNK_TIMEOUT_MS:300000}  # 5 минут
     temp-ttl-hours: ${TEMP_TTL_HOURS:72}  # 3 дня
+    auth-token-life-hours: ${AUTH_TOKEN_LIFE:1}  # 1 час
     session-expiry-hours: ${SESSION_EXPIRY_HOURS:24}
 
-auth:
-  vk:
-    oauth2: "https://id.vk.ru/oauth2/auth"
-    user_info: "https://id.vk.ru/oauth2/user_info"
-    client_id: "54389559"
-    redirect_uri: "http://localhost"
-
 security:
   cors:
     allowed-origins: "*"
@@ -57,4 +50,9 @@ logging:
   file:
     name: logs/application.log
   pattern:
-    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+    console: "%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n"
+
+yandex:
+  api-key: ${YANDEX_API_KEY:AQVNyaVaUmgUb1GMCtf5zSEqFxy0woXrcMOOB43q}
+  folder-id: ${YANDEX_FOLDER_ID:b1gokpdbm6qfpsou8pcd}
+  search-url: ${YANDEX_SEARCH_URL:https://searchapi.api.cloud.yandex.net/v2/image/search_by_image}

src/test/java/ru/soune/nocopy/service/AuthServiceTest.java

@@ -1,101 +0,0 @@
-package ru.soune.nocopy.service;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.springframework.context.MessageSource;
-import org.springframework.security.crypto.password.PasswordEncoder;
-import ru.soune.nocopy.dto.LoginRequest;
-import ru.soune.nocopy.entity.auth.AuthToken;
-import ru.soune.nocopy.entity.User;
-import ru.soune.nocopy.exception.NotValidationPasswordException;
-import ru.soune.nocopy.exception.UserNotFoundException;
-import ru.soune.nocopy.repository.AuthTokenRepository;
-import ru.soune.nocopy.repository.UserRepository;
-
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
-public class AuthServiceTest {
-
-    @Mock
-    private UserRepository userRepository;
-
-    @Mock
-    private AuthTokenRepository authTokenRepository;
-
-    @Mock
-    private PasswordEncoder passwordEncoder;
-
-    @Mock
-    private MessageSource messageSource;
-
-    @InjectMocks
-    private AuthService authService;
-
-    @BeforeEach
-    void setUp() {
-        MockitoAnnotations.openMocks(this);
-    }
-
-    @Test
-    void login_success() {
-        LoginRequest request = new LoginRequest("test@mail.com", "password");
-
-        User user = new User();
-        user.setId(1L);
-        user.setEmail("test@mail.com");
-        user.setPassword("encoded_pass");
-
-        when(userRepository.findByEmail("test@mail.com"))
-                .thenReturn(Optional.of(user));
-        when(passwordEncoder.matches("password", "encoded_pass"))
-                .thenReturn(true);
-        when(authTokenRepository.save(any(AuthToken.class)))
-                .thenAnswer(invocation -> invocation.getArgument(0));
-
-        AuthToken token = authService.login(request);
-
-        assertNotNull(token);
-        assertNotNull(token.getToken());
-//        assertEquals(user.getTokens().get(0), token.getUser());
-
-        ArgumentCaptor<AuthToken> captor = ArgumentCaptor.forClass(AuthToken.class);
-        verify(authTokenRepository).save(captor.capture());
-
-//        assertEquals(user, captor.getValue().getUser());
-        assertNotNull(captor.getValue().getToken());
-    }
-
-
-    @Test
-    void login_userNotFound() {
-        LoginRequest request = new LoginRequest("missing@mail.com", "pwd");
-
-        when(userRepository.findByEmail("missing@mail.com")).thenReturn(Optional.empty());
-
-        assertThrows(UserNotFoundException.class, () -> authService.login(request));
-    }
-
-
-    @Test
-    void login_invalidPassword() {
-        LoginRequest request = new LoginRequest("test@mail.com", "wrong");
-
-        User user = new User();
-        user.setEmail("test@mail.com");
-        user.setPassword("encoded_pass");
-
-        when(userRepository.findByEmail("test@mail.com")).thenReturn(Optional.of(user));
-        when(passwordEncoder.matches("wrong", "encoded_pass")).thenReturn(false);
-
-        assertThrows(NotValidationPasswordException.class, () -> authService.login(request));
-    }
-}