Merge remote-tracking branch 'remotes/from/ce/main'

Author: hc-github-team-secure-vault-core

ui/lib/ldap/addon/components/page/overview.ts

@@ -97,8 +97,12 @@ export default class LdapLibrariesPageComponent extends Component<Args> {
       );
       this.checkInCapabilities = await this.capabilities.fetch(paths);
     } catch (error) {
-      // Hierarchical discovery failed - display inline error
-      this.librariesError = 'Unable to load complete library information. Please try refreshing the page.';
+      const { status } = await this.api.parseError(error);
+      // Only set error message if status is not a 404 which just means an empty response.
+      if (status !== 404) {
+        // Hierarchical discovery failed - display inline error
+        this.librariesError = 'Unable to load complete library information. Please try refreshing the page.';
+      }
       this.allLibraries = [];
     }
   });

ui/lib/ldap/addon/components/page/role/create-and-edit.ts

@@ -9,7 +9,6 @@ import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { task } from 'ember-concurrency';
 import { waitFor } from '@ember/test-waiters';
-import errorMessage from 'vault/utils/error-message';
 
 import { LdapRolesCreateRouteModel } from 'ldap/routes/roles/create';
 import { Breadcrumb, ValidationMap } from 'vault/vault/app-types';
@@ -133,7 +132,11 @@ export default class LdapCreateAndEditRolePageComponent extends Component<Args>
             name
           );
         } catch (error) {
-          this.error = errorMessage(error, 'Error saving role. Please try again or contact support.');
+          const { message } = await this.api.parseError(
+            error,
+            'Error saving role. Please try again or contact support.'
+          );
+          this.error = message;
         }
       }
     })

ui/tests/helpers/stubs.js

@@ -66,11 +66,7 @@ export function allowAllCapabilitiesStub(capabilitiesList = ['root']) {
  */
 export function overrideResponse(httpStatus = 200, payload = {}) {
   if (httpStatus === 403) {
-    return new Response(
-      403,
-      { 'Content-Type': 'application/json' },
-      JSON.stringify({ errors: ['permission denied'] })
-    );
+    return new Response(403, { 'Content-Type': 'application/json' }, formatError('permission denied'));
   }
   if (httpStatus === 404) {
     return new Response(404, { 'Content-Type': 'application/json' });
@@ -80,3 +76,5 @@ export function overrideResponse(httpStatus = 200, payload = {}) {
   }
   return new Response(httpStatus, { 'Content-Type': 'application/json' }, payload);
 }
+
+export const formatError = (msg) => JSON.stringify({ errors: [msg] });

ui/tests/integration/components/ldap/page/overview-test.js

@@ -197,4 +197,12 @@ module('Integration | Component | ldap | Page::Overview', function (hooks) {
       .dom('[data-test-overview-card-container="Accounts checked-out"]')
       .exists('AccountsCheckedOut component still renders when library discovery fails');
   });
+
+  test('it should display "None" when library request returns a 404', async function (assert) {
+    // Override server to return empty 404 response for library requests
+    this.apiLibraryStub.rejects(getErrorResponse({}, 404));
+    await this.renderComponent();
+    assert.dom('[data-test-libraries-error]').doesNotExist();
+    assert.dom('[data-test-libraries-count]').hasText('None');
+  });
 });

ui/tests/integration/components/ldap/page/role/create-and-edit-test.js

@@ -13,6 +13,7 @@ import sinon from 'sinon';
 import { GENERAL } from 'vault/tests/helpers/general-selectors';
 import LdapStaticRoleForm from 'vault/forms/secrets/ldap/roles/static';
 import LdapDynamicRoleForm from 'vault/forms/secrets/ldap/roles/dynamic';
+import { formatError, overrideResponse } from 'vault/tests/helpers/stubs';
 
 module('Integration | Component | ldap | Page::Role::CreateAndEdit', function (hooks) {
   setupRenderingTest(hooks);
@@ -234,4 +235,32 @@ module('Integration | Component | ldap | Page::Role::CreateAndEdit', function (h
       'Transitions to role details route on save success'
     );
   });
+
+  test('it should display api error when creating static roles fails', async function (assert) {
+    this.server.post('/:backend/static-role/:name', () => {
+      return overrideResponse(500, formatError('uh oh!'));
+    });
+    this.model = this.createModel;
+    await this.renderComponent();
+    await fillIn(GENERAL.inputByAttr('name'), 'test-role');
+    await fillIn(GENERAL.inputByAttr('dn'), 'foo');
+    await fillIn(GENERAL.inputByAttr('username'), 'bar');
+    await fillIn(GENERAL.ttl.input('Rotation period'), 5);
+    await click(GENERAL.submitButton);
+    assert
+      .dom(GENERAL.messageError)
+      .hasText('Error uh oh!', 'it renders error message returned from the API');
+  });
+
+  test('it should display api error when creating dynamic roles fails', async function (assert) {
+    this.server.post('/:backend/role/:name', () => {
+      return overrideResponse(500, formatError('uh oh!'));
+    });
+    this.model = this.dynamicEditModel;
+    await this.renderComponent();
+    await click(GENERAL.submitButton);
+    assert
+      .dom(GENERAL.messageError)
+      .hasText('Error uh oh!', 'it renders error message returned from the API');
+  });
 });