Adapt to changed Thrift RPC

2 files changed, 10 insertions, 5 deletions

diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
index 5d1b728..19891b9 100644
--- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java
+++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
@@ -1,9 +1,7 @@
 package org.openslx.imagemaster.session;
 
 import org.apache.log4j.Logger;
-import org.openslx.imagemaster.db.DbSatellite;
 import org.openslx.imagemaster.db.DbUser;
-import org.openslx.imagemaster.db.LdapUser;
 import org.openslx.imagemaster.thrift.iface.AuthenticationError;
 import org.openslx.imagemaster.thrift.iface.AuthenticationException;
 
@@ -26,6 +24,7 @@ public class Authenticator
 	public static User authenticate( String username, String password ) throws AuthenticationException
 	{
 		String login = username;
+		/*
 		if ( username.split( "@" ).length == 2 ) {
 			log.info( "username is in username@organization format" );
 			// we are in username@organization format
@@ -37,10 +36,11 @@ public class Authenticator
 			log.info( "username is not in a valid format." );
 			throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Credentials must be in (username@organization) or (prefix@username)" );
 		}
+		*/
 
 		log.info( "Logging in with: " + login );
 
-		LdapUser user = LdapUser.forLogin( login, password ); // throws exception if credentials are invalid
+		User user = DbUser.forLogin( login, password ); // throws exception if credentials are invalid
 		if ( user == null ) {
 			log.debug( "Login failed: " + username );
 			throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Something went wrong." );
diff --git a/src/main/java/org/openslx/imagemaster/session/User.java b/src/main/java/org/openslx/imagemaster/session/User.java
index 82ba8ca..264c17f 100644
--- a/src/main/java/org/openslx/imagemaster/session/User.java
+++ b/src/main/java/org/openslx/imagemaster/session/User.java
@@ -14,8 +14,8 @@ public abstract class User
 	public final String satelliteAddress;
 	public final int userId;
 
-	protected User(int userId, String username, String password, String organization, String firstName, String lastName, String eMail,
-			String satelliteAddress)
+	protected User( int userId, String username, String password, String organization, String firstName, String lastName, String eMail,
+			String satelliteAddress )
 	{
 		this.userId = userId;
 		this.username = username;
@@ -46,4 +46,9 @@ public abstract class User
 		return sb.toString();
 	}
 
+	public String getLogin()
+	{
+		return username + "@" + organization;
+	}
+
 }