From c39f980942cf7e4b291a4f7faa567f966ad9edd6 Mon Sep 17 00:00:00 2001
From: Withington <lucy.withington@outlook.com>
Date: Sat, 20 May 2017 18:44:34 +0100
Subject: [PATCH 1/5] Change password, working version.

---
 static/assets/js/phenopolis.js                  | 4 ++--
 templates/components/change_password_modal.html | 8 ++++++--
 views/__init__.py                               | 3 ++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/static/assets/js/phenopolis.js b/static/assets/js/phenopolis.js
index c078e6b..f1d4b92 100644
--- a/static/assets/js/phenopolis.js
+++ b/static/assets/js/phenopolis.js
@@ -150,7 +150,7 @@ if (!PP) {
         new_password_2: {
           equalTo: 'Both new passwords must match.'
         }
-      }
+      },
       submitHandler: function(form) {
         $('#auth_modal').modal({ dismissible: false, endingTop: '20%' });
         $('#auth_modal').modal('open');
@@ -168,7 +168,7 @@ if (!PP) {
                 $('#change_password_successful').show();
                 $("#change_password_successful").text(data.success);
             },
-            error: function (xhr, msg) {
+            error: function (data, msg) {
                 $('#auth_modal').modal('close');
                 $("#username, #password, #new_password_1, #new_password_2").addClass("invalid");
                 $("#username, #password, #new_password_1, #new_password_2").prop("aria-invalid", "true");
diff --git a/templates/components/change_password_modal.html b/templates/components/change_password_modal.html
index 1213ac2..c095601 100644
--- a/templates/components/change_password_modal.html
+++ b/templates/components/change_password_modal.html
@@ -4,8 +4,12 @@
         <i class="material-icons right modal-close">close</i>
         <h4>Change Password</h4>
         <form id="change_password_form" class="col s12">
-            <input type="hidden" value="{{username}}" name="name">
             <div class="row">
+                <div class="input-field col s12">
+                    <i class="material-icons prefix">lock</i>
+                    <input id="change_pwd_name" type="text" value={{session['user'].title() }} name="change_pwd_name">
+                    <label for="change_pwd_name">Hello</label>
+                </div>
                 <div class="input-field col s12">
                     <i class="material-icons prefix">lock</i>
                     <input id="current_password" type="password" name="current_password">
@@ -26,7 +30,7 @@ <h4>Change Password</h4>
                     <br>Contact us if you continue to have issues.
                 </p>
             </div>
-        </form>
+</form>
         <p id="change_password_successful" style="color:#4CAF50; display: none;">Your password has been changed.</p>
     </div>
     <div class="modal-footer" style="border-top: 1px solid rgba(0, 0, 0, 0.1)">
diff --git a/views/__init__.py b/views/__init__.py
index 0fe894c..72c6c42 100644
--- a/views/__init__.py
+++ b/views/__init__.py
@@ -193,7 +193,8 @@ def logout():
 # 
 @app.route('/change_password', methods=['POST'])
 def change_password():
-    username = request.form['name']
+    print 'CHANGING PASSWORD function'
+    username = request.form['change_pwd_name']
     password = request.form['current_password']
     new_password_1 = request.form['new_password_1']
     new_password_2 = request.form['new_password_2']

From 0fc664d2cb60ebb96a6b1c14256981a7c010dfde Mon Sep 17 00:00:00 2001
From: Withington <lucy.withington@outlook.com>
Date: Sat, 20 May 2017 19:31:21 +0100
Subject: [PATCH 2/5] Change password, send only one password to server.

---
 templates/components/change_password_modal.html | 2 +-
 views/__init__.py                               | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/templates/components/change_password_modal.html b/templates/components/change_password_modal.html
index c095601..feeb50c 100644
--- a/templates/components/change_password_modal.html
+++ b/templates/components/change_password_modal.html
@@ -7,7 +7,7 @@ <h4>Change Password</h4>
             <div class="row">
                 <div class="input-field col s12">
                     <i class="material-icons prefix">lock</i>
-                    <input id="change_pwd_name" type="text" value={{session['user'].title() }} name="change_pwd_name">
+                    <input id="change_pwd_name" type="text" value={{session['user']}} name="change_pwd_name">
                     <label for="change_pwd_name">Hello</label>
                 </div>
                 <div class="input-field col s12">
diff --git a/views/__init__.py b/views/__init__.py
index 72c6c42..45f15f5 100644
--- a/views/__init__.py
+++ b/views/__init__.py
@@ -197,11 +197,8 @@ def change_password():
     username = request.form['change_pwd_name']
     password = request.form['current_password']
     new_password_1 = request.form['new_password_1']
-    new_password_2 = request.form['new_password_2']
     if username == 'demo': 
         return jsonify(error='You do not have permission to change the password for username \'demo\'.'), 401
-    elif new_password_1 != new_password_2: 
-        return jsonify(error='New password and re-typed password do not match. Please try again.'), 401
     elif not check_auth(username,password):
         print 'Change password:- Login Failed'
         return jsonify(error='Username and current password incorrect. Please try again.'), 401

From d30bfa79b82c0d580adb09cb3d1d25c4b754b778 Mon Sep 17 00:00:00 2001
From: Withington <lucy.withington@outlook.com>
Date: Sun, 21 May 2017 15:00:16 +0100
Subject: [PATCH 3/5] Change password, hiding username.

---
 .../components/change_password_modal.html     |  6 +----
 tests/test_login.py                           | 22 ++++++++-----------
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/templates/components/change_password_modal.html b/templates/components/change_password_modal.html
index feeb50c..9cd1999 100644
--- a/templates/components/change_password_modal.html
+++ b/templates/components/change_password_modal.html
@@ -5,11 +5,7 @@
         <h4>Change Password</h4>
         <form id="change_password_form" class="col s12">
             <div class="row">
-                <div class="input-field col s12">
-                    <i class="material-icons prefix">lock</i>
-                    <input id="change_pwd_name" type="text" value={{session['user']}} name="change_pwd_name">
-                    <label for="change_pwd_name">Hello</label>
-                </div>
+                <input id="change_pwd_name" type="hidden" value={{session['user']}} name="change_pwd_name">
                 <div class="input-field col s12">
                     <i class="material-icons prefix">lock</i>
                     <input id="current_password" type="password" name="current_password">
diff --git a/tests/test_login.py b/tests/test_login.py
index 8614d47..da6ae90 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -1,7 +1,7 @@
 
 # Uncomment to run this module directly.
-#import sys, os
-#sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+import sys, os
+sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 # End of uncomment.
 
 import load_data
@@ -33,12 +33,11 @@ def login(self, username, password):
     def logout(self):
         return self.app.get('/logout', follow_redirects=True)
 
-    def change_password(self, username, password, new_pass_1, new_pass_2):
+    def change_password(self, username, password, new_pass_1):
         return self.app.post('/change_password', data=dict(
-            name=username,
+            change_pwd_name=username,
             current_password=password,
             new_password_1=new_pass_1,
-            new_password_2=new_pass_2
         ), follow_redirects=True)
 
     def test_login_logout(self):
@@ -60,7 +59,7 @@ def test_change_password(self):
         assert rv.status_code == 200
         assert 'Authenticated' in rv.data
 
-        rv = self.change_password('test', 'test123', 'test456', 'test456')
+        rv = self.change_password('test', 'test123', 'test456')
         assert rv.status_code == 200
         print(rv.data)
         assert 'Password for username \'test\' changed' in rv.data
@@ -72,19 +71,16 @@ def test_change_password(self):
         rv = self.login('test', 'test123')
         assert rv.status_code == 401
 
-        rv = self.change_password('test', 'test456', 'test123', 'test123')
+        rv = self.change_password('test', 'test456', 'test123')
         assert rv.status_code == 200
 
-        rv = self.change_password('demo', 'demo123', 'demo456', 'demo456')
-        assert rv.status_code == 401
-
-        rv = self.change_password('test', 'test123', 'x', 'test456')
+        rv = self.change_password('demo', 'demo123', 'demo456')
         assert rv.status_code == 401
 
-        rv = self.change_password('test', 'x', 'test456', 'test456')
+        rv = self.change_password('test', 'x', 'test456')
         assert rv.status_code == 401
 
-        rv = self.change_password('x', 'test123', 'test456', 'test456')
+        rv = self.change_password('x', 'test123', 'test456')
         assert rv.status_code == 401
 
 if __name__ == '__main__':

From 6641f69d431e21a721b91d6ec3838203dad4cf65 Mon Sep 17 00:00:00 2001
From: Withington <lucy.withington@outlook.com>
Date: Sun, 21 May 2017 18:20:52 +0100
Subject: [PATCH 4/5] Typo correction.

---
 templates/components/login_modal.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/components/login_modal.html b/templates/components/login_modal.html
index 56acaaa..9fea5c9 100644
--- a/templates/components/login_modal.html
+++ b/templates/components/login_modal.html
@@ -16,7 +16,7 @@ <h4>Login</h4>
                     <input id="password" type="password" placeholder="demo123" name="password">
                     <label for="password">Password</label>
                 </div>
-                <p class="col s12" id="login_form_error_msg" style="display:none; color: #F44336; margin-top: 0; margin-left: -1em;">Authentication failed. Please enter your username and passsword again.<br>Contact us if you continue to have issues logging in.</p>
+                <p class="col s12" id="login_form_error_msg" style="display:none; color: #F44336; margin-top: 0; margin-left: -1em;">Authentication failed. Please enter your username and password again.<br>Contact us if you continue to have issues logging in.</p>
             </div>
         </form>
         <p>Alternatively, select the 'Demo Login' button below to login as a demo user.</p>

From 1ee3633dbdc9d38e7c4766fb1a931965b9014572 Mon Sep 17 00:00:00 2001
From: Withington <lucy.withington@outlook.com>
Date: Sun, 21 May 2017 18:30:27 +0100
Subject: [PATCH 5/5] Formatting, etc.

---
 templates/components/change_password_modal.html | 2 +-
 tests/test_login.py                             | 4 ++--
 views/__init__.py                               | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/components/change_password_modal.html b/templates/components/change_password_modal.html
index 9cd1999..9fa0936 100644
--- a/templates/components/change_password_modal.html
+++ b/templates/components/change_password_modal.html
@@ -26,7 +26,7 @@ <h4>Change Password</h4>
                     <br>Contact us if you continue to have issues.
                 </p>
             </div>
-</form>
+        </form>
         <p id="change_password_successful" style="color:#4CAF50; display: none;">Your password has been changed.</p>
     </div>
     <div class="modal-footer" style="border-top: 1px solid rgba(0, 0, 0, 0.1)">
diff --git a/tests/test_login.py b/tests/test_login.py
index da6ae90..d0a927a 100644
--- a/tests/test_login.py
+++ b/tests/test_login.py
@@ -1,7 +1,7 @@
 
 # Uncomment to run this module directly.
-import sys, os
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+#import sys, os
+#sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
 # End of uncomment.
 
 import load_data
diff --git a/views/__init__.py b/views/__init__.py
index 45f15f5..4a24e01 100644
--- a/views/__init__.py
+++ b/views/__init__.py
@@ -193,7 +193,6 @@ def logout():
 # 
 @app.route('/change_password', methods=['POST'])
 def change_password():
-    print 'CHANGING PASSWORD function'
     username = request.form['change_pwd_name']
     password = request.form['current_password']
     new_password_1 = request.form['new_password_1']