diff options
| author | Jonathan Bauer | 2015-07-10 14:50:23 +0200 |
|---|---|---|
| committer | Jonathan Bauer | 2015-07-10 14:50:23 +0200 |
| commit | 68686268e4d0e33f6f829f0e3fee69c7286cca3a (patch) | |
| tree | 35617235f564d98e20fdb64785928407643a2abf /dozentenmodul/src/main/java/org/openslx/dozmod/authentication | |
| parent | [client] create session from the ServiceProviderResponse (diff) | |
| download | tutor-module-68686268e4d0e33f6f829f0e3fee69c7286cca3a.tar.gz tutor-module-68686268e4d0e33f6f829f0e3fee69c7286cca3a.tar.xz tutor-module-68686268e4d0e33f6f829f0e3fee69c7286cca3a.zip | |
[client] fix idpCombo beeing shown even though TestAccount auth method was saved
check if loginWindow.isDisposed() in populateIdpCombo() to make sure have the widgets before doing anything
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/authentication')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java | 3 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java index 288a4cbc..9bbc4175 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java @@ -1,13 +1,10 @@ package org.openslx.dozmod.authentication; import org.apache.log4j.Logger; -import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.TAuthenticationException; -import org.openslx.bwlp.thrift.iface.TInvalidTokenException; import org.openslx.bwlp.thrift.iface.UserInfo; import org.openslx.dozmod.authentication.ShibbolethEcp.ReturnCode; import org.openslx.dozmod.thrift.Session; -import org.openslx.thrifthelper.ThriftManager; /** * @author Jonathan Bauer diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java index bdb92023..0c83ad0b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/authentication/TestAccountAuthenticator.java @@ -36,6 +36,7 @@ public class TestAccountAuthenticator implements Authenticator { // handle answer from server if (authResult != null && authResult.authToken != null) { + // TODO: Session.fromClientSessionData(authResult); UserInfo userInfo = null; try { userInfo = ThriftManager.getMasterClient().getUserFromToken(authResult.authToken); |