diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/db')
4 files changed, 13 insertions, 35 deletions
diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java index 906d49e..472d249 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbPendingSatellite.java @@ -19,7 +19,7 @@ public class DbPendingSatellite throws SQLException { try ( MysqlConnection connection = Database.getConnection() ) { - MysqlStatement stmt = connection.prepareStatement( "INSERT INTO pending_satellite" + MysqlStatement stmt = connection.prepareStatement( "INSERT INTO satellite" + " (dateline, userid, organizationid, satellitename, addresses, publickey)" + " VALUES (UNIX_TIMESTAMP(), :userid, :organizationid, :satellitename, :addresses, :pubkey)", true ); stmt.setString( "userid", user.userId ); diff --git a/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java b/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java index 811ac67..2f72436 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbSatellite.java @@ -45,7 +45,12 @@ public class DbSatellite List<Satellite> list = new ArrayList<>(); while ( rs.next() ) { List<String> al = Arrays.asList( Json.deserialize( rs.getString( "addresses" ), String[].class ) ); - list.add( new Satellite( al, rs.getString( "satellitename" ), ByteBuffer.wrap( rs.getBytes( "certsha256" ) ) ) ); + byte[] certBytes = rs.getBytes( "certsha256" ); + ByteBuffer cert = null; + if ( certBytes != null ) { + cert = ByteBuffer.wrap( certBytes ); + } + list.add( new Satellite( al, rs.getString( "satellitename" ), cert ) ); } return list; } catch ( SQLException e ) { 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 349b023..9cde273 100644 --- a/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java +++ b/src/main/java/org/openslx/imagemaster/db/mappers/DbUser.java @@ -24,13 +24,12 @@ public class DbUser private static final Logger LOGGER = Logger.getLogger( DbUser.class ); private static final String localUserSql = "SELECT" - + " user.userid, user.login, user.password, user.organizationid, user.firstname, user.lastname, user.email," - + " organization.address FROM user" - + " LEFT JOIN organization USING (organizationid)"; + + " user.userid, user.password, user.organizationid, user.firstname, user.lastname, user.email" + + " FROM user"; private static LocalUser localFromRs( ResultSet rs ) throws SQLException { - return new LocalUser( rs.getInt( "userid" ), rs.getString( "login" ), rs.getString( "password" ), + return new LocalUser( rs.getString( "userid" ), rs.getString( "password" ), rs.getString( "organizationid" ), rs.getString( "firstname" ), rs.getString( "lastname" ), rs.getString( "email" ), Role.TUTOR ); } @@ -47,8 +46,8 @@ public class DbUser { try ( MysqlConnection connection = Database.getConnection() ) { MysqlStatement stmt = connection.prepareStatement( localUserSql - + " WHERE user.login = :login" ); - stmt.setString( "login", login ); + + " WHERE user.userid = :userid" ); + stmt.setString( "userid", login ); ResultSet rs = stmt.executeQuery(); if ( !rs.next() ) return null; @@ -67,30 +66,6 @@ public class DbUser return user.toUserInfo(); } - /** - * Query database for user with given userId - * - * @param userid - * @return instance of DbUser for matching entry from DB, or null if not - * found - * @throws SQLException - */ - public static LocalUser forLogin( final int userId ) throws SQLException - { - try ( MysqlConnection connection = Database.getConnection() ) { - MysqlStatement stmt = connection.prepareStatement( localUserSql - + " WHERE user.userid = :userid" ); - stmt.setInt( "userid", userId ); - ResultSet rs = stmt.executeQuery(); - if ( !rs.next() ) - return null; - return localFromRs( rs ); - } catch ( SQLException e ) { - LOGGER.error( "Query failed in DbUser.forLogin()", e ); - throw e; - } - } - public static LocalUser forLogin( String login, String password ) throws SQLException { LocalUser user = forLogin( login ); diff --git a/src/main/java/org/openslx/imagemaster/db/models/LocalUser.java b/src/main/java/org/openslx/imagemaster/db/models/LocalUser.java index 4e0d4fb..644373b 100644 --- a/src/main/java/org/openslx/imagemaster/db/models/LocalUser.java +++ b/src/main/java/org/openslx/imagemaster/db/models/LocalUser.java @@ -15,12 +15,10 @@ public class LocalUser public final String firstName, lastName; public final String eMail; public final Role role; - public final int userId; - public LocalUser( int userId, String login, String password, String organizationId, String firstName, String lastName, String eMail, + public LocalUser( String login, String password, String organizationId, String firstName, String lastName, String eMail, Role tutor ) { - this.userId = userId; this.login = login; this.organizationId = organizationId; this.password = password; |