From 9bb31c888eaa3f3949c190c0d0848ec480526ae5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 02 May 2014 16:05:37 -0400
Subject: [PATCH] Documentation
---
src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
index 982de0e..27542bd 100644
--- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
@@ -15,11 +15,9 @@
*/
package com.gitblit.wicket.pages;
-import org.apache.wicket.markup.html.WebPage;
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;
@@ -29,10 +27,9 @@
super();
GitBlitWebSession session = GitBlitWebSession.get();
UserModel user = session.getUser();
- GitBlit.self().setCookie((WebResponse) getResponse(), null);
- GitBlit.self().logout(user);
- session.invalidate();
-
+ app().authentication().logout(((WebResponse) getResponse()).getHttpServletResponse(), user);
+ session.invalidate();
+
/*
* Now check whether the authentication was realized via the Authorization in the header.
* If so, it is likely to be cached by the browser, and cannot be undone. Effectively, this means
@@ -42,7 +39,7 @@
// authentication will be done via this route anyway, show a page to close the browser:
// this will be done by Wicket.
setupPage(null, getString("gb.logout"));
-
+
} else {
setRedirect(true);
setResponsePage(getApplication().getHomePage());
--
Gitblit v1.9.1