summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/openslx/imagemaster/db/DbUser.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/DbUser.java')
-rw-r--r--src/main/java/org/openslx/imagemaster/db/DbUser.java23
1 files changed, 18 insertions, 5 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbUser.java b/src/main/java/org/openslx/imagemaster/db/DbUser.java
index 9370f40..774917d 100644
--- a/src/main/java/org/openslx/imagemaster/db/DbUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/DbUser.java
@@ -1,16 +1,15 @@
package org.openslx.imagemaster.db;
import org.apache.log4j.Logger;
-import org.openslx.imagemaster.session.Authenticator;
import org.openslx.imagemaster.session.User;
public class DbUser extends User {
- private static Logger log = Logger.getLogger( Authenticator.class );
+ private static Logger log = Logger.getLogger( DbUser.class );
- public DbUser(String username, String password, String organization,
+ public DbUser(int userId, String username, String password, String organization,
String firstName, String lastName, String eMail,
String satelliteAddress) {
- super(username, password, organization, firstName, lastName, eMail,
+ super(userId, username, password, organization, firstName, lastName, eMail,
satelliteAddress);
}
@@ -29,7 +28,7 @@ public class DbUser extends User {
return MySQL
.findUniqueOrNull(
DbUser.class,
- "SELECT user.username, user.password, user.organization, user.firstname, user.lastname, user.email, satellite.address FROM user"
+ "SELECT user.userid, user.username, user.password, user.organization, user.firstname, user.lastname, user.email, satellite.address FROM user"
+ " LEFT JOIN satellite USING (organization)"
+ " WHERE user.username = ? AND user.organization = ? LIMIT 1",
parts[0], parts[1]);
@@ -41,5 +40,19 @@ public class DbUser extends User {
user.username, user.password, user.organization, user.firstName, user.lastName, user.eMail);
return false;
}
+
+ public static int getUserIdByName(String username) {
+ DbUser user = MySQL
+ .findUniqueOrNull(
+ DbUser.class,
+ "SELECT user.userid, user.username, user.password, user.organization, user.firstname, user.lastname, user.email, satellite.address FROM user"
+ + " LEFT JOIN satellite USING (organization)"
+ + " WHERE user.username = ? LIMIT 1", username);
+ if (user != null) {
+ return user.userId;
+ } else {
+ return 0;
+ }
+ }
}