zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Fix forgot password email

Browse Source 
- Rewrite forgot password to use the new MVC model.
- Show a dialog when the password has been sent.
This commit is contained in:
Paulo Gustavo Veiga
2012-06-16 15:59:59 -03:00
parent 8a638e8de6
commit 7d6b82c626
25 changed files with 532 additions and 569 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@@ -34,17 +34,21 @@ database.password=
#------------------------
mail.smtp.port=587
mail.smtp.host=smtp.gmail.com
mail.username=pveiga@gmail.com
mail.password=
mail.username=<gmail-user-account>
mail.password=<gmail-password>
mail.smtp.auth=true
mail.smtp.starttls.enable=true
mail.smtp.quitwait=false
#------------------------
# Domain address
# Emails configuration
#------------------------
mail.registrationEmail=root@localhost
mail.siteEmail=root@localhost
# "from" email account that will appear in the emails sent from the sender.
mail.serverSendEmail=root@localhost
# Support account that the users could use to contact you. This address will appear in emails and in some places in the site.
mail.supportEmail=root@localhost
##################################################################################
# Users Registration Configuration

46
wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
View File

@@ -1,23 +1,23 @@
log4j.rootLogger=WARN, stdout, R
log4j.logger.com.wisemapping=WARN,stdout,R
log4j.logger.org.springframework=WARN,stdout,R
log4j.logger.org.codehaus.jackson=WARN,stdout,R
log4j.additivity.org.hibernate.SQL=false
# Stdout logger <20>
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
# File Writter Logger <20>
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=wisemapping.log
log4j.appender.R.MaxFileSize=100KB
# Keep one backup file
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d %p %c - %m%n
log4j.rootLogger=WARN, stdout, R
log4j.logger.com.wisemapping=WARN,stdout,R
log4j.logger.org.springframework=DEBUG,stdout,R
log4j.logger.org.codehaus.jackson=WARN,stdout,R
log4j.additivity.org.hibernate.SQL=false
# Stdout logger <20>
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d %p %c - %m%n
# File Writter Logger <20>
log4j.appender.R=org.apache.log4j.RollingFileAppender
log4j.appender.R.File=wisemapping.log
log4j.appender.R.MaxFileSize=100KB
# Keep one backup file
log4j.appender.R.MaxBackupIndex=1
log4j.appender.R.layout=org.apache.log4j.PatternLayout
log4j.appender.R.layout.ConversionPattern=%d %p %c - %m%n

51
wise-webapp/src/main/webapp/WEB-INF/classes/mail/passwordRecovery.vm
View File

@@ -1,24 +1,37 @@
<html>
<body>
<h3>Your password was regenerated from WiseMapping!</h3>
<p>
Your account information is:
</p>
User Login: ${user.email}
</p>
<p>
New Password: ${password}
</p>
<p>
Thank you for using WiseMapping.
</p>
<p>
For questions or concerns regarding your account, send us an email to support@wisemapping.com.
</p>
<p>
Best Regards, <br/>
The WiseMapping Team.
<a href="http://www.wisemapping.com">WiseMapping Site</a>
<div style="background-color: #fbeed5; max-width: 650px; font-family: Arial, sans-serif; color: #000; padding: 5px;">
<div style="height: 60px; font-size: 14px; font-weight: bold; padding-bottom: 4px;">
<table style="display: inline;width: 100%;">
<tbody>
<tr>
<td height="50px" width="2px"
style="padding: 0; padding-right: 5px; text-align:center;font-weight: normal;font-family: Arial, sans-serif">
<a href="${baseUrl}">
<img style="border: 0;margin-top: 10px;"
src="${baseUrl}/images/logo-small.png"
alt="WiseMapping Log"/>
</a>
</td>
<td valign="bottom" height="32px" style="padding: 0;font-size: 16px;">
Your password has been reset
</td>
</tr>
</tbody>
</table>
</div>
<div style="font-size: 13px; background-color: #FFF; padding: 10px 7px 7px 7px; min-height: 100px">
<p>A temporal password has been generated for you account. </p>
<p><strong>New Password: ${password}</strong></p>
<p>You can login clicking <a href="${baseUrl}/c/login">here</a>.We strongly encourage you to change the password as soon as possible.</p>
</div>
</div>
<p style="font-size: 13px;font-family: Arial, sans-serif">Important: Do not reply this email. If
you need further help or have any concerns regarding your account, contact us to <a href="mailto:${supportEmail}">here</a>.
</p>
</body>
</html>

2
wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties
View File

@@ -90,7 +90,7 @@ CREW=The Crew
ALREADY_A_MEMBER=Already a member?
WORD_VERIFICATION=Word Verification
TERM_OF_THE_SERVICE=Terms of Service:
FORGOT_PASSWORD_MESSAGE=Please enter your email to start the password recovery process.
FORGOT_PASSWORD_MESSAGE=Please enter an email address to help us locate your WiseMapping account.
SEARCH_FIELD=Map Title or Tag
FIELD_REQUIRED=Required field cannot be left blank

25
wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml
View File

@@ -1,6 +1,6 @@
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
"http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
<!DOCTYPE tiles-definitions PUBLIC
"-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN"
"http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
<tiles-definitions>
@@ -30,19 +30,19 @@
</definition>
<definition name="errorTemplate" extends="pageTemplate">
<put-attribute name="body" value="/jsp/errorTemplate.jsp" type="page"/>
<put-attribute name="body" value="/jsp/errorTemplate.jsp"/>
</definition>
<definition name="iframeWrapper" template="/jsp/iframeWrapper.jsp"/>
<!-- Error Pages -->
<definition name="gcfPluginNeeded" extends="pageTemplate">
<put-attribute name="body" value="/jsp/gcfPluginNeeded.jsp" type="page"/>
<put-attribute name="body" value="/jsp/gcfPluginNeeded.jsp"/>
<put-attribute name="title" value="INSTALL_CFG"/>
</definition>
<definition name="installCFG" extends="pageTemplate">
<put-attribute name="body" value="/jsp/installCFG.jsp" type="page"/>
<put-attribute name="body" value="/jsp/installCFG.jsp"/>
<put-attribute name="title" value="INSTALL_CFG"/>
</definition>
@@ -56,15 +56,20 @@
<put-attribute name="details" value="NO_ENOUGH_PERMISSIONS_DETAILS"/>
</definition>
<definition name="emailNotExistsError" extends="errorTemplate">
<!-- Main Pages -->
<definition name="forgotPasswordError" extends="errorTemplate">
<put-attribute name="title" value="INVALID_EMAIL_ERROR"/>
<put-attribute name="body" value="/jsp/emailNotExistsError.jsp"/>
<put-attribute name="body" value="/jsp/userForgotPasswordError.jsp"/>
</definition>
<definition name="forgotPasswordSuccess" extends="errorTemplate">
<put-attribute name="title" value="FORGOT_PASSWORD"/>
<put-attribute name="body" value="/jsp/userForgotPasswordSuccess.jsp"/>
</definition>
<!-- Main Pages -->
<definition name="forgotPassword" extends="pageTemplate">
<put-attribute name="title" value="FORGOT_PASSWORD"/>
<put-attribute name="body" value="/jsp/forgotPassword.jsp"/>
<put-attribute name="body" value="/jsp/userForgotPassword.jsp"/>
</definition>
<definition name="userRegistration" extends="pageTemplate">

1
wise-webapp/src/main/webapp/WEB-INF/wisemapping-nservlet.xml
View File

@@ -28,7 +28,6 @@
<prop key="com.wisemapping.exceptions.UnsupportedBrowserException">browserNotSupported</prop>
<!-- Security exceptions are wrapped in this exceptions -->
<prop key="java.lang.reflect.UndeclaredThrowableException">securityError</prop>
<prop key="com.wisemapping.exceptions.EmailNotExistsException">emailNotExistsError</prop>
</props>
</property>
</bean>

2
wise-webapp/src/main/webapp/WEB-INF/wisemapping-security.xml
View File

@@ -24,7 +24,7 @@
<sec:http pattern="/c/login" security="none"/>
<sec:http pattern="/c/userregistration" security="none"/>
<sec:http pattern="/c/forgotpassword" security="none"/>
<sec:http pattern="/c/user/resetpassword" security="none"/>
<sec:http pattern="/c/home" security="none"/>
<sec:http pattern="/c/maps/*/embed" security="none"/>

156
wise-webapp/src/main/webapp/WEB-INF/wisemapping-service.xml
View File

@@ -1,78 +1,78 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
<bean id="mailer" class="com.wisemapping.mail.Mailer" singleton="true">
<constructor-arg index="0" value="${mail.registrationEmail}"/>
<constructor-arg index="1" value="${mail.siteEmail}"/>
<property name="mailSender" ref="mailSender"/>
<property name="velocityEngine" ref="velocityEngine"/>
</bean>
<bean id="userServiceTarget" class="com.wisemapping.service.UserServiceImpl">
<property name="userManager" ref="userManager"/>
<property name="mindmapService" ref="mindMapServiceTarget"/>
<property name="mailer" ref="mailer"/>
</bean>
<bean id="userService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
<property name="transactionManager" ref="transactionManager"/>
<property name="target">
<ref local="userServiceTarget"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="*">PROPAGATION_REQUIRED</prop>
</props>
</property>
</bean>
<bean id="mindMapServiceTarget" class="com.wisemapping.service.MindmapServiceImpl">
<property name="mindmapManager" ref="mindmapManager"/>
<property name="userService" ref="userService"/>
<property name="notificationService" ref="notificationService"/>
</bean>
<bean id="mindmapService"
class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces" value="com.wisemapping.service.MindmapService"/>
<property name="interceptorNames">
<list>
<value>txInterceptor</value>
<value>viewSecurityAdvisor</value>
<value>updateSecurityAdvisor</value>
</list>
</property>
<property name="target" ref="mindMapServiceTarget"/>
</bean>
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.smtp.host}"/>
<property name="port" value="${mail.smtp.port}"/>
<property name="protocol" value="smtp"/>
<property name="username" value="${mail.username}"/>
<property name="password" value="${mail.password}"/>
<property name="javaMailProperties">
<props>
<prop key="mail.smtp.auth">${mail.smtp.auth}</prop>
<prop key="mail.smtp.starttls.enable">${mail.smtp.starttls.enable}</prop>
<prop key="mail.smtp.quitwait">${mail.smtp.quitwait}</prop>
</props>
</property>
</bean>
<bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties">
<value>
resource.loader=class
class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
</value>
</property>
</bean>
<bean id="notificationService" class="com.wisemapping.mail.NotificationService" singleton="true">
<property name="baseUrl" value="${site.baseurl}"/>
<property name="mailer" ref="mailer"/>
</bean>
</beans>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
<bean id="mailer" class="com.wisemapping.mail.Mailer" singleton="true">
<constructor-arg index="0" value="${mail.serverSendEmail}"/>
<constructor-arg index="1" value="${mail.supportEmail}"/>
<property name="mailSender" ref="mailSender"/>
<property name="velocityEngine" ref="velocityEngine"/>
</bean>
<bean id="userServiceTarget" class="com.wisemapping.service.UserServiceImpl">
<property name="userManager" ref="userManager"/>
<property name="mindmapService" ref="mindMapServiceTarget"/>
<property name="notificationService" ref="notificationService"/>
</bean>
<bean id="userService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
<property name="transactionManager" ref="transactionManager"/>
<property name="target">
<ref local="userServiceTarget"/>
</property>
<property name="transactionAttributes">
<props>
<prop key="*">PROPAGATION_REQUIRED</prop>
</props>
</property>
</bean>
<bean id="mindMapServiceTarget" class="com.wisemapping.service.MindmapServiceImpl">
<property name="mindmapManager" ref="mindmapManager"/>
<property name="userService" ref="userService"/>
<property name="notificationService" ref="notificationService"/>
</bean>
<bean id="mindmapService"
class="org.springframework.aop.framework.ProxyFactoryBean">
<property name="proxyInterfaces" value="com.wisemapping.service.MindmapService"/>
<property name="interceptorNames">
<list>
<value>txInterceptor</value>
<value>viewSecurityAdvisor</value>
<value>updateSecurityAdvisor</value>
</list>
</property>
<property name="target" ref="mindMapServiceTarget"/>
</bean>
<bean id="mailSender" class="org.springframework.mail.javamail.JavaMailSenderImpl">
<property name="host" value="${mail.smtp.host}"/>
<property name="port" value="${mail.smtp.port}"/>
<property name="protocol" value="smtp"/>
<property name="username" value="${mail.username}"/>
<property name="password" value="${mail.password}"/>
<property name="javaMailProperties">
<props>
<prop key="mail.smtp.auth">${mail.smtp.auth}</prop>
<prop key="mail.smtp.starttls.enable">${mail.smtp.starttls.enable}</prop>
<prop key="mail.smtp.quitwait">${mail.smtp.quitwait}</prop>
</props>
</property>
</bean>
<bean id="velocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean">
<property name="velocityProperties">
<value>
resource.loader=class
class.resource.loader.class=org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader
</value>
</property>
</bean>
<bean id="notificationService" class="com.wisemapping.mail.NotificationService" singleton="true">
<property name="baseUrl" value="${site.baseurl}"/>
<property name="mailer" ref="mailer"/>
</bean>
</beans>

15
wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml
View File

@@ -51,18 +51,6 @@
<property name="captchaService" ref="reCaptcha"/>
</bean>
<bean id="forgotPasswordValidator" class="com.wisemapping.validator.ForgotPasswordValidator"/>
<bean id="forgotPasswordController" class="com.wisemapping.controller.ForgotPasswordController">
<property name="sessionForm" value="false"/>
<property name="commandName" value="forgotPassword"/>
<property name="commandClass" value="com.wisemapping.view.ForgotPasswordBean"/>
<property name="validator" ref="forgotPasswordValidator"/>
<property name="formView" value="forgotPassword"/>
<property name="successView" value="mindmap"/>
<property name="userService" ref="userService"/>
</bean>
<bean id="settingResolver" class="org.springframework.web.servlet.mvc.multiaction.PropertiesMethodNameResolver">
<property name="mappings">
<props>
@@ -127,9 +115,8 @@
<property name="mappings">
<props>
<!-- Forms based -->
<prop key="userRegistration">userController</prop>
<prop key="userRegistration">usersController</prop>
<prop key="login">loginController</prop>
<prop key="forgotPassword">forgotPasswordController</prop>
<prop key="activation">activationController</prop>
<prop key="changePassword">changePasswordController</prop>
<prop key="settings">settingsController</prop>

13
wise-webapp/src/main/webapp/jsp/emailNotExistsError.jsp
View File

@@ -1,13 +0,0 @@
<%@ include file="/jsp/init.jsp" %>
<h1>
<spring:message code="INVALID_EMAIL_ERROR"/>
</h1>
<h2>The email is not register or you account is not active yet.</h2>
<p>If the problem persist please send us an email to <a href="mailto:support@wisemapping.com">support@wisemapping.com </a></p>
</br>
<p>We are working to add more features in the future. Stay tuned !</p>
</br>
<p>Best Regards,</p>
<p>WiseMapping Team.</p>

4
wise-webapp/src/main/webapp/jsp/installCFG.jsp
View File

@@ -1,10 +1,6 @@
<%@ page import="org.apache.log4j.Logger" %>
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
<%!
final Logger logger = Logger.getLogger("com.wisemapping");
%>
<div style="position:relative;">
<div id="prompt">
<!-- if IE without GCF, prompt goes here -->

2
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@@ -15,7 +15,7 @@
<div class="loginNews">
<h1>What is New: </h1>
<ul>
<li>Links Between Nodes</li>
<li>Complerly new UI</li>
<li>FreeMind 0.9 Update</li>
<li>Improved HTML 5.0 Support</li>
<li>Firefox 12 officially supported</li>

70
wise-webapp/src/main/webapp/jsp/forgotPassword.jsp → wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
View File

@@ -1,33 +1,39 @@
<%@ include file="/jsp/init.jsp" %>
<div>
<div class="fform">
<h1>
<spring:message code="FORGOT_PASSWORD"/>
</h1>
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
<form:form method="post" commandName="forgotPassword">
<fieldset>
<label for="email"><spring:message code="EMAIL"/></label>
<form:input path="email" id="email" tabindex="1" type="email" required="required"/>
<form:errors path="email" cssClass="errorMsg"/>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset>
</form:form>
</div>
</div>
<div id="register">
<b>
<spring:message code="NOT_READY_A_USER"/>
</b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="userRegistration">
<spring:message code="JOIN_NOW"/>
</a>
<%@ include file="/jsp/init.jsp" %>
<script type="text/javascript" language="javascript">
$(function() {
$('.btn-primary').click(function() {
$(this).button("loading");
});
});
</script>
<div>
<div class="fform">
<h1>
<spring:message code="FORGOT_PASSWORD"/>
</h1>
<p><spring:message code="FORGOT_PASSWORD_MESSAGE"/></p>
<form:form method="post" commandName="resetPassword">
<fieldset>
<label for="email"><spring:message code="EMAIL"/></label>
<input id="email" type="email" required="required" name="email"/>
<input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary" data-loading-text="Saving ..."/>
<input type="button" value="<spring:message code="CANCEL"/>" class="btn"
onclick="window.location='<c:url value="c/maps/"/>'"/>
</fieldset>
</form:form>
</div>
</div>
<div id="register">
<b>
<spring:message code="NOT_READY_A_USER"/>
</b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="c/userRegistration">
<spring:message code="JOIN_NOW"/>
</a>
</div>

6
wise-webapp/src/main/webapp/jsp/userForgotPasswordError.jsp Executable file
View File

@@ -0,0 +1,6 @@
<%@ include file="/jsp/init.jsp" %>
<h2>The email is not register or you account is not active yet.</h2>
<p>If the problem persist please send us an email to <a
href="mailto:support@wisemapping.com">support@wisemapping.com </a></p>

12
wise-webapp/src/main/webapp/jsp/userForgotPasswordSuccess.jsp Normal file
View File

@@ -0,0 +1,12 @@
<%@ include file="/jsp/init.jsp" %>
<h2>
Your temporal password has been sent
</h2>
<p>
We've sent you an email that will allow you to reset your password quickly and easily. Please check your email now.
</p>
<p>If you have any problem receiving the email, contact us to <a
href="mailto:support@wisemapping.com">support@wisemapping.com </a></p>

0
wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp → wise-webapp/src/main/webapp/jsp/userRegistrationSuccess.jsp
View File