X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.equinox%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fequinox%2FSpringLoginModule.java;fp=security%2Fplugins%2Forg.argeo.security.equinox%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fequinox%2FSpringLoginModule.java;h=7631dade1831978fb569e6a13a62edd2dd570ef5;hb=5266ec50ddbf3247a5033d98a1dbceec6673a5b8;hp=716cb6d855afa8eb5a2486d2657b278daa4a6077;hpb=a8233e9378854fc9ed1f4186095d06866cbea9f8;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java b/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
index 716cb6d85..7631dade1 100644
--- a/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
+++ b/security/plugins/org.argeo.security.equinox/src/main/java/org/argeo/security/equinox/SpringLoginModule.java
@@ -69,7 +69,8 @@ public class SpringLoginModule extends SecurityContextLoginModule {
 		NameCallback nameCallback = new NameCallback("User");
 		PasswordCallback passwordCallback = new PasswordCallback("Password",
 				false);
-		NameCallback urlCallback = new NameCallback("Site URL");
+
+		// NameCallback urlCallback = new NameCallback("Site URL");
 
 		if (callbackHandler == null) {
 			throw new LoginException("No call back handler available");
@@ -77,7 +78,7 @@ public class SpringLoginModule extends SecurityContextLoginModule {
 		}
 		try {
 			callbackHandler.handle(new Callback[] { label, nameCallback,
-					passwordCallback, urlCallback });
+					passwordCallback });
 		} catch (Exception e) {
 			LoginException le = new LoginException("Callback handling failed");
 			le.initCause(e);
@@ -90,15 +91,13 @@ public class SpringLoginModule extends SecurityContextLoginModule {
 		if (passwordCallback.getPassword() != null) {
 			password = String.valueOf(passwordCallback.getPassword());
 		}
-		String url = urlCallback.getName();
+
+		// String url = urlCallback.getName();
 		// TODO: set it via system properties
 		String workspace = null;
 
-		// UsernamePasswordAuthenticationToken credentials = new
-		// UsernamePasswordAuthenticationToken(
-		// username, password);
 		SiteAuthenticationToken credentials = new SiteAuthenticationToken(
-				username, password, url, workspace);
+				username, password, null, workspace);
 
 		try {
 			Authentication authentication = authenticationManager