[overlord-commits] Overlord SVN: r773 - in bpm-console/trunk: gui/war/src/main/java/org/jboss/bpm/console/client and 1 other directories.

Author: heiko.braun(a)jboss.com Date: 2009-08-19 05:58:12 -0400 (Wed, 19 Aug 2009) New Revision: 773 Modified: bpm-console/trunk/BPMC.iws bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java Log: Force logout in login screen to catch browser reloads Modified: bpm-console/trunk/BPMC.iws =================================================================== --- bpm-console/trunk/BPMC.iws 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/BPMC.iws 2009-08-19 09:58:12 UTC (rev 773) @@ -17,10 +17,10 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/BPMC.iws" afterPath="$PROJECT_DIR$/BPMC.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" afterPath="$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" afterPath="$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/common/AbstractRESTAction.java" /> </list> <list name="Failed commit: Default" comment="remove dependency on DTOParser" /> </component> @@ -213,10 +213,10 @@ </provider> </entry> </file> - <file leaf-file-name="LoginView.java" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="LoginView.java" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316"> + <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> <folding /> </state> </provider> @@ -231,15 +231,42 @@ </provider> </entry> </file> - <file leaf-file-name="Authentication.java" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="Authentication.java" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205"> + <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="Header.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ApplicationContext.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="UserMgmtFacade.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> + <folding /> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="FindManager"> @@ -927,7 +954,7 @@ <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25099602" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.40229884" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24769102" order="1" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24701196" order="1" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32992035" order="8" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> @@ -1030,27 +1057,6 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="75" column="66" selection-start="2468" selection-end="2468" vertical-scroll-proportion="1.512088"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="75" column="0" selection-start="2466" selection-end="2466" vertical-scroll-proportion="0.33186814"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxyServlet.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="141" column="0" selection-start="5605" selection-end="5605" vertical-scroll-proportion="0.7032967"> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/jmaki/xhp/XmlHttpProxy.java"> <provider selected="true" editor-type-id="text-editor"> <state line="156" column="92" selection-start="6299" selection-end="6299" vertical-scroll-proportion="0.96263736"> @@ -1120,27 +1126,48 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="232" column="20" selection-start="6479" selection-end="6479" vertical-scroll-proportion="0.18509316"> + <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/report/RenderReportAction.java"> + <entry file="file://$PROJECT_DIR$/server/war/src/main/java/org/jboss/bpm/console/server/UserMgmtFacade.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="84" column="21" selection-start="3146" selection-end="3146" vertical-scroll-proportion="0.3242236"> + <state line="66" column="69" selection-start="2329" selection-end="2329" vertical-scroll-proportion="0.19875777"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/ApplicationContext.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="37" column="11" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.31219512"> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="99" column="6" selection-start="3361" selection-end="3361" vertical-scroll-proportion="0.5463415"> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="204" column="20" selection-start="6327" selection-end="6327" vertical-scroll-proportion="0.2447205"> + <state line="193" column="34" selection-start="6095" selection-end="6095" vertical-scroll-proportion="0.26459628"> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java"> + <provider selected="true" editor-type-id="text-editor"> + <state line="130" column="36" selection-start="4166" selection-end="4166" vertical-scroll-proportion="0.66086954"> + <folding /> + </state> + </provider> + </entry> </component> </project> Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/Header.java 2009-08-19 09:58:12 UTC (rev 773) @@ -96,7 +96,7 @@ public void onClick(Widget widget) { - appContext.getAuthentication().logout(); + appContext.getAuthentication().logoutAndReload(); } } ); Modified: bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java =================================================================== --- bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/LoginView.java 2009-08-19 09:58:12 UTC (rev 773) @@ -74,6 +74,10 @@ public void display() { + // force session invalidation, required to catch browser reload + Authentication.logout(config); + + // start new session requestSessionID(); } @@ -123,6 +127,8 @@ // move the loading div to foreground DOM.getElementById("splash").getStyle().setProperty("z-index", "1000"); DOM.getElementById("ui_loading").getStyle().setProperty("visibility", "visible"); + + // launch workspace new MainLayout(controller, auth, config); } }); @@ -133,7 +139,7 @@ public void onLoginFailed(Request request, Throwable t) { // auth failed - MessageBox.error("Login failed", t.getMessage()); + MessageBox.error("Login failed", t.getMessage()); ConsoleLog.error("Login failed", t); } } Modified: bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java =================================================================== --- bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:35:31 UTC (rev 772) +++ bpm-console/trunk/workspace/workspace-api/src/main/java/org/jboss/bpm/console/client/Authentication.java 2009-08-19 09:58:12 UTC (rev 773) @@ -191,10 +191,43 @@ $wnd.location.reload(); }-*/; - public void logout() + public static void logout(final ConsoleConfig conf) { RequestBuilder rb = new RequestBuilder( RequestBuilder.POST, + conf.getConsoleServerUrl()+"/rs/identity/sid/invalidate" + ); + + try + { + rb.sendRequest(null, new RequestCallback() + { + public void onResponseReceived(Request request, Response response) + { + ConsoleLog.debug("logout() HTTP "+response.getStatusCode()); + + if(response.getStatusCode()!=200) + { + ConsoleLog.error(response.getText()); + } + } + + public void onError(Request request, Throwable t) + { + ConsoleLog.error("Failed to invalidate session", t); + } + }); + } + catch (RequestException e) + { + ConsoleLog.error("Request error", e); + } + } + + public void logoutAndReload() + { + RequestBuilder rb = new RequestBuilder( + RequestBuilder.POST, config.getConsoleServerUrl()+"/rs/identity/sid/invalidate" ); @@ -204,7 +237,7 @@ { public void onResponseReceived(Request request, Response response) { - ConsoleLog.debug("logout() HTTP "+response.getStatusCode()); + ConsoleLog.debug("logoutAndReload() HTTP "+response.getStatusCode()); resetState(); reload(); } @@ -237,7 +270,7 @@ public void onResult(boolean b) { // regardless of the choice, force login - logout(); + logoutAndReload(); } } );