diff options
| author | mconway <michael.c.conway@gmail.com> | 2012-10-10 00:48:30 (GMT) |
|---|---|---|
| committer | mconway <michael.c.conway@gmail.com> | 2012-10-10 00:48:30 (GMT) |
| commit | 18d59c710a7c03d041e7ff8d136c05d7a2591206 (patch) | |
| tree | ccecc779c68fd5d172e82d4ed8266a04b0201d93 /idrop-swing | |
| parent | 48dcafe7031b4350fcea07e5782bb9cab8d5d0fc (diff) | |
| download | QCG-Data-18d59c710a7c03d041e7ff8d136c05d7a2591206.zip QCG-Data-18d59c710a7c03d041e7ff8d136c05d7a2591206.tar.gz QCG-Data-18d59c710a7c03d041e7ff8d136c05d7a2591206.tar.bz2 | |
[#1011] add a dedicated doAuthentication method ot irodsAccessObjectFactory
Diffstat (limited to 'idrop-swing')
| -rw-r--r-- | idrop-swing/release_notes.txt | 1 | ||||
| -rw-r--r-- | idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/idrop-swing/release_notes.txt b/idrop-swing/release_notes.txt index 11d2e4f..51c532c 100644 --- a/idrop-swing/release_notes.txt +++ b/idrop-swing/release_notes.txt @@ -27,6 +27,7 @@ Note that the following bug and feature requests are logged in GForge with relat *[#870] jargon support for PAM ** added support for PAM logins +*[#1011] add a dedicated doAuthentication method to irodsAccessObjectFactory ==Bug Fixes== diff --git a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java index 77ba72f..4a8fcb5 100644 --- a/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java +++ b/idrop-swing/src/main/java/org/irods/jargon/idrop/desktop/systraygui/LoginDialog.java @@ -12,6 +12,7 @@ import javax.swing.JDialog; import javax.swing.KeyStroke; import org.irods.jargon.core.connection.IRODSAccount; +import org.irods.jargon.core.connection.auth.AuthResponse; import org.irods.jargon.core.exception.JargonException; import org.irods.jargon.core.pub.IRODSFileSystem; import org.irods.jargon.core.pub.UserAO; @@ -205,9 +206,8 @@ public class LoginDialog extends JDialog { try { irodsFileSystem = idropCore.getIrodsFileSystem(); - final UserAO userAO = irodsFileSystem.getIRODSAccessObjectFactory().getUserAO(irodsAccount); - userAO.findByName(irodsAccount.getUserName()); - idropCore.setIrodsAccount(irodsAccount); + AuthResponse authResponse = irodsFileSystem.getIRODSAccessObjectFactory().authenticateIRODSAccount(irodsAccount); + idropCore.setIrodsAccount(authResponse.getAuthenticatedIRODSAccount()); try { idropCore.getIdropConfigurationService().saveLogin(irodsAccount); } catch (IdropException ex) { |