diff options
Diffstat (limited to 'src/main/java/org/openslx/imagemaster/localrpc')
3 files changed, 18 insertions, 22 deletions
diff --git a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java index 8f13084..2504a3d 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/JsonUser.java @@ -1,23 +1,32 @@ package org.openslx.imagemaster.localrpc; -import org.openslx.imagemaster.session.User; +import org.openslx.bwlp.thrift.iface.Role; +import org.openslx.bwlp.thrift.iface.UserInfo; +import org.openslx.imagemaster.util.Util; public class JsonUser { - private String login = null; - private String organizationid = null; + private String userId = null; + private String organizationId = null; private String firstName = null; private String lastName = null; private String mail = null; private String role = null; - private int userId = -1; - public User toUser() + public UserInfo toUser() { - if ( userId <= 0 || firstName == null || lastName == null || firstName.isEmpty() || lastName.isEmpty() ) + Role role; + try { + role = Role.valueOf( this.role ); + } catch ( Exception e ) { return null; - return new ShibUser( userId, login, organizationid, firstName, lastName, mail, role ); + } + if ( Util.isEmpty( userId ) || Util.isEmpty( organizationId ) || Util.isEmpty( lastName ) || Util.isEmpty( mail ) ) + return null; + UserInfo ui = new UserInfo( userId, firstName, lastName, mail, organizationId ); + ui.role = role; + return ui; } } diff --git a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java index 96b1212..7223435 100644 --- a/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java +++ b/src/main/java/org/openslx/imagemaster/localrpc/NetworkHandler.java @@ -12,9 +12,9 @@ import java.util.concurrent.LinkedBlockingQueue; import org.apache.log4j.Logger; import org.openslx.bwlp.thrift.iface.ClientSessionData; +import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.imagemaster.session.Session; import org.openslx.imagemaster.session.SessionManager; -import org.openslx.imagemaster.session.User; import com.google.gson.Gson; @@ -124,7 +124,7 @@ public class NetworkHandler implements Runnable { try { JsonUser ju = gson.fromJson( payload, JsonUser.class ); - User u = ju.toUser(); + UserInfo u = ju.toUser(); if ( u == null ) { log.warn( "Invalid or inomplete RPC data (" + payload + ")" ); return "Invalid or incomplete RPC data"; diff --git a/src/main/java/org/openslx/imagemaster/localrpc/ShibUser.java b/src/main/java/org/openslx/imagemaster/localrpc/ShibUser.java deleted file mode 100644 index 4cba3a4..0000000 --- a/src/main/java/org/openslx/imagemaster/localrpc/ShibUser.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.openslx.imagemaster.localrpc; - -import org.openslx.imagemaster.session.User; - -public class ShibUser extends User -{ - - protected ShibUser( int userId, String login, String organization, String firstName, String lastName, String eMail, String role ) - { - super( userId, login, "", organization, firstName, lastName, eMail, "", role ); - } - -} |