inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
104577: Merge RA-SPRINT4 to HEAD-BUG-FIX (5.1)
      102942: RA-202: Break dependency to spring-surf in alfresco-platform


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104646 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-05-20 12:21:59 +00:00
parent 40c72b9722
commit 243fee317e
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/java/org/alfresco/web/bean/LoginBean.java
View File

@@ -52,7 +52,6 @@ import org.alfresco.web.ui.common.PanelGenerator;
import org.alfresco.web.ui.common.Utils; import org.alfresco.web.ui.common.Utils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.extensions.surf.site.AuthenticationUtil;
/** /**
* JSF Managed Bean. Backs the "login.jsp" view to provide the form fields used * JSF Managed Bean. Backs the "login.jsp" view to provide the form fields used
@@ -78,6 +77,10 @@ public class LoginBean implements Serializable
*/ */
private static final String PARAM_OUTCOME = "outcome"; private static final String PARAM_OUTCOME = "outcome";
/** flag to set in the user Session when an external authentication mechanism is used
* this informs the framework that user cannot Change Password or Logout in the usual way */
private static final String SESSION_ATTRIBUTE_EXTERNAL_AUTH= "_alfExternalAuth";
private static final long serialVersionUID = 7417882503323795282L; private static final long serialVersionUID = 7417882503323795282L;
/** /**
@@ -497,9 +500,10 @@ public class LoginBean implements Serializable
return outcome; return outcome;
} }
public boolean getIsExternalAuthentication(){ public boolean getIsExternalAuthentication()
{
HttpServletRequest request = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest(); HttpServletRequest request = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
return AuthenticationUtil.isExternalAuthentication(request); return (request.getSession().getAttribute(SESSION_ATTRIBUTE_EXTERNAL_AUTH) != null);
} }
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------