From 14d630b8682c425880511a2c5ddf520198f55205 Mon Sep 17 00:00:00 2001 From: Fabrice Bacchella <fbacchella@spamcop.net> Date: Sat, 23 May 2015 15:59:28 -0400 Subject: [PATCH] Create web.rewriteSession key for use with tomcat and CAS --- src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java index ff3b507..a8ae7d0 100644 --- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java +++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java @@ -18,7 +18,6 @@ import org.apache.wicket.protocol.http.WebRequest; import org.apache.wicket.protocol.http.WebResponse; -import com.gitblit.GitBlit; import com.gitblit.models.UserModel; import com.gitblit.wicket.GitBlitWebSession; @@ -28,8 +27,8 @@ super(); GitBlitWebSession session = GitBlitWebSession.get(); UserModel user = session.getUser(); - GitBlit.self().setCookie((WebResponse) getResponse(), null); - GitBlit.self().logout(user); + app().authentication().logout(((WebRequest) getRequest()).getHttpServletRequest(), + ((WebResponse) getResponse()).getHttpServletResponse(), user); session.invalidate(); /* -- Gitblit v1.9.1