diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/session')
3 files changed, 17 insertions, 12 deletions
diff --git a/src/main/java/org/openslx/imagemaster/session/Session.java b/src/main/java/org/openslx/imagemaster/session/Session.java index 727045a..54a2757 100644 --- a/src/main/java/org/openslx/imagemaster/session/Session.java +++ b/src/main/java/org/openslx/imagemaster/session/Session.java @@ -37,9 +37,9 @@ public class Session return user.satelliteAddress; } - public String getUserId() + public String getLogin() { - return user.username + "@" + user.organization; + return user.eppn; } public String getFirstName() @@ -56,5 +56,10 @@ public class Session { return user.eMail; } + + public String getOrgenizationId() + { + return user.organizationId; + } } diff --git a/src/main/java/org/openslx/imagemaster/session/SessionManager.java b/src/main/java/org/openslx/imagemaster/session/SessionManager.java index 7891904..295b53e 100644 --- a/src/main/java/org/openslx/imagemaster/session/SessionManager.java +++ b/src/main/java/org/openslx/imagemaster/session/SessionManager.java @@ -60,7 +60,7 @@ public class SessionManager while ( it.hasNext() ) { final Session s = it.next(); if ( s.timedOut() ) { - log.debug( "Removing old session of " + s.getUserId() ); + log.debug( "Removing old session of " + s.getLogin() ); it.remove(); } } diff --git a/src/main/java/org/openslx/imagemaster/session/User.java b/src/main/java/org/openslx/imagemaster/session/User.java index 264c17f..bbbe8c7 100644 --- a/src/main/java/org/openslx/imagemaster/session/User.java +++ b/src/main/java/org/openslx/imagemaster/session/User.java @@ -7,19 +7,19 @@ package org.openslx.imagemaster.session; */ public abstract class User { - public final String username, organization; + public final String eppn, organizationId; public final String password; public final String firstName, lastName; public final String eMail; public final String satelliteAddress; public final int userId; - protected User( int userId, String username, String password, String organization, String firstName, String lastName, String eMail, + protected User( int userId, String eppn, String password, String organization, String firstName, String lastName, String eMail, String satelliteAddress ) { this.userId = userId; - this.username = username; - this.organization = organization; + this.eppn = eppn; + this.organizationId = organization; this.password = password; this.firstName = firstName; this.lastName = lastName; @@ -30,10 +30,10 @@ public abstract class User @Override public String toString() { - final StringBuilder sb = new StringBuilder( this.username ); - sb.append( "@" ); - sb.append( this.organization ); - sb.append( ": " ); + final StringBuilder sb = new StringBuilder( this.eppn ); + sb.append( " (" ); + sb.append( this.organizationId ); + sb.append( "): " ); sb.append( this.firstName ); sb.append( ' ' ); sb.append( this.lastName ); @@ -48,7 +48,7 @@ public abstract class User public String getLogin() { - return username + "@" + organization; + return eppn; } } |