From 5eb68cf9755d49113a668a722ca2f3fccb3e1903 Mon Sep 17 00:00:00 2001 From: Tor-Einar Skog <tor-einar.skog@nibio.no> Date: Mon, 24 Apr 2023 10:39:12 +0200 Subject: [PATCH] Remove limit to finding user by username using password --- .../nibio/vips/logic/controller/session/UserBean.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java index 557e418a..71c58c1a 100755 --- a/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java +++ b/src/main/java/no/nibio/vips/logic/controller/session/UserBean.java @@ -152,12 +152,6 @@ public class UserBean { */ public VipsLogicUser getUser(String username, Integer userAuthenticationTypeId) { - // If type of authentication is PASSWORD, we return nothing - if(userAuthenticationTypeId.equals(UserAuthenticationType.TYPE_PASSWORD)) - { - return null; - } - // We find the authentication with given name Query q = em.createNamedQuery("UserAuthentication.findByUsername"); q.setParameter("username", username); @@ -172,6 +166,11 @@ public class UserBean { } return null; } + + public UserAuthenticationType createUserAuthenticationTypeInstance(Integer userAuthenticationTypeId) + { + return em.find(UserAuthenticationType.class, userAuthenticationTypeId); + } public VipsLogicUser storeUserFirstTime(VipsLogicUser user,UserAuthentication auth) throws FormValidationException { -- GitLab