From 06c2ba9fa9d4c42cc18ddf830976166e213d965b Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Thu, 21 Jan 2016 14:34:36 +0100
Subject: [PATCH] Fixup email edit form with password changes

---
 webadmin/src/views/account.html | 12 +++++-------
 webadmin/src/views/account.js   |  1 +
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/webadmin/src/views/account.html b/webadmin/src/views/account.html
index ffe80beac..f41fde805 100644
--- a/webadmin/src/views/account.html
+++ b/webadmin/src/views/account.html
@@ -68,15 +68,13 @@
                             </div>
                             <input type="email" class="form-control" ng-model="emailchange.email" id="inputEmailChangeEmail" name="email" ng-maxlength="512" ng-minlength="5" required autofocus>
                         </div>
-                        <div class="form-group" ng-class="{ 'has-error': (emailchange_form.password.$dirty && emailchange_form.password.$invalid)}">
+                        <div class="form-group" ng-class="{ 'has-error': (emailchange_form.password.$dirty && emailchange_form.password.$invalid) || (!emailchange_form.password.$dirty && emailchange.error.password) }">
                             <label class="control-label" for="inputEmailChangePassword">Password</label>
-                            <div class="control-label" ng-show="(!emailchange_form.password.$dirty && emailchange.error.password) || (emailchange_form.password.$dirty && emailchange_form.password.$invalid)">
-                                <small ng-show="emailchange_form.password.$error.required">A password is required</small>
-                                <small ng-show="emailchange_form.password.$error.minlength">The password is too short</small>
-                                <small ng-show="emailchange_form.password.$error.maxlength">The password is too long</small>
-                                <small ng-show="emailchange_form.password.$dirty && emailchange.error.password">Invalid pasword</small>
+                            <div class="control-label" ng-show="(emailchange_form.password.$dirty && emailchange_form.password.$invalid) || (!emailchange_form.password.$dirty && emailchange.error.password)">
+                                <small ng-show=" emailchange_form.password.$dirty && emailchange_form.password.$invalid">Password must be 8-30 character with at least one uppercase, one numeric and one special character</small>
+                                <small ng-show="!emailchange_form.password.$dirty && emailchange.error.password">Invalid pasword</small>
                             </div>
-                            <input type="password" class="form-control" ng-model="emailchange.password" id="inputEmailChangePassword" name="password" ng-maxlength="30" ng-minlength="8" required autofocus>
+                            <input type="password" class="form-control" ng-model="emailchange.password" id="inputEmailChangePassword" name="password" ng-pattern="/^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[^a-zA-Z0-9])(?!.*\s).{8,30}$/" required autofocus>
                         </div>
                         <input class="ng-hide" type="submit" ng-disabled="emailchange_form.$invalid"/>
                     </fieldset>
diff --git a/webadmin/src/views/account.js b/webadmin/src/views/account.js
index 9ce7c931d..915f86550 100644
--- a/webadmin/src/views/account.js
+++ b/webadmin/src/views/account.js
@@ -91,6 +91,7 @@ angular.module('Application').controller('AccountController', ['$scope', '$locat
                 if (error.statusCode === 403) {
                     $scope.emailchange.error.password = true;
                     $scope.emailchange.password = '';
+                    $scope.emailchange_form.password.$setPristine();
                     $('#inputEmailChangePassword').focus();
                 } else {
                     console.error('Unable to change email.', error);