Fix broken URL regex for resetting password

With complete webtest for password resetting story.

oscar/app.py

@@ -14,7 +14,7 @@ from oscar.apps.dashboard.app import application as dashboard_app
 
 class Shop(Application):
     name = None
-    
+
     catalogue_app = catalogue_app
     customer_app = customer_app
     basket_app = basket_app
@@ -23,7 +23,7 @@ class Shop(Application):
     search_app = search_app
     dashboard_app = dashboard_app
     offer_app = offer_app
-    
+
     def get_urls(self):
         urlpatterns = patterns('',
             (r'^products/', include(self.catalogue_app.urls)),
@@ -39,12 +39,14 @@ class Shop(Application):
             # from working.
             url(r'^password-reset/$', auth_views.password_reset, name='password-reset'),
             url(r'^password-reset/done/$', auth_views.password_reset_done, name='password-reset-done'),
-            url(r'^password-reset/confirm/$', auth_views.password_reset_confirm, name='password-reset-confirm'),
+            url(r'^password-reset/confirm/(?P<uidb36>[0-9A-Za-z]{1,13})-(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$',
+                auth_views.password_reset_confirm, name='password-reset-confirm'),
             url(r'^password-reset/complete/$', auth_views.password_reset_complete, name='password-reset-complete'),
 
             (r'', include(self.promotions_app.urls)),
         )
         return urlpatterns
-    
+
+
 # 'shop' kept for legacy projects - 'application' is a better name
 shop = application = Shop()

oscar/templates/oscar/customer/login_registration.html

@@ -24,6 +24,7 @@
             <h2>{% trans 'Log In' %}</h2>
             {% csrf_token %}
             {% include "partials/form_fields.html" with form=login_form %}
+			<p><a href="{% url password-reset %}">{% trans "I've forgotten my password" %}</a></p>
             <button name="login_submit" type="submit" value="Log In" class="btn btn-large btn-primary">{% trans 'Log In' %}</button>
         </form>
     </div>

oscar/templates/oscar/dashboard/layout.html

@@ -8,7 +8,7 @@
 	<link rel="stylesheet" href="{{ STATIC_URL }}oscar/css/dashboard.css" />
 {% endblock %}
 
-{% block extrahead %} {%endblock extrahead %}
+{% block extrahead %} {% endblock extrahead %}
 
 {% block title %}
 {% trans "Dashboard" %} | {{ block.super }}

oscar/templates/oscar/layout.html

@@ -18,7 +18,7 @@
             {% include "partials/nav_primary.html" %}
         {% endblock %}
     </header>
-    <div class="container-fluid page">
+	<div class="container-fluid page">
         {% block header %}{% endblock %}
         <div class="page_inner">
             {% block breadcrumbs %}{% endblock %}

oscar/templates/oscar/registration/password_reset_complete.html

@@ -3,8 +3,18 @@
 
 {% block title %}{% trans 'Password reset complete' %} | {{ block.super }}{% endblock %}
 
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+    <li>
+        <a href="{% url promotions:home %}">{% trans 'Home' %}</a>
+        <span class="divider">/</span>
+    </li>
+	<li class="active"><a href=".">{% trans 'Password reset complete' %}</a></li>
+</ul>
+{% endblock %}
+
 {% block content %}
 	<h1>{% trans 'Password reset complete' %}</h1>
 	<p>{% trans "Your password has been set.  You may go ahead and log in now." %}</p>
-	<p><a href="{{ login_url }}">{% trans 'Log in' %}</a></p>
+	<p><a href="{{ login_url }}" class="btn btn-large btn-primary">{% trans 'Log in' %}</a></p>
 {% endblock %}

oscar/templates/oscar/registration/password_reset_confirm.html

@@ -3,6 +3,16 @@
 
 {% block title %}{% trans 'Password reset confirm' %} | {{ block.super }}{% endblock %}
 
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+    <li>
+        <a href="{% url promotions:home %}">{% trans 'Home' %}</a>
+        <span class="divider">/</span>
+    </li>
+	<li class="active"><a href=".">{% trans 'Enter new password' %}</a></li>
+</ul>
+{% endblock %}
+
 {% block content %}
 
 {% if validlink %}
@@ -11,12 +21,12 @@
 
 <p>{% trans "Please enter your new password twice so we can verify you typed it in correctly." %}</p>
 
-<form action="" method="post">{% csrf_token %}
+<form id="password_reset_form" action="" method="post">{% csrf_token %}
 {{ form.new_password1.errors }}
 <p class="aligned wide"><label for="id_new_password1">{% trans 'New password:' %}</label>{{ form.new_password1 }}</p>
 {{ form.new_password2.errors }}
 <p class="aligned wide"><label for="id_new_password2">{% trans 'Confirm password:' %}</label>{{ form.new_password2 }}</p>
-<p><input type="submit" value="{% trans 'Change my password' %}" /></p>
+<p><button class="btn btn-primary btn-large" type="submit">{% trans 'Change my password' %}</button></p>
 </form>
 
 {% else %}

oscar/templates/oscar/registration/password_reset_done.html

@@ -3,6 +3,16 @@
 
 {% block title %}{% trans 'Password reset successful' %} | {{ block.super }}{% endblock %}
 
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+    <li>
+        <a href="{% url promotions:home %}">{% trans 'Home' %}</a>
+        <span class="divider">/</span>
+    </li>
+	<li class="active"><a href=".">{% trans 'Password reset sent' %}</a></li>
+</ul>
+{% endblock %}
+
 {% block content %}
 
     <h1>{% trans 'Password reset successful' %}</h1>

oscar/templates/oscar/registration/password_reset_form.html

@@ -3,13 +3,23 @@
 
 {% block title %}{% trans 'Password reset' %} | {{ block.super }}{% endblock %}
 
+{% block breadcrumbs %}
+<ul class="breadcrumb">
+    <li>
+        <a href="{% url promotions:home %}">{% trans 'Home' %}</a>
+        <span class="divider">/</span>
+    </li>
+	<li class="active"><a href=".">{% trans 'Password reset' %}</a></li>
+</ul>
+{% endblock %}
+
 {% block content %}
 
     <div class="sub-header">
         <h2>{% trans "Password reset" %}</h2>
     </div>
 
-    <form action="" method="post" class="form-stacked well">
+    <form id="password_reset_form" action="" method="post" class="form-stacked well">
     {% csrf_token %}
 
         <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll e-mail instructions for setting a new one." %}</p>

tests/functional/customer/auth_tests.py

@@ -0,0 +1,49 @@
+import re
+
+from django.contrib.auth import models
+from django.core.urlresolvers import reverse
+from django.core import mail
+
+from django_webtest import WebTest
+
+
+class TestAUserWhoseForgottenHerPassword(WebTest):
+
+    def test_can_reset_her_password(self):
+        username, email, password = 'lucy', 'lucy@example.com', 'password'
+        models.User.objects.create_user(
+            username, email, password
+        )
+
+        # Fill in password reset form
+        page = self.app.get(reverse('password-reset'))
+        form = page.forms['password_reset_form']
+        form['email'] = email
+        response = form.submit()
+
+        # Response should be a redirect and an email should have been sent
+        self.assertEqual(302, response.status_code)
+        self.assertEqual(1, len(mail.outbox))
+
+        # Extract URL from email
+        email_body = mail.outbox[0].body
+        urlfinder = re.compile(r"http://example.com(?P<path>[-A-Za-z0-9\/\._]+)")
+        matches = urlfinder.search(email_body, re.MULTILINE)
+        self.assertTrue('path' in matches.groupdict())
+        path = matches.groupdict()['path']
+
+        # Reset password and check we get redirect
+        reset_page = self.app.get(path)
+        form = reset_page.forms['password_reset_form']
+        form['new_password1'] = 'monkey'
+        form['new_password2'] = 'monkey'
+        response = form.submit()
+        self.assertEqual(302, response.status_code)
+
+        # Now attempt to login with new password
+        url = reverse('customer:login')
+        form = self.app.get(url).forms['login_form']
+        form['login-username'] = email
+        form['login-password'] = 'monkey'
+        response = form.submit('login_submit')
+        self.assertEqual(302, response.status_code)