You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/08/10 18:15:03 UTC
svn commit: r984105 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main:
java/org/apache/clerezza/platform/usermanager/webinterface/
resources/org/apache/clerezza/platform/usermanager...
Author: ito
Date: Tue Aug 10 16:15:02 2010
New Revision: 984105
URL: http://svn.apache.org/viewvc?rev=984105&view=rev
Log:
using ajax request to send new password and check if user exists
Removed:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset_success.xhtml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/PasswordReset.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/PasswordReset.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/PasswordReset.java?rev=984105&r1=984104&r2=984105&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/PasswordReset.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/java/org/apache/clerezza/platform/usermanager/webinterface/PasswordReset.java Tue Aug 10 16:15:02 2010
@@ -43,7 +43,6 @@ import org.osgi.service.component.Compon
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.clerezza.jaxrs.utils.RedirectUtil;
import org.apache.clerezza.jaxrs.utils.TrailingSlash;
import org.apache.clerezza.platform.config.SystemConfig;
import org.apache.clerezza.platform.mail.MailMan;
@@ -110,10 +109,6 @@ public class PasswordReset {
new UriRef(templateURL.toString()), USERMANAGER.PasswordResetPage,
null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
- templateURL = getClass().getResource("reset_success.xhtml");
- renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
- new UriRef(templateURL.toString()), USERMANAGER.PasswordResetSuccessPage,
- null, MediaType.APPLICATION_XHTML_XML_TYPE, true);
templateURL = getClass().getResource("reset_mail.txt");
renderletManager.registerRenderlet(SeedsnipeRenderlet.class.getName(),
new UriRef(templateURL.toString()), USERMANAGER.PasswordResetMail,
@@ -145,8 +140,7 @@ public class PasswordReset {
userManager.updateUser(userName, null, newPassword,
Collections.EMPTY_LIST, null);
} else {
- return createInputErrorMessageResponse(
- "User name and email address don't match");
+ return createResponse("Username and e-mail address don't match.");
}
try {
NonLiteral agent;
@@ -173,25 +167,14 @@ public class PasswordReset {
} catch (MessagingException ex) {
throw new RuntimeException(ex);
}
- return RedirectUtil.createSeeOtherResponse("/reset/success/", uriInfo);
+ return createResponse("Successfully password reseted. Check your e-mail box. " +
+ "An automatically generated password was sent to your e-mail address.");
}
});
}
- @GET
- @Path("success")
- public GraphNode successPage(@Context UriInfo uriInfo) {
- TrailingSlash.enforcePresent(uriInfo);
- GraphNode result = new GraphNode(new BNode(), new SimpleMGraph());
- result.addProperty(RDF.type, USERMANAGER.PasswordResetSuccessPage);
- return result;
- }
-
- private Response createInputErrorMessageResponse(String message) {
- Response.ResponseBuilder responseBuilder =
- Response.ok("<html><body><p>Input Error(s):</p>" + message +
- "</body></html>");
- responseBuilder.type(MediaType.TEXT_XML_TYPE);
+ private Response createResponse(String message) {
+ Response.ResponseBuilder responseBuilder = Response.ok(message);
return responseBuilder.build();
}
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml?rev=984105&r1=984104&r2=984105&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/reset.xhtml Tue Aug 10 16:15:02 2010
@@ -5,6 +5,8 @@
<link href="/style/style.css" media="screen" rel="stylesheet" type="text/css" />
<link href="/style/login.css" media="screen" rel="stylesheet" type="text/css" />
<script src="/jquery/jquery-1.3.2.min.js" type="text/javascript"></script>
+ <script src="/scripts/status-message.js" type="text/javascript"></script>
+ <script src="/scripts/ajax-options.js" type="text/javascript"></script>
<script type="text/javascript" src="/admin/users/js/reset.js"></script>
</head>
@@ -24,14 +26,14 @@
<div>
<div>
<div id="tx-logo"></div>
- <div class="tx-info"></div>
+ <div class="tx-info">Please enter your username and e-mail address. You will reveice a new password via e-mail.</div>
</div>
<form action="/reset/" method="post" id="reset-form">
<fieldset class="tx-line">
<ol>
<li><label>Username</label>
<input size="50" type="text" name="user" value="" /></li>
- <li><label>Email</label>
+ <li><label>Email address</label>
<input size="50" type="text" name="email" value="" /></li>
<li>
<input value="Reset" type="submit" id="resetButton"/>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js?rev=984105&r1=984104&r2=984105&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.usermanager.webinterface/src/main/resources/org/apache/clerezza/platform/usermanager/webinterface/staticweb/js/reset.js Tue Aug 10 16:15:02 2010
@@ -20,11 +20,17 @@
$(document).ready(function() {
$("#resetButton").hide();
- $("<a/>").addClass("tx-button tx-button-generic").attr("href", "#")
- .text("Reset").insertBefore("#resetButton");
+ $("<a/>").addClass("tx-button tx-button-generic").attr({"href": "#", "style": "width: 9em;" })
+ .text("Get New Password").insertBefore("#resetButton");
$(".tx-button-generic").click(function(){
- $("#reset-form").submit();
+ var options = new AjaxOptions("send-data", "sending data", function(obj) {
+ $(".tx-info").text(obj);
+ });
+ options.type = "POST";
+ options.url = "/reset/";
+ options.data = $("#reset-form").serialize();
+ $.ajax(options);
});
$("input[name*='user']").focus();
@@ -35,5 +41,5 @@ $(document).ready(function() {
document.location.href.indexOf(document.location.pathname)) +
"/dashboard/overview",
"style" : "padding-left: 1em; background-position: left center;"})
- .text("Login Page").insertAfter("#reset-form");
+ .text("Log in").insertAfter("#reset-form");
});
\ No newline at end of file