[Yanel-commits] rev 33977 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2008-03-25 09:36:57 +0100 (Tue, 25 Mar 2008)
New Revision: 33977

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
disable toolbar when logout

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-03-25 08:31:59 UTC (rev 33976)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java	2008-03-25 08:36:57 UTC (rev 33977)
@@ -115,6 +115,7 @@
 
     public static String IDENTITY_MAP_KEY = "identity-map";
     private static String TOOLBAR_KEY = "toolbar";
+    private static String TOOLBAR_USECASE = "toolbar";
     public static String NAMESPACE = "http://www.wyona.org/yanel/1.0";
 
     private static final String METHOD_PROPFIND = "PROPFIND";
@@ -1336,6 +1337,13 @@
      */
     public HttpServletResponse doLogout(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
         try {
+            if (isToolbarEnabled(request)) {
+                // TODO: Check if WORLD has access to the toolbar
+                //if (getRealm().getPolicyManager().authorize(path, new Identity(), new Usecase(TOOLBAR_USECASE))) {
+                    disableToolbar(request);
+                //}
+            }
+
             HttpSession session = request.getSession(true);
             // TODO: should we logout only from the current realm, or from all realms?
             // -> logout only from the current realm
@@ -2108,7 +2116,7 @@
         value = request.getParameter("yanel.toolbar");
         if (value != null && value.equals("on")) {
             log.debug("Turn on toolbar ...");
-            usecase = new Usecase("toolbar");
+            usecase = new Usecase(TOOLBAR_USECASE);
         }
         value = request.getParameter("yanel.policy");
         if (value != null) {