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.0/Cloud)

Browse Source 
86193: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      86111: Merged DEV to V4.2-BUG-FIX (4.2.4)
         86029 : MNT-12463 : logout button is displayed in Share (and in Explorer) when 'external' authentication is used/context.externalAuthentication not taken into account
            - Logout button is will be displayed if logged not a guest and not used 'external' authentication.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94524 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 09:43:05 +00:00
parent 0e6c3f18ac
commit ed947e5a98
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,6 +52,7 @@ 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
@@ -496,6 +497,10 @@ public class LoginBean implements Serializable
return outcome; return outcome;
} }
public boolean getIsExternalAuthentication(){
HttpServletRequest request = (HttpServletRequest) FacesContext.getCurrentInstance().getExternalContext().getRequest();
return AuthenticationUtil.isExternalAuthentication(request);
}
// ------------------------------------------------------------------------------ // ------------------------------------------------------------------------------
// Private data // Private data