X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fauth%2FAnonymousLoginModule.java;h=82873ad019db954f57059f60b8048d8c30a1d9ae;hb=e4a5502f49e2a2c35d16bbc96efdffead1362a76;hp=de3a3027012b973b0ffbfff3b57d3e187b30035b;hpb=b71546ddc74d6ca49d252806aafd491c75dfe1fb;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
index de3a30270..82873ad01 100644
--- a/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/AnonymousLoginModule.java
@@ -9,8 +9,7 @@ import javax.security.auth.login.LoginException;
 import javax.security.auth.spi.LoginModule;
 
 import org.argeo.api.cms.CmsLog;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.FrameworkUtil;
+import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.osgi.service.useradmin.Authorization;
 import org.osgi.service.useradmin.UserAdmin;
 
@@ -22,7 +21,7 @@ public class AnonymousLoginModule implements LoginModule {
 	private Map<String, Object> sharedState = null;
 
 	// private state
-	private BundleContext bc;
+//	private BundleContext bc;
 
 	@SuppressWarnings("unchecked")
 	@Override
@@ -30,12 +29,12 @@ public class AnonymousLoginModule implements LoginModule {
 			Map<String, ?> options) {
 		this.subject = subject;
 		this.sharedState = (Map<String, Object>) sharedState;
-		try {
-			bc = FrameworkUtil.getBundle(AnonymousLoginModule.class).getBundleContext();
-			assert bc != null;
-		} catch (Exception e) {
-			throw new IllegalStateException("Cannot initialize login module", e);
-		}
+//		try {
+//			bc = FrameworkUtil.getBundle(AnonymousLoginModule.class).getBundleContext();
+//			assert bc != null;
+//		} catch (Exception e) {
+//			throw new IllegalStateException("Cannot initialize login module", e);
+//		}
 	}
 
 	@Override
@@ -45,7 +44,7 @@ public class AnonymousLoginModule implements LoginModule {
 
 	@Override
 	public boolean commit() throws LoginException {
-		UserAdmin userAdmin = bc.getService(bc.getServiceReference(UserAdmin.class));
+		UserAdmin userAdmin = CmsContextImpl.getCmsContext().getUserAdmin();
 		Authorization authorization = userAdmin.getAuthorization(null);
 		RemoteAuthRequest request = (RemoteAuthRequest) sharedState.get(CmsAuthUtils.SHARED_STATE_HTTP_REQUEST);
 		Locale locale = Locale.getDefault();