From 2f6f2e6380f747f6b21ff60f8e12b7441bce4a55 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Thu, 20 Nov 2014 18:09:22 +0100 Subject: • authentication --- dozentenmodulserver/src/main/java/sql/SQL.java | 36 +++----------------------- 1 file changed, 3 insertions(+), 33 deletions(-) (limited to 'dozentenmodulserver/src/main/java/sql') diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 9cee34e1..db23a90a 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -14,10 +14,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.UUID; - -import org.openslx.imagemaster.thrift.iface.ImageServer.Client; -import org.openslx.imagemaster.thrift.iface.InvalidTokenException; - //import server.generated.Server.Client; @@ -30,39 +26,13 @@ import server.BinaryListener; import server.generated.Image; import server.generated.Lecture; import server.generated.Person; -import thrift.MasterThriftConnection; -import thrift.SessionData; + public class SQL { private static Logger log = Logger.getLogger(BinaryListener.class); - Client client = null; - - - public void setTokenForSession(String token) - { - SessionData.session.setAuthToken(token); - } - - - public boolean authenticated() throws InvalidTokenException - { - MasterThriftConnection thrift = new MasterThriftConnection(); - client = thrift.getMasterThriftConnection(); - try { - if(client.getUserFromToken(SessionData.session.getAuthToken()) != null) - { - return true; - } - } catch (TException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return false; - } - - + public Connection getConnection() { try { @@ -852,7 +822,7 @@ public class SQL { //No prepared statement to do here - public List getAllOS() throws InvalidTokenException + public List getAllOS() { //if(authenticated()) -- cgit v1.2.3-55-g7522