1 files changed, 20 insertions, 15 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java
index 9cde273..b6040e7 100644
--- a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java
@@ -35,14 +35,14 @@ public class DbUser
 	}
 
 	/**
-	 * Query database for user with given login
+	 * Query database for user with given user id
 	 * 
 	 * @param login (global user-id, login@org for test-accounts)
 	 * @return instance of DbUser for matching entry from DB, or null if not
 	 *         found
 	 * @throws SQLException if the query fails
 	 */
-	public static LocalUser forLogin( final String login ) throws SQLException
+	public static LocalUser forUserId( final String login ) throws SQLException
 	{
 		try ( MysqlConnection connection = Database.getConnection() ) {
 			MysqlStatement stmt = connection.prepareStatement( localUserSql
@@ -58,22 +58,22 @@ public class DbUser
 		}
 	}
 
-	public static UserInfo getUserInfo( final String login ) throws SQLException, TNotFoundException
-	{
-		LocalUser user = forLogin( login );
-		if ( user == null )
-			throw new TNotFoundException();
-		return user.toUserInfo();
-	}
-
-	public static LocalUser forLogin( String login, String password ) throws SQLException
+	public static LocalUser forUserId( String login, String password ) throws SQLException
 	{
-		LocalUser user = forLogin( login );
+		LocalUser user = forUserId( login );
 		if ( user == null || !Sha512Crypt.verifyPassword( password, user.password ) )
 			return null;
 		return user;
 	}
 
+	public static UserInfo getUserInfo( final String login ) throws SQLException, TNotFoundException
+	{
+		LocalUser user = forUserId( login );
+		if ( user == null )
+			throw new TNotFoundException();
+		return user.toUserInfo();
+	}
+	
 	public static List<UserInfo> findUser( String organizationId, String searchTerm )
 	{
 		// TODO Implement
@@ -82,17 +82,22 @@ public class DbUser
 
 	public static boolean exists( UserInfo user )
 	{
+		return exists( user, false );
+	}
+	
+	public static boolean exists( UserInfo user, boolean withIdentity )
+	{
 		if ( user == null )
 			return false;
-		return exists( user.userId );
+		return exists( user.userId, withIdentity );
 	}
 
-	private static boolean exists( String userId )
+	private static boolean exists( String userId, boolean withIdentitiy )
 	{
 		if ( userId == null )
 			return false;
 		try {
-			return forLogin( userId ) != null;
+			return forUserId( userId ) != null;
 		} catch ( SQLException e ) {
 			return false;
 		}