fixing

Mixeway · Dec 13, 2024 · a5fd880 · a5fd880
1 parent 7cb71ad
commit a5fd880
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/backend/src/main/java/io/mixeway/mixewayflowapi/auth/jwt/JwtAuthFilter.java b/backend/src/main/java/io/mixeway/mixewayflowapi/auth/jwt/JwtAuthFilter.java
@@ -12,13 +12,11 @@
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
-import org.springframework.security.oauth2.core.oidc.user.OidcUser;
 import org.springframework.security.oauth2.jwt.JwtValidationException;
 import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
 import org.springframework.stereotype.Component;

diff --git a/backend/src/main/java/io/mixeway/mixewayflowapi/db/repository/TeamRepository.java b/backend/src/main/java/io/mixeway/mixewayflowapi/db/repository/TeamRepository.java
@@ -10,6 +10,6 @@ public interface TeamRepository extends CrudRepository<Team, Long>  {
     Optional<Team> findByName(String name);
     Optional<Team> findById(Long id);
 
-    Optional<Team> findByRemoteIdentifier(String remoteIdentifier);
+    List<Team> findByRemoteIdentifier(String remoteIdentifier);
     List<Team> findAll();
 }
diff --git a/backend/src/main/java/io/mixeway/mixewayflowapi/domain/finding/FindFindingService.java b/backend/src/main/java/io/mixeway/mixewayflowapi/domain/finding/FindFindingService.java
@@ -58,13 +58,17 @@ public ItemListResponse getThreatIntelFindings(Principal principal){
     }
 
     public ItemListResponse getThreatIntelFindingsForTeam(Principal principal, String remoteId){
-        Team team = findTeamService.findByRemoteId(remoteId);
-        if (team == null){
+        List<Team> teams = findTeamService.findByRemoteId(remoteId);
+        if (teams == null){
             throw new TeamNotFoundException("[Threat Intell] Trying to find not existing team " + remoteId);
         }
         List<ItemProjection> combinedProjections = new ArrayList<>();
 
-        combinedProjections = findingRepository.findCombinedItems(findCodeRepoService.findByTeam(team).stream().map(CodeRepo::getId).toList());
+        combinedProjections = findingRepository.findCombinedItems(
+                teams.stream()
+                        .flatMap(team -> findCodeRepoService.findByTeam(team).stream())
+                        .map(CodeRepo::getId).toList()
+        );
 
         return mapProjectionsToItems(combinedProjections);
     }

diff --git a/backend/src/main/java/io/mixeway/mixewayflowapi/domain/team/FindTeamService.java b/backend/src/main/java/io/mixeway/mixewayflowapi/domain/team/FindTeamService.java
@@ -49,7 +49,7 @@ public List<Team> findAll(){
         return teamRepository.findAll();
     }
 
-    public Team findByRemoteId(String remoteId) {
-        return teamRepository.findByRemoteIdentifier(remoteId).orElse(null);
+    public List<Team> findByRemoteId(String remoteId) {
+        return teamRepository.findByRemoteIdentifier(remoteId);
     }
 }