From 56c549e384b1a648c77bbd09a2cc77976e8a64de Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 24 May 2011 17:39:55 -0400
Subject: [PATCH] Documentation.
---
src/com/gitblit/wicket/LoginPage.java | 32 ++++----------------------------
1 files changed, 4 insertions(+), 28 deletions(-)
diff --git a/src/com/gitblit/wicket/LoginPage.java b/src/com/gitblit/wicket/LoginPage.java
index 3f8206e..63cb18f 100644
--- a/src/com/gitblit/wicket/LoginPage.java
+++ b/src/com/gitblit/wicket/LoginPage.java
@@ -1,7 +1,5 @@
package com.gitblit.wicket;
-import javax.servlet.http.Cookie;
-
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
@@ -12,12 +10,11 @@
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.protocol.http.WebRequest;
-import org.apache.wicket.protocol.http.WebResponse;
import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.wicket.models.UserModel;
public class LoginPage extends WebPage {
@@ -26,8 +23,6 @@
public LoginPage(PageParameters params) {
super(params);
-
- tryAutomaticLogin();
add(new Label("title", GitBlit.self().settings().getString(Keys.web.siteName, Constants.NAME)));
add(new Label("name", Constants.NAME));
@@ -51,8 +46,6 @@
setRedirect(true);
setResponsePage(getApplication().getHomePage());
}
-
- tryAutomaticLogin();
}
@Override
@@ -60,35 +53,18 @@
String username = LoginPage.this.username.getObject();
char[] password = LoginPage.this.password.getObject().toCharArray();
- User user = GitBlit.self().authenticate(username, password);
+ UserModel user = GitBlit.self().authenticate(username, password);
if (user == null)
error("Invalid username or password!");
else
loginUser(user);
}
}
-
- private void tryAutomaticLogin() {
- User user = null;
-
- // Grab cookie from Browser Session
- Cookie[] cookies = ((WebRequest) getRequestCycle().getRequest()).getCookies();
- if (cookies != null && cookies.length > 0) {
- user = GitBlit.self().authenticate(cookies);
- }
-
- // Login the user
- loginUser(user);
- }
-
- private void loginUser(User user) {
+
+ private void loginUser(UserModel user) {
if (user != null) {
// Set the user into the session
GitBlitWebSession.get().setUser(user);
-
- // Set Cookie
- WebResponse response = (WebResponse) getRequestCycle().getResponse();
- GitBlit.self().setCookie(response, user);
if (!continueToOriginalDestination()) {
// Redirect to home page
--
Gitblit v1.9.1