X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FUserAdminLoginModule.java;h=b6ab04b213896db4a908112e7e7a2659016c366b;hb=02a6354c17ddb160513580e9e3c7826d9475b177;hp=f5883a54f1035fc10608f7a5152380affa486c7a;hpb=834951ff989fe60c63c33492378b9ca617c24aed;p=lgpl%2Fargeo-commons.git 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 f5883a54f..b6ab04b21 100644 --- 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 {