diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db/DbUser.java')
| -rw-r--r-- | src/main/java/org/openslx/imagemaster/db/DbUser.java | 45 |
1 files changed, 17 insertions, 28 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/DbUser.java b/src/main/java/org/openslx/imagemaster/db/DbUser.java index c486da3..b822e4d 100644 --- a/src/main/java/org/openslx/imagemaster/db/DbUser.java +++ b/src/main/java/org/openslx/imagemaster/db/DbUser.java @@ -12,11 +12,11 @@ public class DbUser extends User private static Logger log = Logger.getLogger( DbUser.class ); - public DbUser( int userId, String username, String password, String organization, + public DbUser( int userId, String eppn, String password, String organizationId, String firstName, String lastName, String eMail, String satelliteAddress ) { - super( userId, username, password, organization, firstName, lastName, eMail, + super( userId, eppn, password, organizationId, firstName, lastName, eMail, satelliteAddress ); } @@ -24,22 +24,19 @@ public class DbUser extends User * Query database for user with given login * * @param login - * (user@organization) + * (user@organizationSuffix) * @return instance of DbUser for matching entry from DB, or null if not * found */ public static DbUser forLogin( final String login ) { - final String[] parts = login.split( "@" ); - if ( parts.length != 2 ) - return null; return 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 = ? AND user.organization = ? LIMIT 1", - parts[0], parts[1] ); + "SELECT user.userid, user.eppn, user.password, user.organizationid, user.firstname, user.lastname, user.email, satellite.address FROM user" + + " LEFT JOIN satellite USING (organizationid)" + + " WHERE user.eppn = ? LIMIT 1", + login ); } /** @@ -54,8 +51,8 @@ public class DbUser extends User return 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)" + "SELECT user.userid, user.eppn, user.password, user.organizationid, user.firstname, user.lastname, user.email, satellite.address FROM user" + + " LEFT JOIN satellite USING (organizationid)" + " WHERE user.userid = ? LIMIT 1", userid ); } @@ -75,21 +72,17 @@ public class DbUser extends User public static boolean insertOrUpdate( User user ) { - log.debug( "Inserted user '" + user.username + "' into db." ); + log.debug( "Inserted user '" + user.eppn + "' into db." ); MySQL.update( - "INSERT INTO user (username, password, organization, firstname, lastname, email) VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE password=VALUES(password), organization=VALUES(organization), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)", - user.username, user.password, user.organization, user.firstName, user.lastName, user.eMail ); + "INSERT INTO user (eppn, password, organizationid, firstname, lastname, email) VALUES (?, ?, ?, ?, ?, ?) ON DUPLICATE KEY UPDATE password=VALUES(password), organizationid=VALUES(organizationid), firstname=VALUES(firstname), lastname=VALUES(lastname), email=VALUES(email)", + user.eppn, user.password, user.organizationId, 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 ); + DbUser user = forLogin( username ); if ( user == null ) return 0; return user.userId; @@ -97,15 +90,11 @@ public class DbUser extends User public static String getUserNameById( int id ) { - 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.userid = ? LIMIT 1", id ); + DbUser user = forLogin( id ); if ( user == null ) - return ""; + return null; return user.username; } + */ } |