From 8b7ed91c39aeef833b34d22a611bef5ab4a91e1d Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Fri, 28 Jul 2023 14:52:45 +0530
Subject: [PATCH 1/9] fix: Made Set Password Page Better

---
 frappe/www/update-password.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 7351311def..707bc21e09 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -84,6 +84,7 @@ frappe.ready(function() {
 		if (args.new_password !== confirm_password) {
 			$('.password-mismatch-message').text("{{ _('Passwords do not match') }}")
 				.removeClass('hidden text-muted').addClass('text-danger');
+			$('.password-strength-message').addClass('hidden');
 			return false;
 		}
 
@@ -198,6 +199,7 @@ frappe.ready(function() {
 				message.push("{{ _('Success! You are good to go 👍') }}");
 			}
 		}
+		$('.password-mismatch-message').text("").addClass('hidden');
 		strength_message.html(message.join(' ') || '').removeClass('hidden');
 	}
 

From d0c1152d0e2bb102521bffb24fab540f1bcdfd42 Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Fri, 28 Jul 2023 15:02:40 +0530
Subject: [PATCH 2/9] refactor: refactored the code

---
 frappe/www/update-password.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 707bc21e09..b78913cc97 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -199,7 +199,8 @@ frappe.ready(function() {
 				message.push("{{ _('Success! You are good to go 👍') }}");
 			}
 		}
-		$('.password-mismatch-message').text("").addClass('hidden');
+		$('.password-mismatch-message').addClass('hidden');
+
 		strength_message.html(message.join(' ') || '').removeClass('hidden');
 	}
 

From 213d744661651ec8bb12066c56754c9b6858ce13 Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Sun, 30 Jul 2023 18:25:10 +0530
Subject: [PATCH 3/9] fix: better UX

---
 frappe/www/update-password.html | 47 ++++++++++++++++++++++++++++++++-
 1 file changed, 46 insertions(+), 1 deletion(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index b78913cc97..5a50d8d71d 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -26,7 +26,7 @@
 				<p class="password-mismatch-message text-muted small hidden mt-2"></p>
 			</div>
 			<p class='password-strength-message text-muted small hidden'></p>
-			<button type="submit" id="update"
+			<button type="submit" id="update" disabled = true style="cursor: not-allowed;"
 				class="btn btn-primary btn-block btn-update">{{_("Confirm")}}</button>
 		</form>
 		{%- if not disable_signup -%}
@@ -43,6 +43,7 @@
 <script>
 
 frappe.ready(function() {
+
 	if(frappe.utils.get_url_arg("key")) {
 		$("#old_password").parent().toggle();
 	}
@@ -136,6 +137,50 @@ frappe.ready(function() {
 		window.timout_password_strength = setTimeout(window.test_password_strength, 200);
 	});
 
+
+	$("#old_password, #new_password, #confirm_password").on("keyup", function () {
+		if (!frappe.utils.get_url_arg("key")) {
+			if (
+				$("#old_password").val() &&
+				$("#new_password").val() &&
+				$("#confirm_password").val() &&
+				$("#new_password").val() === $("#confirm_password").val() &&
+				$(".password-strength-message").text() ===
+					"{{_('Success! You are good to go 👍')}}"
+			) {
+				$("#update").prop("disabled", false).css("cursor", "pointer");
+			} else {
+				$("#update").prop("disabled", true).css("cursor", "not-allowed");
+			}
+		} else {
+			if (
+				$("#new_password").val() &&
+				$("#confirm_password").val() &&
+				$("#new_password").val() === $("#confirm_password").val() &&
+				$(".password-strength-message").text() ===
+					"{{_('Success! You are good to go 👍')}}"
+			) {
+				$("#update").prop("disabled", false).css("cursor", "pointer");
+			} else {
+				$("#update").prop("disabled", true).css("cursor", "not-allowed");
+			}
+		}
+	});
+
+
+
+	$('#confirm_password').on('keyup', function() {
+		if ($('#confirm_password').val() && $('#new_password').val() !== $('#confirm_password').val()) {
+			$('.password-mismatch-message').text("{{ _('Passwords do not match') }}")
+				.removeClass('hidden text-muted').addClass('text-danger');
+			$('.password-strength-message').addClass('hidden');
+		}
+		else {
+			$('.password-mismatch-message').addClass('hidden');
+			$('.password-strength-message').removeClass('hidden');
+		}
+	});
+
 	window.test_password_strength = function() {
 		window.timout_password_strength = null;
 

From 25f759321f3eb0056d0cc4c8bc3401a2cfaf56c7 Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Mon, 31 Jul 2023 23:19:42 +0530
Subject: [PATCH 4/9] fix: added validation of (if old password === new
 password)

---
 frappe/www/update-password.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 5a50d8d71d..8fafd3ab82 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -82,11 +82,21 @@ frappe.ready(function() {
 				clear: true
 			});
 		}
+		if (args.old_password === args.new_password) {
+			frappe.msgprint({
+				title: "{{ _('Invalid Password') }}",
+				message: "{{ _('New password cannot be same as old password') }}",
+			});
+			$('.password-strength-message').addClass('hidden');
+			return;
+		}
+
 		if (args.new_password !== confirm_password) {
 			$('.password-mismatch-message').text("{{ _('Passwords do not match') }}")
 				.removeClass('hidden text-muted').addClass('text-danger');
 			$('.password-strength-message').addClass('hidden');
 			return false;
+
 		}
 
 		frappe.call({
@@ -139,6 +149,7 @@ frappe.ready(function() {
 
 
 	$("#old_password, #new_password, #confirm_password").on("keyup", function () {
+
 		if (!frappe.utils.get_url_arg("key")) {
 			if (
 				$("#old_password").val() &&

From 2b565207be527e08153180c5a2b387c0a3961abd Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Wed, 2 Aug 2023 13:27:11 +0530
Subject: [PATCH 5/9] fix: added debounce for checking old and new password
 same or not

---
 frappe/www/update-password.html | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 8fafd3ab82..84178ecfbd 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -143,10 +143,25 @@ frappe.ready(function() {
 	window.strength_message = $('.password-strength-message');
 
 	$('#new_password').on('keyup', function() {
+		if ($('#confirm_password').val() && $('new_password').val() === $('#confirm_password').val()) {
+			$('#update').prop('disabled', false).css('cursor', 'pointer');
+		}
 		window.clear_timeout();
 		window.timout_password_strength = setTimeout(window.test_password_strength, 200);
 	});
 
+	$('#new_password').on('keyup', frappe.utils.debounce(function() {
+		if ($('#old_password').val() === $('#new_password').val()) {
+			$('.password-strength-message').text("{{ _('New password cannot be same as old password') }}")
+				.removeClass('hidden text-muted').addClass('text-danger');
+			$('.password-strength-indicator').addClass('hidden');
+			$('#update').prop('disabled', true).css('cursor', 'not-allowed');
+		}
+		else {
+			$('.password-strength-message').removeClass('text-danger')
+		}
+	}, 500));
+
 
 	$("#old_password, #new_password, #confirm_password").on("keyup", function () {
 
@@ -180,7 +195,7 @@ frappe.ready(function() {
 
 
 
-	$('#confirm_password').on('keyup', function() {
+	$('#confirm_password, #new_password').on('keyup', function() {
 		if ($('#confirm_password').val() && $('#new_password').val() !== $('#confirm_password').val()) {
 			$('.password-mismatch-message').text("{{ _('Passwords do not match') }}")
 				.removeClass('hidden text-muted').addClass('text-danger');

From bd3be6675c60e1f3ef6e0a53fd60a04876badf00 Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Thu, 3 Aug 2023 14:00:33 +0530
Subject: [PATCH 6/9] refactor: one keyup event for all inputs

---
 frappe/www/update-password.html | 146 +++++++++++++++-----------------
 1 file changed, 67 insertions(+), 79 deletions(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 84178ecfbd..2ff7287262 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -43,12 +43,27 @@
 <script>
 
 frappe.ready(function() {
+	// URL args
+	const key = frappe.utils.get_url_arg('key');
+	const pasword_expired = frappe.utils.get_url_arg('password_expired');
+	// inputs and button elements
+	const old_password = $('#old_password');
+	const new_password = $('#new_password');
+	const confirm_password = $('#confirm_password');
+	const update_button = $('#update');
+	const password_strength_indicator = $('.password-strength-indicator');
+	const password_strength_message =$('.password-strength-message');
+	const password_mismatch_message = $('.password-mismatch-message');
+	// Span text
+	const password_not_same_as_old_password = "{{ _('New password cannot be same as old password') }}";
+	const password_mismatch = "{{ _('Passwords do not match') }}";
+	const password_strength_message_success = "{{ _('Success! You are good to go 👍') }}";
 
-	if(frappe.utils.get_url_arg("key")) {
-		$("#old_password").parent().toggle();
+	if(key) {
+		old_password.parent().toggle();
 	}
 
-	if(frappe.utils.get_url_arg("password_expired")) {
+	if(pasword_expired) {
 		$(".password-box").html("{{ _('The password of your account has expired.') }}");
 	}
 
@@ -56,18 +71,17 @@ frappe.ready(function() {
 		return false;
 	});
 
-	$("#new_password").on("keypress", function(e) {
-		if(e.which===13) $("#update").click();
+	new_password.on("keypress", function(e) {
+		if(e.which===13) update_button.click();
 	})
 
-	$("#update").click(function() {
+	update_button.click(function() {
 		var args = {
-			key: frappe.utils.get_url_arg("key") || "",
-			old_password: $("#old_password").val(),
-			new_password: $("#new_password").val(),
+			key: key || "",
+			old_password: old_password.val(),
+			new_password: new_password.val(),
 			logout_all_sessions: 1
 		}
-		const confirm_password = $('#confirm_password').val()
 		if (!args.old_password && !args.key) {
 			frappe.msgprint({
 				title: "{{ _('Missing Value') }}",
@@ -85,16 +99,16 @@ frappe.ready(function() {
 		if (args.old_password === args.new_password) {
 			frappe.msgprint({
 				title: "{{ _('Invalid Password') }}",
-				message: "{{ _('New password cannot be same as old password') }}",
+				message: password_not_same_as_old_password,
 			});
-			$('.password-strength-message').addClass('hidden');
+			password_strength_message.addClass('hidden');
 			return;
 		}
 
 		if (args.new_password !== confirm_password) {
-			$('.password-mismatch-message').text("{{ _('Passwords do not match') }}")
+			password_mismatch_message.text(password_mismatch)
 				.removeClass('hidden text-muted').addClass('text-danger');
-			$('.password-strength-message').addClass('hidden');
+			password_strength_message.addClass('hidden');
 			return false;
 
 		}
@@ -102,7 +116,7 @@ frappe.ready(function() {
 		frappe.call({
 			type: "POST",
 			method: "frappe.core.doctype.user.user.update_password",
-			btn: $("#update"),
+			btn: update_button,
 			args: args,
 			statusCode: {
 				401: function() {
@@ -139,81 +153,55 @@ frappe.ready(function() {
 		return false;
 	});
 
-	window.strength_indicator = $('.password-strength-indicator');
-	window.strength_message = $('.password-strength-message');
+	window.strength_indicator = password_strength_indicator;
+	window.strength_message = password_strength_message;
 
-	$('#new_password').on('keyup', function() {
-		if ($('#confirm_password').val() && $('new_password').val() === $('#confirm_password').val()) {
-			$('#update').prop('disabled', false).css('cursor', 'pointer');
-		}
+	new_password.on('keyup', function() {
 		window.clear_timeout();
 		window.timout_password_strength = setTimeout(window.test_password_strength, 200);
 	});
 
-	$('#new_password').on('keyup', frappe.utils.debounce(function() {
-		if ($('#old_password').val() === $('#new_password').val()) {
-			$('.password-strength-message').text("{{ _('New password cannot be same as old password') }}")
-				.removeClass('hidden text-muted').addClass('text-danger');
-			$('.password-strength-indicator').addClass('hidden');
-			$('#update').prop('disabled', true).css('cursor', 'not-allowed');
+	$("#old_password, #new_password, #confirm_password").on("keyup", frappe.utils.debounce(function () {
+		let common_conditions = new_password.val() && confirm_password.val() && new_password.val() === confirm_password.val() &&
+		password_strength_message.text() === password_strength_message_success
+
+		if (new_password.val() && old_password.val() === new_password.val()) {
+			password_mismatch_message.text(password_not_same_as_old_password)
+				.removeClass("hidden text-muted").addClass("text-danger");
+
+			password_strength_message.addClass("hidden");
 		}
+		if ((new_password.val() || old_password.val) && old_password.val() !== new_password.val()) {
+			password_mismatch_message.addClass("hidden");
+			password_strength_message.removeClass("hidden");
+			password_mismatch_message.text('')
+		}
+
+		if (new_password.val() === confirm_password.val() && old_password.val() !== new_password.val() ) {
+			password_mismatch_message.addClass("hidden");
+			password_strength_message.removeClass("hidden");
+		}
+		if (confirm_password.val() &&  new_password.val() !== confirm_password.val()) {
+			password_mismatch_message.text(password_mismatch)
+				.removeClass("hidden text-muted").addClass("text-danger");
+			password_strength_message.addClass("hidden");
+		}
+		if ((key || (!key && old_password.val() && password_mismatch_message.text() !== password_not_same_as_old_password )) && common_conditions ) {
+            update_button.prop("disabled", false).css("cursor", "pointer");
+        }
 		else {
-			$('.password-strength-message').removeClass('text-danger')
+			update_button.prop("disabled", true).css("cursor", "not-allowed");
 		}
-	}, 500));
-
-
-	$("#old_password, #new_password, #confirm_password").on("keyup", function () {
-
-		if (!frappe.utils.get_url_arg("key")) {
-			if (
-				$("#old_password").val() &&
-				$("#new_password").val() &&
-				$("#confirm_password").val() &&
-				$("#new_password").val() === $("#confirm_password").val() &&
-				$(".password-strength-message").text() ===
-					"{{_('Success! You are good to go 👍')}}"
-			) {
-				$("#update").prop("disabled", false).css("cursor", "pointer");
-			} else {
-				$("#update").prop("disabled", true).css("cursor", "not-allowed");
-			}
-		} else {
-			if (
-				$("#new_password").val() &&
-				$("#confirm_password").val() &&
-				$("#new_password").val() === $("#confirm_password").val() &&
-				$(".password-strength-message").text() ===
-					"{{_('Success! You are good to go 👍')}}"
-			) {
-				$("#update").prop("disabled", false).css("cursor", "pointer");
-			} else {
-				$("#update").prop("disabled", true).css("cursor", "not-allowed");
-			}
-		}
-	});
-
-
-
-	$('#confirm_password, #new_password').on('keyup', function() {
-		if ($('#confirm_password').val() && $('#new_password').val() !== $('#confirm_password').val()) {
-			$('.password-mismatch-message').text("{{ _('Passwords do not match') }}")
-				.removeClass('hidden text-muted').addClass('text-danger');
-			$('.password-strength-message').addClass('hidden');
-		}
-		else {
-			$('.password-mismatch-message').addClass('hidden');
-			$('.password-strength-message').removeClass('hidden');
-		}
-	});
+		},500)
+	)
 
 	window.test_password_strength = function() {
 		window.timout_password_strength = null;
 
 		var args = {
-			key: frappe.utils.get_url_arg("key") || "",
-			old_password: $("#old_password").val(),
-			new_password: $("#new_password").val()
+			key: key || "",
+			old_password: old_password.val(),
+			new_password: new_password.val()
 		}
 
 		if (!args.new_password) {
@@ -267,10 +255,10 @@ frappe.ready(function() {
 				message.push(feedback.help_msg);
 
 			} else {
-				message.push("{{ _('Success! You are good to go 👍') }}");
+				message.push(password_strength_message_success);
 			}
 		}
-		$('.password-mismatch-message').addClass('hidden');
+		password_mismatch_message.addClass('hidden');
 
 		strength_message.html(message.join(' ') || '').removeClass('hidden');
 	}

From 1cd6c4effc5fa1bc7094304ab2d3c3ba615504c9 Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Thu, 3 Aug 2023 16:08:58 +0530
Subject: [PATCH 7/9] fix: fixed on click function

---
 frappe/www/update-password.html | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 2ff7287262..2510aa4bd4 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -105,7 +105,7 @@ frappe.ready(function() {
 			return;
 		}
 
-		if (args.new_password !== confirm_password) {
+		if (args.new_password !== confirm_password.val()) {
 			password_mismatch_message.text(password_mismatch)
 				.removeClass('hidden text-muted').addClass('text-danger');
 			password_strength_message.addClass('hidden');
@@ -121,6 +121,12 @@ frappe.ready(function() {
 			statusCode: {
 				401: function() {
 					$(".page-card-head .reset-password-heading").text("{{ _('Invalid Password') }}");
+					frappe.msgprint({
+						title: "{{ _('Invalid Password') }}",
+						message: "{{ _('Your old password is incorrect.') }}",
+						// clear any server message
+						clear: true
+					});
 				},
 				410: function({ responseJSON }) {
 					const title = "{{ _('Invalid Link') }}";

From 27426f7ceb13c59779bb225438a0ce60fc296c10 Mon Sep 17 00:00:00 2001
From: Ritvik Sardana <ritviksardana@Ritviks-MacBook-Air.local>
Date: Mon, 7 Aug 2023 00:34:08 +0530
Subject: [PATCH 8/9] chore: code cleanup

---
 frappe/www/update-password.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index 2510aa4bd4..e42a7804b3 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -23,9 +23,9 @@
 				<input id="confirm_password" type="password"
 					class="form-control" placeholder="{{ _('Confirm Password') }}" autocomplete="new-password">
 
-				<p class="password-mismatch-message text-muted small hidden mt-2"></p>
 			</div>
-			<p class='password-strength-message text-muted small hidden'></p>
+			<p class="password-mismatch-message text-muted small hidden mt-2"></p>
+			<p class='password-strength-message text-muted small mt-2 hidden'></p>
 			<button type="submit" id="update" disabled = true style="cursor: not-allowed;"
 				class="btn btn-primary btn-block btn-update">{{_("Confirm")}}</button>
 		</form>
@@ -46,7 +46,7 @@ frappe.ready(function() {
 	// URL args
 	const key = frappe.utils.get_url_arg('key');
 	const pasword_expired = frappe.utils.get_url_arg('password_expired');
-	// inputs and button elements
+	// inputs, paragraphs and button elements
 	const old_password = $('#old_password');
 	const new_password = $('#new_password');
 	const confirm_password = $('#confirm_password');
@@ -54,7 +54,7 @@ frappe.ready(function() {
 	const password_strength_indicator = $('.password-strength-indicator');
 	const password_strength_message =$('.password-strength-message');
 	const password_mismatch_message = $('.password-mismatch-message');
-	// Span text
+	// Info text
 	const password_not_same_as_old_password = "{{ _('New password cannot be same as old password') }}";
 	const password_mismatch = "{{ _('Passwords do not match') }}";
 	const password_strength_message_success = "{{ _('Success! You are good to go 👍') }}";
@@ -80,6 +80,7 @@ frappe.ready(function() {
 			key: key || "",
 			old_password: old_password.val(),
 			new_password: new_password.val(),
+			confirm_password: confirm_password.val(),
 			logout_all_sessions: 1
 		}
 		if (!args.old_password && !args.key) {
@@ -105,12 +106,11 @@ frappe.ready(function() {
 			return;
 		}
 
-		if (args.new_password !== confirm_password.val()) {
+		if (args.new_password !== args.confirm_password) {
 			password_mismatch_message.text(password_mismatch)
 				.removeClass('hidden text-muted').addClass('text-danger');
 			password_strength_message.addClass('hidden');
-			return false;
-
+			return;
 		}
 
 		frappe.call({

From 6ed6a3f7628c2d77085e7e45e1f9c379fb1a8ecf Mon Sep 17 00:00:00 2001
From: Shariq Ansari <30859809+shariquerik@users.noreply.github.com>
Date: Mon, 7 Aug 2023 20:47:58 +0530
Subject: [PATCH 9/9] chore: minor fix

---
 frappe/www/update-password.html | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frappe/www/update-password.html b/frappe/www/update-password.html
index e42a7804b3..2e6c3cf089 100644
--- a/frappe/www/update-password.html
+++ b/frappe/www/update-password.html
@@ -45,7 +45,7 @@
 frappe.ready(function() {
 	// URL args
 	const key = frappe.utils.get_url_arg('key');
-	const pasword_expired = frappe.utils.get_url_arg('password_expired');
+	const password_expired = frappe.utils.get_url_arg('password_expired');
 	// inputs, paragraphs and button elements
 	const old_password = $('#old_password');
 	const new_password = $('#new_password');
@@ -63,7 +63,7 @@ frappe.ready(function() {
 		old_password.parent().toggle();
 	}
 
-	if(pasword_expired) {
+	if(password_expired) {
 		$(".password-box").html("{{ _('The password of your account has expired.') }}");
 	}
 
@@ -193,8 +193,8 @@ frappe.ready(function() {
 			password_strength_message.addClass("hidden");
 		}
 		if ((key || (!key && old_password.val() && password_mismatch_message.text() !== password_not_same_as_old_password )) && common_conditions ) {
-            update_button.prop("disabled", false).css("cursor", "pointer");
-        }
+			update_button.prop("disabled", false).css("cursor", "pointer");
+		}
 		else {
 			update_button.prop("disabled", true).css("cursor", "not-allowed");
 		}