FIX Handle 401 from server

silverstripe · Feb 24, 2025 · 7d27fa5 · 7d27fa5
1 parent 08e1047
commit 7d27fa5
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/client/dist/js/bundle.js b/client/dist/js/bundle.js
diff --git a/client/src/components/SudoModePasswordField/SudoModePasswordField.js b/client/src/components/SudoModePasswordField/SudoModePasswordField.js
@@ -52,12 +52,16 @@ function SudoModePasswordField(props) {
     const headers = {
       'X-SecurityID': Config.get('SecurityID'),
     };
-    const responseJson = await fetcher(data, headers);
-    if (responseJson.result) {
-      onSuccess();
-    } else {
-      setResponseMessage(responseJson.message);
-    }
+    fetcher(data, headers)
+      .then(responseJson => {
+        if (responseJson.result) {
+          onSuccess();
+        }
+      })
+      .catch(async (err) => {
+        const responseJson = await err.response.json();
+        setResponseMessage(responseJson.message);
+      });
   }
 
   /**

diff --git a/client/src/components/SudoModePasswordField/tests/SudoModePasswordField-test.js b/client/src/components/SudoModePasswordField/tests/SudoModePasswordField-test.js
@@ -16,11 +16,29 @@ window.ss.config = {
 };
 
 let doResolve;
+let doReject;
+
+beforeEach(() => {
+  doResolve = undefined;
+  doReject = undefined;
+});
+
+function createJsonError(message) {
+  return {
+    response: {
+      json: () => ({
+        result: false,
+        message
+      }),
+    },
+  };
+}
 
 jest.mock('lib/Backend', () => ({
   createEndpointFetcher: () => () => (
-    new Promise((resolve) => {
+    new Promise((resolve, reject) => {
       doResolve = resolve;
+      doReject = reject;
     })
   )
 }));
@@ -68,10 +86,7 @@ test('SudoModePasswordField should show a message on failure', async () => {
   passwordField.value = 'password';
   const verifyButton = await screen.findByText('Verify');
   fireEvent.click(verifyButton);
-  doResolve({
-    result: false,
-    message: 'A big failure'
-  });
+  await doReject(createJsonError('A big failure'));
   const message = await screen.findByText('A big failure');
   expect(message).not.toBeNull();
   expect(onSuccess).not.toBeCalled();

diff --git a/client/src/lib/Backend.js b/client/src/lib/Backend.js
@@ -9,7 +9,7 @@ es6promise.polyfill();
 /**
  * @see https://github.com/github/fetch#handling-http-error-statuses
  */
-function checkStatus(response) {
+async function checkStatus(response) {
   let ret = null;
   let error = null;
   if (response.status >= 200 && response.status < 300) {