summaryrefslogtreecommitdiffstats
path: root/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
diff options
context:
space:
mode:
Diffstat (limited to 'idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy')
-rw-r--r--idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy11
1 files changed, 4 insertions, 7 deletions
diff --git a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
index 20dd41c..7eff1f0 100644
--- a/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
+++ b/idrop-web/grails-app/controllers/org/irods/mydrop/controller/LoginController.groovy
@@ -4,7 +4,6 @@ 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.IRODSAccessObjectFactory
-import org.irods.jargon.core.pub.UserAO
class LoginController {
@@ -62,7 +61,7 @@ class LoginController {
if (presetResource) {
loginCommand.defaultStorageResource = presetResource
}
-
+
if (presetAuthScheme) {
log.info("preset auth scheme is:${presetAuthScheme}")
loginCommand.authMethod = presetAuthScheme
@@ -132,9 +131,9 @@ class LoginController {
loginCommand.zone,
resource)
}
-
+
log.info("login mode: ${loginCommand.authMethod}")
-
+
if (loginCommand.authMethod == "Standard") {
irodsAccount.authenticationScheme = IRODSAccount.AuthScheme.STANDARD
} else if (loginCommand.authMethod == "PAM") {
@@ -148,9 +147,7 @@ class LoginController {
log.info("built irodsAccount:${irodsAccount}")
AuthResponse authResponse
try {
-
- authResponse = irodsAccessObjectFactory.
- // close?
+ authResponse = irodsAccessObjectFactory.authenticateIRODSAccount(irodsAccount)
} catch (JargonException e) {
log.error("unable to authenticate, JargonException", e)