Merge branch 'master' into HEAD

# Conflicts: # pom.xml # src/main/java/ru/tvey/cloudserverapp/scheduled/MessageScheduler.java # src/main/java/ru/tvey/cloudserverapp/security/SecurityConfig.java # src/main/java/ru/tvey/cloudserverapp/service/message/MessageServiceImpl.java
St3plox · Jul 27, 2023 · 7b6146c · 7b6146c
2 parents 5441a13 + 5c02bf9
commit 7b6146c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/ru/tvey/cloudserverapp/scheduled/MessageScheduler.java b/src/main/java/ru/tvey/cloudserverapp/scheduled/MessageScheduler.java
@@ -2,12 +2,12 @@
 
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Component;
-import ru.tvey.cloudserverapp.datacache.CacheKeyGenerator;
 import ru.tvey.cloudserverapp.datacache.CacheStore;
 import ru.tvey.cloudserverapp.entity.UserKeyIvPair;
 import ru.tvey.cloudserverapp.entity.messaging.Group;
 import ru.tvey.cloudserverapp.entity.messaging.Message;
 import ru.tvey.cloudserverapp.repository.MessageRepository;
+import ru.tvey.cloudserverapp.security.SecurityConstants;
 import ru.tvey.cloudserverapp.service.EntityService;
 import ru.tvey.cloudserverapp.service.group.GroupService;
 
@@ -28,8 +28,6 @@ public class MessageScheduler {
 
     private final EntityService entityService;
 
-    private final CacheKeyGenerator cacheKeyGenerator;
-
     private final ScheduledExecutorService executor =
             Executors.newSingleThreadScheduledExecutor();
 

diff --git a/src/main/java/ru/tvey/cloudserverapp/security/SecurityConfig.java b/src/main/java/ru/tvey/cloudserverapp/security/SecurityConfig.java
@@ -34,6 +34,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .requestMatchers(HttpMethod.POST, SecurityConstants.REGISTER_PATH).permitAll()
                 .requestMatchers(HttpMethod.GET, "/swagger-ui/**").permitAll()
                 .requestMatchers(HttpMethod.GET, "/v3/**").permitAll()
+                .requestMatchers("main/login").permitAll()
+                .requestMatchers("main/register").permitAll()
                 .anyRequest().authenticated()
                 .and()
                 .addFilterBefore(new ExceprionHandlerFilter(), AuthenticationFilter.class)

diff --git a/src/main/java/ru/tvey/cloudserverapp/service/message/MessageServiceImpl.java b/src/main/java/ru/tvey/cloudserverapp/service/message/MessageServiceImpl.java
@@ -3,7 +3,6 @@
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
-import ru.tvey.cloudserverapp.datacache.CacheKeyGenerator;
 import ru.tvey.cloudserverapp.datacache.CacheStore;
 import ru.tvey.cloudserverapp.encryption.AsymmetricCipher;
 import ru.tvey.cloudserverapp.encryption.EncryptionConstants;
@@ -19,6 +18,7 @@
 import ru.tvey.cloudserverapp.repository.KeyPairEntityRepository;
 import ru.tvey.cloudserverapp.repository.MessageRepository;
 import ru.tvey.cloudserverapp.scheduled.MessageScheduler;
+import ru.tvey.cloudserverapp.security.SecurityConstants;
 import ru.tvey.cloudserverapp.service.EntityService;
 import ru.tvey.cloudserverapp.service.file.FileService;
 import ru.tvey.cloudserverapp.service.group.GroupService;
@@ -62,8 +62,6 @@ public class MessageServiceImpl implements MessageService {
 
     private final MessageScheduler messageScheduler;
 
-    private final CacheKeyGenerator cacheKeyGenerator;
-
 
     @Override
     public void sendMessage(Authentication auth, String text,