X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Futil%2FLoginEntryPoint.java;h=b7bf9103ab7ce2f0bd9398a596e2012cbba4d936;hb=c811008ac91053f068c26f48427617de9bb7b79c;hp=a43b9ee92723f1fb28b15604e62a74b56bf32378;hpb=b45e59192a4bb34a6b38a9bfa416b3dc3f6b7892;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java b/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java index a43b9ee92..b7bf9103a 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/util/LoginEntryPoint.java @@ -11,7 +11,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.cms.CmsException; import org.argeo.cms.auth.CurrentUser; -import org.argeo.cms.auth.CmsAuthenticated; import org.argeo.cms.ui.CmsImageManager; import org.argeo.cms.ui.CmsView; import org.argeo.cms.ui.UxContext; @@ -35,7 +34,7 @@ public class LoginEntryPoint implements EntryPoint, CmsView { @Override public int createUI() { final Display display = createDisplay(); - UiContext.setData(CmsAuthenticated.KEY, this); + UiContext.setData(CmsView.KEY, this); CmsLoginShell loginShell = createCmsLoginShell(); try { // try pre-auth @@ -67,7 +66,7 @@ public class LoginEntryPoint implements EntryPoint, CmsView { } } - if (CurrentUser.getUsername() == null) + if (CurrentUser.getUsername(getSubject()) == null) return -1; uxContext = new SimpleUxContext(); return postLogin(); @@ -160,10 +159,15 @@ public class LoginEntryPoint implements EntryPoint, CmsView { // return loginContext; // } - public Subject getSubject() { + protected Subject getSubject() { return loginContext.getSubject(); } + @Override + public boolean isAnonymous() { + return CurrentUser.isAnonymous(getSubject()); + } + @Override public CmsImageManager getImageManager() { // TODO Auto-generated method stub