From d03c677a7f0d2d4ccbce03abdc9d08df35a1b7e1 Mon Sep 17 00:00:00 2001
From: FireMasterK <20838718+FireMasterK@users.noreply.github.com>
Date: Sun, 3 Oct 2021 09:55:13 +0100
Subject: [PATCH] Fix for possible NPE.

---
 .../java/me/kavin/piped/utils/ResponseHelper.java | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/me/kavin/piped/utils/ResponseHelper.java b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
index ca39b3e..ade8ea7 100644
--- a/src/main/java/me/kavin/piped/utils/ResponseHelper.java
+++ b/src/main/java/me/kavin/piped/utils/ResponseHelper.java
@@ -578,15 +578,14 @@ public class ResponseHelper {
 
         User dbuser = s.createQuery(cr).uniqueResult();
 
-        String hash = dbuser.getPassword();
-
         if (dbuser != null) {
-            if (hash.startsWith("$argon2") && argon2PasswordEncoder.matches(pass, hash)) {
-                s.close();
-                return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId()));
-            }
-
-            if (bcryptPasswordEncoder.matches(pass, hash)) {
+            String hash = dbuser.getPassword();
+            if (hash.startsWith("$argon2")) {
+                if (argon2PasswordEncoder.matches(pass, hash)) {
+                    s.close();
+                    return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId()));
+                }
+            } else if (bcryptPasswordEncoder.matches(pass, hash)) {
                 s.close();
                 return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId()));
             }