From 5e6999cd45d934f70aa3a52b532fa7127581ccaf Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Tue, 7 Sep 2021 01:13:34 +0200
Subject: [PATCH] [AB-328] fixing case sensitivity of allowed invite links

---
 .../repository/AllowedInviteLinkRepository.java          | 2 +-
 .../service/InviteLinkFilterServiceBean.java             | 2 +-
 .../management/AllowedInviteLinkManagementBean.java      | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/repository/AllowedInviteLinkRepository.java b/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/repository/AllowedInviteLinkRepository.java
index 07ac56c6f..93d0aa6fd 100644
--- a/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/repository/AllowedInviteLinkRepository.java
+++ b/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/repository/AllowedInviteLinkRepository.java
@@ -13,5 +13,5 @@ public interface AllowedInviteLinkRepository extends JpaRepository<AllowedInvite
     Optional<AllowedInviteLink> findByTargetServerIdAndServer(Long targetServerId, AServer server);
 
     Optional<AllowedInviteLink> findByTargetServerIdAndServer_Id(Long targetServerId, Long serverId);
-    Optional<AllowedInviteLink> findByCodeAndServer_Id(String code, Long serverId);
+    Optional<AllowedInviteLink> findByCodeIgnoreCaseAndServer_Id(String code, Long serverId);
 }
diff --git a/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/InviteLinkFilterServiceBean.java b/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/InviteLinkFilterServiceBean.java
index f55c7b62b..1c8c738aa 100644
--- a/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/InviteLinkFilterServiceBean.java
+++ b/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/InviteLinkFilterServiceBean.java
@@ -302,7 +302,7 @@ public class InviteLinkFilterServiceBean implements InviteLinkFilterService {
             }
             List<String> unResolvedInvites = new ArrayList<>();
             foundInvites.forEach(possibleUnresolvedInvite -> {
-                if(invites.stream().noneMatch(invite -> invite.getCode().equals(possibleUnresolvedInvite))) {
+                if(invites.stream().noneMatch(invite -> invite.getCode().equalsIgnoreCase(possibleUnresolvedInvite))) {
                     unResolvedInvites.add(possibleUnresolvedInvite);
                 }
             });
diff --git a/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/management/AllowedInviteLinkManagementBean.java b/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/management/AllowedInviteLinkManagementBean.java
index fde0b9a1a..480b365cb 100644
--- a/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/management/AllowedInviteLinkManagementBean.java
+++ b/abstracto-application/abstracto-modules/invite-filter/invite-filter-impl/src/main/java/dev/sheldan/abstracto/invitefilter/service/management/AllowedInviteLinkManagementBean.java
@@ -16,7 +16,12 @@ public class AllowedInviteLinkManagementBean implements AllowedInviteLinkManagem
 
     @Override
     public AllowedInviteLink createAllowedInviteLink(AServer server, Long targetServerId, String code) {
-        AllowedInviteLink inviteLink = AllowedInviteLink.builder().targetServerId(targetServerId).code(code).server(server).build();
+        AllowedInviteLink inviteLink = AllowedInviteLink
+                .builder()
+                .targetServerId(targetServerId)
+                .code(code)
+                .server(server)
+                .build();
         return repository.save(inviteLink);
     }
 
@@ -48,6 +53,6 @@ public class AllowedInviteLinkManagementBean implements AllowedInviteLinkManagem
 
     @Override
     public boolean allowedInviteLinkExists(ServerUser serverUser, String code) {
-        return repository.findByCodeAndServer_Id(code, serverUser.getServerId()).isPresent();
+        return repository.findByCodeIgnoreCaseAndServer_Id(code, serverUser.getServerId()).isPresent();
     }
 }