From: David ‘Bombe’ Roden Date: Wed, 25 Jul 2012 19:05:27 +0000 (+0200) Subject: Add login page. X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=cb96ebd4d6cb9b43fcf9a6bb3e2f335bff243708;p=demoscenemusic.git Add login page. --- diff --git a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java index f936ff2..60b8318 100644 --- a/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java +++ b/src/main/java/net/pterodactylus/demoscenemusic/data/DataManager.java @@ -267,6 +267,22 @@ public class DataManager { } /** + * Returns the user with the given name. + * + * @param username + * The name of the user + * @return The user, or {@code null} if the user does not exist + * @throws DatabaseException + * if a database error occurs + */ + public User getUserByName(String username) throws DatabaseException { + Query query = new Query(Type.SELECT, "USERS"); + query.addField(new Field("USERS.*")); + query.addWhereClause(new ValueFieldWhereClause(new ValueField("USERS.NAME", new StringParameter(username)))); + return database.getSingle(query, userCreator); + } + + /** * Returns the user connected with the given OpenID. * * @param openId diff --git a/src/main/java/net/pterodactylus/demoscenemusic/page/LoginPage.java b/src/main/java/net/pterodactylus/demoscenemusic/page/LoginPage.java new file mode 100644 index 0000000..0c30e28 --- /dev/null +++ b/src/main/java/net/pterodactylus/demoscenemusic/page/LoginPage.java @@ -0,0 +1,82 @@ +/* + * DemosceneMusic - LoginPage.java - Copyright © 2012 David Roden + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package net.pterodactylus.demoscenemusic.page; + +import net.pterodactylus.demoscenemusic.core.Core; +import net.pterodactylus.demoscenemusic.data.User; +import net.pterodactylus.util.database.DatabaseException; +import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateContext; +import net.pterodactylus.util.template.TemplateContextFactory; +import net.pterodactylus.util.web.Method; +import net.pterodactylus.util.web.RedirectException; + +/** + * Page that lets the user log in with his username and his password. + * + * @author David ‘Bombe’ Roden + */ +public class LoginPage extends BasePage { + + /** + * Creates a new login page. + * + * @param core + * The core + * @param templateContextFactory + * The template context factory + * @param template + * The template to render + */ + public LoginPage(Core core, TemplateContextFactory templateContextFactory, Template template) { + super(core, templateContextFactory, template, "login"); + } + + // + // BASEPAGE METHODS + // + + /** + * {@inheritDoc} + */ + @Override + protected void processTemplate(TemplateContext templateContext, ServletRequest request) throws RedirectException { + super.processTemplate(templateContext, request); + if (request.getMethod() == Method.POST) { + String username = request.getServletRequest().getParameter("username"); + String password = request.getServletRequest().getParameter("password"); + try { + User user = getCore().getDataManager().getUserByName(username); + if (user == null) { + templateContext.set("error", "user-not-found"); + return; + } + if (!user.verifyPassword(password)) { + templateContext.set("error", "invalid-password"); + return; + } + /* credentials okay, log the user in. */ + request.getServletRequest().getSession().setAttribute("currentUser", user); + throw new RedirectException("."); + } catch (DatabaseException de1) { + throw new RuntimeException("Could not load user from database.", de1); + } + } + } + +} diff --git a/src/main/resources/templates/login b/src/main/resources/templates/login new file mode 100644 index 0000000..0e28702 --- /dev/null +++ b/src/main/resources/templates/login @@ -0,0 +1,13 @@ +<%include include/header title=="Artists"> + +

Login

+ +
+ + + + + +
+ +<%include include/footer> \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/web.xml.template b/src/main/webapp/WEB-INF/web.xml.template index 9a726e0..75abb07 100644 --- a/src/main/webapp/WEB-INF/web.xml.template +++ b/src/main/webapp/WEB-INF/web.xml.template @@ -40,6 +40,10 @@ net.pterodactylus.demoscenemusic.page.ArtistsPage + login + net.pterodactylus.demoscenemusic.page.LoginPage + + openid net.pterodactylus.demoscenemusic.page.OpenIdPage