Introduce CMS event bus and use it in UI.

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

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
index 1f2ea73a75cebb04a3eb65ef0cbed5e7a3dd997e..757bf73bfc43513fab8c004aaa3eb363a005f22a 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/RemoteAuthUtils.java
@@ -14,7 +14,6 @@ import javax.security.auth.login.LoginException;
 import org.argeo.api.cms.CmsAuth;
 import org.argeo.api.cms.CmsLog;
 import org.argeo.api.cms.CmsSession;
-import org.argeo.cms.internal.http.CmsAuthenticator;
 import org.argeo.cms.internal.runtime.CmsContextImpl;
 import org.argeo.util.http.HttpHeader;
 import org.ietf.jgss.GSSContext;
@@ -148,7 +147,7 @@ public class RemoteAuthUtils {
        public static int askForWwwAuth(RemoteAuthResponse remoteAuthResponse, String realm, boolean forceBasic) {
                // response.setHeader(HttpUtils.HEADER_WWW_AUTHENTICATE, "basic
                // realm=\"" + httpAuthRealm + "\"");
-               if (SpnegoLoginModule.hasAcceptorCredentials() && !forceBasic)// SPNEGO
+               if (hasAcceptorCredentials() && !forceBasic)// SPNEGO
                        remoteAuthResponse.setHeader(HttpHeader.WWW_AUTHENTICATE.getName(), HttpHeader.NEGOTIATE);
                else
                        remoteAuthResponse.setHeader(HttpHeader.WWW_AUTHENTICATE.getName(),
@@ -165,4 +164,8 @@ public class RemoteAuthUtils {
                return 401;
        }
 
+       private static boolean hasAcceptorCredentials() {
+               return CmsContextImpl.getCmsContext().getAcceptorCredentials() != null;
+       }
+
 }