Merge pull request #48 from participating-online/feature/27-issue-wit…

…h-login Fixed invalid user error
sublinks · Nov 26, 2023 · f6e5f88 · f6e5f88
2 parents 0db6da1 + b63d19f
commit f6e5f88
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/authentication/JwtFilter.java b/src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/authentication/JwtFilter.java
@@ -8,6 +8,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UsernameNotFoundException;
@@ -43,13 +44,13 @@ protected void doFilterInternal(
     }
 
     if (userName != null && SecurityContextHolder.getContext().getAuthentication() == null) {
-      Person person = personRepository.findOneByName(userName);
-      if (person == null) {
+      final Optional<Person> person = personRepository.findOneByName(userName);
+      if (person.isEmpty()) {
         throw new UsernameNotFoundException("Invalid name");
       }
 
-      if (jwtUtil.validateToken(token, person)) {
-        final JwtPerson authenticationToken = new JwtPerson(person, person.getAuthorities());
+      if (jwtUtil.validateToken(token, person.get())) {
+        final JwtPerson authenticationToken = new JwtPerson(person.get(), person.get().getAuthorities());
         authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
         SecurityContextHolder.getContext().setAuthentication(authenticationToken);
       }

diff --git a/src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/user/controllers/UserAuthController.java b/src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/user/controllers/UserAuthController.java
@@ -95,7 +95,8 @@ GetCaptchaResponse captcha() {
   @PostMapping("login")
   LoginResponse login(@Valid @RequestBody final Login loginForm) {
 
-    final Person person = personRepository.findOneByName(loginForm.username_or_email());
+    final Person person = personRepository.findOneByName(loginForm.username_or_email())
+        .orElseThrow(() -> new ResponseStatusException(HttpStatus.UNAUTHORIZED));
     // @todo verify password
     final String token = jwtUtil.generateToken(person);
     return LoginResponse.builder()

diff --git a/src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/user/controllers/UserController.java b/src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/user/controllers/UserController.java
@@ -85,9 +85,11 @@ GetPersonDetailsResponse show(@Valid final GetPersonDetails getPersonDetailsForm
     Person person = null;
     if (getPersonDetailsForm.person_id() != null) {
       userId = (long) getPersonDetailsForm.person_id();
-      person = personRepository.findById(userId).orElseThrow();
+      person = personRepository.findById(userId)
+          .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "invalid_id_given"));
     } else if (getPersonDetailsForm.username() != null) {
-      person = personRepository.findOneByName(getPersonDetailsForm.username());
+      person = personRepository.findOneByName(getPersonDetailsForm.username())
+          .orElseThrow(() -> new ResponseStatusException(HttpStatus.BAD_REQUEST, "invalid_id_given"));
     } else {
       throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "no_id_given");
     }

diff --git a/.../java/com/sublinks/sublinksapi/person/listeners/PersonMentionCommentCreationListener.java b/.../java/com/sublinks/sublinksapi/person/listeners/PersonMentionCommentCreationListener.java
@@ -10,6 +10,7 @@
 import com.sublinks.sublinksapi.utils.models.Mention;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.ApplicationListener;
 import org.springframework.stereotype.Component;
@@ -32,20 +33,19 @@ public void onApplicationEvent(CommentCreatedEvent event) {
     final List<Mention> mentions = mentionUtils.getPersonMentions(comment.getCommentBody());
     if (mentions != null) {
       for (Mention mention : mentions) {
-        Person recipient = personRepository.findOneByName(mention.name());
+        Optional<Person> recipient = personRepository.findOneByName(mention.name());
 
-        if (recipient == null || Objects.equals(recipient, comment.getPerson())) {
+        if (recipient.isEmpty() || Objects.equals(recipient.get(), comment.getPerson())) {
           continue;
         }
 
         PersonMention personMention = PersonMention.builder()
             .comment(comment)
-            .recipient(recipient)
+            .recipient(recipient.get())
             .build();
 
         personMentionService.createPersonMention(personMention);
       }
     }
-
   }
 }
diff --git a/src/main/java/com/sublinks/sublinksapi/person/repositories/PersonRepository.java b/src/main/java/com/sublinks/sublinksapi/person/repositories/PersonRepository.java
@@ -1,9 +1,10 @@
 package com.sublinks.sublinksapi.person.repositories;
 
 import com.sublinks.sublinksapi.person.dto.Person;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface PersonRepository extends JpaRepository<Person, Long> {
 
-  Person findOneByName(String name);
+  Optional<Person> findOneByName(String name);
 }