christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

UserRegistration ok, modification donnée / pass, reste bug cache password

Browse Source
This commit is contained in:
Nicolas Michard
2008-02-05 14:35:18 +00:00
parent 5782eca2b2
commit 5c3b0b2339
5 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YACOSWeb/WebContent/WEB-INF/classes/messages.properties
View File

@@ -15,6 +15,7 @@ login.label.login=Login
login.label.password=Password login.label.password=Password
login.label.rememberme=Remember me login.label.rememberme=Remember me
login.label.connexion=Connexion login.label.connexion=Connexion
login.label.inscription=New user ? Create an account here
login.label.alreadyaccount:I have already an account login.label.alreadyaccount:I have already an account
# New user # New user
login.label.createnewuser=Create an account login.label.createnewuser=Create an account

13
YACOSWeb/WebContent/WEB-INF/jsp/registerUser.jsp
View File

@@ -8,11 +8,16 @@
<form:form method="post" commandName="registerUser"> <form:form method="post" commandName="registerUser">
<form:hidden path="isNew"/> <form:hidden path="isNew"/>
<form:label path="login"><fmt:message key="form.register.user.login" /></form:label> <form:input path="login"/> <span class="formError"><form:errors path="login" /></span><br/><br /> <authz:authorize ifAllGranted="ROLE_ANONYMOUS">
<form:label path="login"><fmt:message key="form.register.user.login" /></form:label> <form:input path="login" disabled="false" /> <span class="formError"><form:errors path="login" /></span><br/><br />
</authz:authorize>
<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
<form:label path="login"><fmt:message key="form.register.user.login" /></form:label> <form:input path="login" disabled="true"/> <span class="formError"><form:errors path="login" /></span><br/><br />
</authz:authorize>
<form:label path="email"><fmt:message key="form.register.user.email" /></form:label> <form:input path="email"/> <span class="formError"><form:errors path="email" /></span><br/><br /> <form:label path="email"><fmt:message key="form.register.user.email" /></form:label> <form:input path="email"/> <span class="formError"><form:errors path="email" /></span><br/><br />
<form:label path="password"><fmt:message key="form.register.user.password" /></form:label> <form:password path="password" showPassword="true"/> <span class="formError"><form:errors path="password" /></span><br/><br />
<form:label path="password"><fmt:message key="form.register.user.password" /></form:label> <form:password path="password"/> <span class="formError"><form:errors path="password" /></span><br/><br /> <form:label path="passwordConfirm"><fmt:message key="form.register.user.passwordConfirm" /></form:label> <form:password path="passwordConfirm" showPassword="true"/><br/><br />
<form:label path="passwordConfirm"><fmt:message key="form.register.user.passwordConfirm" /></form:label> <form:password path="passwordConfirm"/><br/><br />
<form:label path="firstName"><fmt:message key="form.register.user.firstName" /></form:label> <form:input path="firstName"/> <span class="formError"><form:errors path="firstName" /></span><br/><br /> <form:label path="firstName"><fmt:message key="form.register.user.firstName" /></form:label> <form:input path="firstName"/> <span class="formError"><form:errors path="firstName" /></span><br/><br />
<form:label path="lastName"><fmt:message key="form.register.user.lastName" /></form:label> <form:input path="lastName"/> <span class="formError"><form:errors path="lastName" /></span><br/><br /> <form:label path="lastName"><fmt:message key="form.register.user.lastName" /></form:label> <form:input path="lastName"/> <span class="formError"><form:errors path="lastName" /></span><br/><br />

4
YACOSWeb/WebContent/login.jsp
View File

@@ -3,9 +3,9 @@
<html> <html>
<head></head> <head></head>
<body> <body>
<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="mainformlogin"> <form action="<c:url value='j_acegi_security_check'/>" method="POST" id="mainformlogin">
<a href="login.htm" id="connexion"><fmt:message key="login.label.connexion"/> :</a> <a href="login.htm" id="connexion"><fmt:message key="login.label.inscription"/></a><br />
<fmt:message key="login.label.connexion"/> :
<input type='text' name='j_username' value="<fmt:message key='login.field.login' />" onfocus="if (this.value == '<fmt:message key='login.field.login' />') { this.value = ''; }" onblur="if (this.value == '') { this.value = '<fmt:message key='login.field.login' />'; }" /> <input type='text' name='j_username' value="<fmt:message key='login.field.login' />" onfocus="if (this.value == '<fmt:message key='login.field.login' />') { this.value = ''; }" onblur="if (this.value == '') { this.value = '<fmt:message key='login.field.login' />'; }" />
<input type='password' name='j_password' /> <input type='password' name='j_password' />
<a href="javascript:document.getElementById('mainformlogin').submit();" id="submit_btn"><fmt:message key="login.btn.submit" /></a> <a href="javascript:document.getElementById('mainformlogin').submit();" id="submit_btn"><fmt:message key="login.btn.submit" /></a>

16
YACOSWeb/src/org/yacos/web/system/controller/SUserRegistrationController.java
View File

@@ -6,6 +6,7 @@ package org.yacos.web.system.controller;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.acegisecurity.providers.dao.UserCache;
import org.springframework.validation.BindException; import org.springframework.validation.BindException;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController; import org.springframework.web.servlet.mvc.SimpleFormController;
@@ -59,13 +60,18 @@ public class SUserRegistrationController extends SimpleFormController {
user.setFirstName(userCommand.getFirstName()); user.setFirstName(userCommand.getFirstName());
user.setLastName(userCommand.getLastName()); user.setLastName(userCommand.getLastName());
user.setOrganization(userCommand.getOrganization()); user.setOrganization(userCommand.getOrganization());
if(userCommand.passwordWasModified()){
user.setPassword(User.hashPassword(userCommand.getPassword()));
}
userManager.UpdateUser(user);
// Empty cache
//UserCache.removeUserFromCache(user.getLogin());
} }
if(userCommand.passwordWasModified()){
user.setPassword(userCommand.getPassword());
}
return new ModelAndView(new RedirectView(getSuccessView())); return new ModelAndView(new RedirectView(getSuccessView()));
} }

2
YACOSWeb/src/org/yacos/web/system/form/FormUser.java
View File

@@ -121,7 +121,7 @@ public class FormUser {
this.organization = organization; this.organization = organization;
} }
public boolean passwordWasModified() { public boolean passwordWasModified() {
return this.passwordPlaceholderValue.equals(this.getPassword()); return ! this.passwordPlaceholderValue.equals(this.getPassword());
} }
public boolean passwordsMatches() { public boolean passwordsMatches() {
return this.password.equals(this.passwordConfirm); return this.password.equals(this.passwordConfirm);