From 0ed5db9366541069ac4585c16d57138a9c4deac2 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 1 Oct 2014 16:53:55 +0200
Subject: Adapt to changed DB scheme (eppn handling for multiple suffixes)

---
 src/main/java/org/openslx/imagemaster/db/LdapUser.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

diff --git a/src/main/java/org/openslx/imagemaster/db/LdapUser.java b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
index 2812755..b026e7e 100644
--- a/src/main/java/org/openslx/imagemaster/db/LdapUser.java
+++ b/src/main/java/org/openslx/imagemaster/db/LdapUser.java
@@ -105,7 +105,7 @@ public class LdapUser extends User
 			eMail = entry.get( "mail" ).getString();
 			
 			// get the satellite address from db
-			DbSatellite dbSatellite = DbSatellite.fromOrganization( organization );
+			DbSatellite dbSatellite = DbSatellite.fromSuffix( organization );
 			if ( dbSatellite != null ) {
 				satelliteAddress = dbSatellite.getAddress();
 			} else {
@@ -118,7 +118,7 @@ public class LdapUser extends User
 			if ( e.getMessage().contains( "Cannot connect on the server" ) ) {
 				DbSatellite dbSatellite = DbSatellite.fromPrefix(split[0]);
 				if (dbSatellite == null) throw new AuthenticationException(AuthenticationError.INVALID_CREDENTIALS, "Credentials invalid.");
-				String lo = split[1] + "@" + dbSatellite.getOrganization();
+				String lo = split[1] + "@" + dbSatellite.getOrganizationId();
 				log.info( "LDAP server could not be reached. Trying to connect locally with: " + lo );
 				return LdapUser.localLogin(lo, password);
 			}
@@ -150,7 +150,7 @@ public class LdapUser extends User
 
 	/**
 	 * Login user locally if external Ldap server is not available
-	 * @param username Must be in form "username@organization"
+	 * @param eppn Must be in form "username@organization"
 	 * @param password The user's password
 	 */
 	private static LdapUser localLogin( String login, String password )
@@ -162,7 +162,7 @@ public class LdapUser extends User
 		if (!Sha512Crypt.verifyPassword( password, user.password )) return null;
 		
 		// return ldapuser if valid
-		return new LdapUser( user.userId, user.username, Sha512Crypt.Sha512_crypt( password, null, 0 ), user.organization, user.firstName,
+		return new LdapUser( user.userId, user.eppn, Sha512Crypt.Sha512_crypt( password, null, 0 ), user.organizationId, user.firstName,
 					user.lastName, user.eMail, user.satelliteAddress );
 	}
 }
-- 
cgit v1.2.3-55-g7522