Refactor http

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / UserAdminLoginModule.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
index f5883a54f1035fc10608f7a5152380affa486c7a..b6ab04b213896db4a908112e7e7a2659016c366b 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/UserAdminLoginModule.java
@@ -71,11 +71,12 @@ public class UserAdminLoginModule implements LoginModule {
 
                final String username;
                final char[] password;
-               if (sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
+               if (callbackHandler == null && sharedState.containsKey(CmsAuthUtils.SHARED_STATE_NAME)
                                && sharedState.containsKey(CmsAuthUtils.SHARED_STATE_PWD)) {
                        username = (String) sharedState.get(CmsAuthUtils.SHARED_STATE_NAME);
                        password = (char[]) sharedState.get(CmsAuthUtils.SHARED_STATE_PWD);
                        // TODO locale?
+                       // NB: raw user name is used
                        AuthenticatingUser authenticatingUser = new AuthenticatingUser(username, password);
                        authorization = userAdmin.getAuthorization(authenticatingUser);
                } else {