From 9bd1b2cbf195f167394d9f70cb376b35de262c29 Mon Sep 17 00:00:00 2001
From: Nils Schwabe
Date: Mon, 5 May 2014 15:24:22 +0200
Subject: Fix login format

---
 src/main/java/org/openslx/imagemaster/session/Authenticator.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/main/java/org/openslx/imagemaster')

diff --git a/src/main/java/org/openslx/imagemaster/session/Authenticator.java b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
index 3378662..85f56b2 100644
--- a/src/main/java/org/openslx/imagemaster/session/Authenticator.java
+++ b/src/main/java/org/openslx/imagemaster/session/Authenticator.java
@@ -28,17 +28,19 @@ public class Authenticator
 		//		}
 		//		log.debug( "Login successful: " + username );
 		
-		String prefix = "";
+		String login = username;
 		if (username.split( "@" ).length == 2) {
 			// we are in userid@organization format
 			// --> get prefix
 			DbSatellite satellite = DbSatellite.fromOrganization( username.split( "@" )[1] );
 			if (satellite == null)
 				throw new AuthenticationException( AuthenticationError.INVALID_CREDENTIALS, "Unkown Organization" );
-			prefix = satellite.getPrefix();
+			login = satellite.getPrefix() + "_" + username.split( "@" )[0];
 		}
 
-		LdapUser user = LdapUser.forLogin( prefix + "_" + username.split( "@" )[0], password ); // throws exception if credentials are invalid
+		log.info( "Loggin in with: " + login );
+		
+		LdapUser user = LdapUser.forLogin( login, password ); // throws exception if credentials are invalid
 		if ( user == null ) {
 			log.debug( "Login failed: " + username );
 			throw new AuthenticationException( AuthenticationError.GENERIC_ERROR, "Could not login because of a weird error." );
-- 
cgit v1.2.3-55-g7522