Merge pull request #584 from memeLab/refactor-reset-password

Refactor reset password to use default django auth process

.envs/.example

@@ -37,6 +37,8 @@ POSTGRES_PASSWORD=secret
 # Email server variables
 SMTP_SERVER=mailpit
 SMTP_PORT=1025
+SMTP_USE_TLS=False
+SMTP_USE_SSL=False
 SMTP_USER=
 SMTP_PASSWORD=
 SMTP_SENDER_MAIL="[email protected]"

etc/scripts/compilemessages.py

@@ -15,7 +15,7 @@ def main():
     """
     # Walk entire tree, looking for locale directories
     basedirs = ["locale"]
-    for dirpath, dirnames, filenames in os.walk(".", topdown=True):
+    for dirpath, dirnames, filenames in os.walk("/jandig/locale", topdown=True):
         for dirname in dirnames:
             if dirname == "locale":
                 basedirs.append(os.path.join(dirpath, dirname))

src/config/settings.py

@@ -9,7 +9,7 @@
 from django.utils.translation import gettext_lazy as _
 from sentry_sdk.integrations.django import DjangoIntegration
 
-from .storage_settings import * # noqa F403 F401
+from .storage_settings import *  # noqa F403 F401
 
 ROOT_DIR = environ.Path("/jandig/")
 BASE_DIR = "/jandig/src"
@@ -194,11 +194,15 @@ def debug(request):
 # Sphinx docs
 DOCS_ROOT = "/jandig/build/"
 
-SMTP_SERVER = env("SMTP_SERVER", default="mailpit")
-SMTP_PORT = env("SMTP_PORT", default=1025)
-SMTP_USER = env("SMTP_USER", default="[email protected]")
-SMTP_PASSWORD = env("SMTP_PASSWORD", default="password")
-SMTP_SENDER_MAIL = env("SMTP_SENDER_MAIL", default="[email protected]")
+
+DEFAULT_FROM_EMAIL = env("SMTP_SENDER_MAIL", default="[email protected]")
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+EMAIL_HOST = env("SMTP_SERVER", default="mailpit")
+EMAIL_USE_TLS = env("SMTP_USE_TLS", default=False)
+EMAIL_PORT = env("SMTP_PORT", default=1025)
+EMAIL_HOST_USER = env("SMTP_USER", default="[email protected]")
+EMAIL_HOST_PASSWORD = env("SMTP_PASSWORD", default="password")
+EMAIL_USE_SSL = False
 
 # Recaptcha
 RECAPTCHA_ENABLED = env("RECAPTCHA_ENABLED", default=False)

src/core/urls.py

@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.urls import include, path
+from django.urls import include, path, re_path
 from rest_framework_nested.routers import DefaultRouter
 
 from core.views.artworks import ArtworkViewset
@@ -47,7 +47,11 @@
     path("manifest.json", manifest, name="manifest"),
     path("upload", upload_image, name="upload-image"),
     path("i18n/", include("django.conf.urls.i18n")),
-    path("see_all/", see_all, name="see_all"),
+    re_path(
+        r"^see_all(?:/(?P<which>[a-zA-Z]+))?(?:/(?P<page>\d+))?/$",
+        see_all,
+        name="see_all",
+    ),
     path("robots.txt", robots_txt),
     path("favicon.ico", favicon),
     path(settings.HEALTH_CHECK_URL, health_check),

src/core/views/views.py

@@ -51,12 +51,21 @@ def collection(request):
 
 @cache_page(60 * 2)
 @require_http_methods(["GET"])
-def see_all(request):
-    request_type = request.GET.get("which")
+def see_all(request, which="", page=1):
+    request_type = request.GET.get("which", which)
+    if request_type not in ["objects", "markers", "artworks", "exhibits"]:
+        # Invalid request type, return to collection
+        return redirect("collection")
     ctx = {}
-    per_page = 20
+    per_page = 3
     page = request.GET.get("page", 1)
 
+    try:
+        # Bots insert random strings in the page parameter
+        page = int(page)
+    except ValueError:
+        page = 1
+
     data_types = {
         "objects": Object.objects.all().order_by("uploaded_at"),
         "markers": Marker.objects.all().order_by("uploaded_at"),
@@ -67,10 +76,12 @@ def see_all(request):
     data = data_types.get(request_type)
     if data:
         paginator = Paginator(data, per_page)
-        data = paginator.get_page(page)
-        data.adjusted_elided_pages = paginator.get_elided_page_range(page)
+        if page > paginator.num_pages:
+            return redirect("see_all", request_type, paginator.num_pages)
+        paginated_data = paginator.get_page(page)
+        paginated_data.adjusted_elided_pages = paginator.get_elided_page_range(page)
         ctx = {
-            request_type: data,
+            request_type: paginated_data,
             "seeall": True,
         }
 

src/users/forms.py

@@ -171,14 +171,6 @@ def clean(self):
         return cleaned_data
 
 
-class RecoverPasswordForm(forms.Form):
-    username_or_email = forms.CharField(label="username / email", max_length="50")
-
-
-class RecoverPasswordCodeForm(forms.Form):
-    verification_code = forms.CharField(label="Verification code", max_length="200")
-
-
 class UploadMarkerForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super(UploadMarkerForm, self).__init__(*args, **kwargs)

src/users/jinja2/users/login.jinja2

@@ -46,7 +46,7 @@
                     <input class="submit-btn" type="submit" value="{{ _('Submit') }}"/>
                 </form>
                 <div class="modalMenu recover-password">
-                    <a  href="{{url('recover')}}">{{ _('Recover password') }}</a>
+                    <a  href="{{url('reset-password')}}">{{ _('Recover password') }}</a>
                 </div>
             </div>
         </div>

src/users/jinja2/users/reset-password/password_reset.jinja2

@@ -0,0 +1,59 @@
+{% extends '/core/arviewer.jinja2' %}
+{% block content %}
+    <div class="form-content my-3 p-3">
+        <div class="container">
+            <div class="row justify-content-center">
+                <div class="col-lg-5">
+                    <div class="card shadow-lg border-0 rounded-lg mt-0 mb-3">
+                        <div class="card-header justify-content-center">
+                            <div id="error_div"></div>
+                          <h3 class="font-weight-light my-4 text-center">Forgot Password?</h3>
+                        </div>
+                        {% if form.errors %}
+                            <div class="alert alert-danger alert-dismissible" role="alert">
+                                <div id="form_errors">
+                                    {% for key, value in form.errors.items %}
+                                        <strong>{{ value }}</strong>
+                                    {% endfor %}
+                                </div>
+                                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                    <span aria-hidden="true">&times;</span>
+                                </button>
+                            </div>
+                        {% endif %}
+                        <div class="card-body">
+                            <form method="POST">
+                                {{ csrf_input }}
+                                <div class="form-row">
+                                    <div class="col-md-10 offset-md-1">
+                                    <div class="form-group">
+                                      <label class="small mb-1" for="id_email">Email</label>
+                                        <input type="email" name="email"  class="form-control"
+                                               autocomplete="email" maxlength="254" required id="id_email"
+                                               placeholder="Enter email">
+                                    </div>
+                                </div>
+                            </div>
+                                <div class="form-row">
+                                  <div class="col-md-10 offset-md-1">
+                                    <div class="form-group mt-0 mb-1">
+                                        <button type="submit" class="col-md-12 btn btn-dark">Submit
+                                        </button>
+                                    </div>
+                                 </div>
+                               </div>
+                            </form>
+                        </div>
+                        <div class="card-footer text-center">
+                            <div class="small">
+                                <a href="{{ url('signup') }}">Create A New Account</a><br><br>
+                                <a href="{{ url('login') }}">Back To Login</a><br>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+  </div>
+{% endblock content %}

src/users/jinja2/users/reset-password/password_reset_complete.jinja2

@@ -0,0 +1,15 @@
+{% extends '/core/arviewer.jinja2' %}
+{% block title %} Password Reset {% endblock title%}
+{% block content %}
+    <div class="container my-3 p-3">
+        <div class="row justify-content-center">
+            <div class="col-lg-5">
+                <div class="card shadow-lg border-0 rounded-lg mt-0 mb-3">
+                    <div class="alert alert-info">
+                        Your password has been set. You may go ahead and <a href="{{ url('login') }}">Login Here</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+{% endblock content %}