From 6dc000e24702406ef221ecb3119c43700e8eb52f Mon Sep 17 00:00:00 2001
From: Ronald Langeveld <hi@ronaldlangeveld.com>
Date: Tue, 18 Jul 2023 17:58:06 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20success=20state=20on=20c?=
 =?UTF-8?q?hange=20password=20button.=20(#17410)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes https://github.com/TryGhost/Product/issues/3604

- The change password button in the user settings wasn't updating correctly.
- the saveNewPasswordTask() wasn't returning anything, causing `
this.get('task.last.value')` to return undefined in the `isSuccess`
method.
- This fix ensures that there is a value attached to the
`task.last.value` so that the condition for a successful save checks
out.

---

<!-- Leave the line below if you'd like GitHub Copilot to generate a
summary from your commit -->
<!--
copilot:summary
-->
### <samp>🤖 Generated by Copilot at a6a76eb</samp>

Improved error handling and feedback for changing user passwords in the
settings UI. Modified `saveNewPasswordTask` function in
`ghost/admin/app/controllers/settings/staff/user.js` to catch and
display errors and return user object.
---
 ghost/admin/app/controllers/settings/staff/user.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ghost/admin/app/controllers/settings/staff/user.js b/ghost/admin/app/controllers/settings/staff/user.js
index 8698e7cbfe..4b82e4ea01 100644
--- a/ghost/admin/app/controllers/settings/staff/user.js
+++ b/ghost/admin/app/controllers/settings/staff/user.js
@@ -326,8 +326,15 @@ export default class UserController extends Controller {
 
     @task
     *saveNewPasswordTask() {
-        yield this.user.saveNewPasswordTask.perform();
-        document.querySelector('#password-reset')?.reset();
+        try {
+            const user = yield this.user.saveNewPasswordTask.perform();
+            document.querySelector('#password-reset')?.reset();
+            return user;
+        } catch (error) {
+            if (error) {
+                this.notifications.showAPIError(error, {key: 'user.update'});
+            }
+        }
     }
 
     @action