From b85e246aeda1a89e8d731e622c276c8f9731b511 Mon Sep 17 00:00:00 2001
From: Real-Gecko <alexandrbezenkov@gmail.com>
Date: Tue, 16 Jun 2020 14:36:53 +0600
Subject: [PATCH] Moved password changing to a separate view

---
 .../accounts/change_password_form.html        | 29 +++++++++++++++++
 accounts/templates/profile.html               | 32 +++----------------
 accounts/urls.py                              |  4 ++-
 accounts/views.py                             | 22 ++++++++++++-
 computes/templates/computes/form.html         |  1 -
 templates/base.html                           |  3 +-
 templates/navbar.html                         |  2 +-
 7 files changed, 60 insertions(+), 33 deletions(-)
 create mode 100644 accounts/templates/accounts/change_password_form.html

diff --git a/accounts/templates/accounts/change_password_form.html b/accounts/templates/accounts/change_password_form.html
new file mode 100644
index 0000000..9dfb6a3
--- /dev/null
+++ b/accounts/templates/accounts/change_password_form.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% load bootstrap4 %}
+{% load i18n %}
+{% load icons %}
+
+{% block title %}{%trans "Change Password" %}{% endblock title %}
+
+{% block content %}
+<div class="card">
+    <div class="card-header">
+        <h4 class="card-title">{%trans "Change Password" %}: {{ user }}</h4>
+    </div>
+    <div class="card-body">
+        <form method="post" id="password-change">
+            {% csrf_token %}
+            {% bootstrap_form form layout='horizontal' %}
+        </form>
+    </div>
+    <div class="card-footer">
+        <div class="float-right">
+            <a class="btn btn-primary" href="javascript:history.back()">{% icon 'times' %} {% trans "Cancel" %}</a>
+            <button type="submit" form="password-change" class="btn btn-success">
+                {% icon 'check' %} {% trans "Change" %}
+            </button>
+        </div>
+    </div>
+</div>
+{% endblock content %}
diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html
index 92b0ef6..54a8bd0 100644
--- a/accounts/templates/profile.html
+++ b/accounts/templates/profile.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
+{% load icons %}
 {% load tags_fingerprint %}
 {% block title %}{% trans "Profile" %}{% endblock %}
 {% block content %}
@@ -16,6 +17,9 @@
             <div class="row">
                 <div class="col-lg-12">
                     <h3 class="page-header">{% trans "Edit Profile" %}</h3>
+                    {% if perms.accounts.change_password %}
+                        <a href="{% url 'change_password' %}" class="btn btn-primary">{% icon 'lock' %} {% trans "Change Password" %}</a>
+                    {% endif %}
                     <form method="post" action="" role="form" aria-label="Edit user info form">{% csrf_token %}
                         <div class="form-group">
                             <label class="col-sm-2 col-form-label">{% trans "Login" %}</label>
@@ -41,34 +45,6 @@
                             </div>
                         </div>
                     </form>
-                    {% if perms.accounts.change_password %}
-                    <h3 class="page-header">{% trans "Edit Password" %}</h3>
-                    <form method="post" action="" role="form" aria-label="Edit user password form">{% csrf_token %}
-                        <div class="form-group">
-                            <label class="col-sm-2 col-form-label">{% trans "Old" %}</label>
-                            <div class="col-sm-4">
-                                <input type="password" class="form-control" name="oldpasswd" value="">
-                            </div>
-                        </div>
-                        <div class="form-group bridge_name_form_group_dhcp">
-                            <label class="col-sm-2 col-form-label">{% trans "New" %}</label>
-                            <div class="col-sm-4">
-                                <input type="password" class="form-control" name="passwd1" value="">
-                            </div>
-                        </div>
-                        <div class="form-group bridge_name_form_group_dhcp">
-                            <label class="col-sm-2 col-form-label">{% trans "Retry" %}</label>
-                            <div class="col-sm-4">
-                                <input type="password" class="form-control" name="passwd2" value="">
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <div class="col-sm-offset-2 col-sm-10">
-                                <button type="submit" class="btn btn-primary">{% trans "Change" %}</button>
-                            </div>
-                        </div>
-                    </form>
-                    {% endif %}
                     <h3 class="page-header">{% trans "SSH Keys" %}</h3>
                     {% if publickeys %}
                         <div class="col-lg-12">
diff --git a/accounts/urls.py b/accounts/urls.py
index e4306df..bf4ad8b 100644
--- a/accounts/urls.py
+++ b/accounts/urls.py
@@ -1,5 +1,6 @@
-from django.urls import path
 from django.contrib.auth import views as auth_views
+from django.urls import path
+
 from . import views
 
 urlpatterns = [
@@ -7,4 +8,5 @@ urlpatterns = [
     path('logout/', auth_views.LogoutView.as_view(template_name='logout.html'), name='logout'),
     path('profile/', views.profile, name='profile'),
     path('profile/<int:user_id>/', views.account, name='account'),
+    path('change_password/', views.change_password, name='change_password'),
 ]
diff --git a/accounts/views.py b/accounts/views.py
index f2e3c9d..53d120f 100644
--- a/accounts/views.py
+++ b/accounts/views.py
@@ -1,9 +1,13 @@
 import os
 
 import sass
+from django.contrib import messages
+from django.contrib.auth import update_session_auth_hash
+from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.forms import PasswordChangeForm
 from django.core.validators import ValidationError
 from django.http import HttpResponseRedirect
-from django.shortcuts import render
+from django.shortcuts import redirect, render
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
@@ -118,3 +122,19 @@ def account(request, user_id):
                 return HttpResponseRedirect(request.get_full_path())
 
     return render(request, 'account.html', locals())
+
+
+@permission_required('accounts.change_password', raise_exception=True)
+def change_password(request):
+    if request.method == 'POST':
+        form = PasswordChangeForm(request.user, request.POST)
+        if form.is_valid():
+            user = form.save()
+            update_session_auth_hash(request, user)  # Important!
+            messages.success(request, _('Password Changed'))
+            return redirect('profile')
+        else:
+            messages.error(request, _('Wrong Data Provided'))
+    else:
+        form = PasswordChangeForm(request.user)
+    return render(request, 'accounts/change_password_form.html', {'form': form})
diff --git a/computes/templates/computes/form.html b/computes/templates/computes/form.html
index 189318a..483a3d1 100644
--- a/computes/templates/computes/form.html
+++ b/computes/templates/computes/form.html
@@ -11,7 +11,6 @@
         <h2 class="page-header">{% trans "Create Compute" %}</h2>
     </div>
 </div>
-{% bootstrap_messages %}
 <div class="row">
     <div class="thumbnail col-sm-10 offset-1">
         <form id="create-update" action="" method="post">
diff --git a/templates/base.html b/templates/base.html
index 4ec1797..c640c4c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load bootstrap4 %}
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -36,7 +37,7 @@
     {% include 'navbar.html' %}
 
     <div role="main" class="container">
-
+    {% bootstrap_messages %}
     {% block content %}{% endblock %}
 
     </div> <!-- /container -->
diff --git a/templates/navbar.html b/templates/navbar.html
index 6b9d11c..f498993 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -42,7 +42,7 @@
             <a class="dropdown-item disabled" href="#">
               {% trans "Language" %}: <span class="badge badge-secondary">{{ LANGUAGE_CODE }}</span>
             </a>
-            <a class="dropdown-item {% view_active request 'profile' %}" href="{% url 'profile' %}"><i class="fa fa-fw fa-pencil-square-o"></i> {% trans "Profile" %}</a>
+            <a class="dropdown-item {% view_active request 'profile' %}" href="{% url 'profile' %}">{% icon 'vcard' %} {% trans "Profile" %}</a>
             <div class="dropdown-divider"></div>
             <a class="dropdown-item" href="{% url 'logout' %}"><i class="fa fa-fw fa-power-off"></i> {% trans "Log Out" %}</a>
           </div>