UI: removeember-fetch which used vulnerable version of rollup (#2…

…8575)
hashicorp · Oct 3, 2024 · e8a432c · e8a432c
1 parent baf794b
commit e8a432c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 273 deletions.
diff --git a/ui/app/adapters/application.js b/ui/app/adapters/application.js
@@ -9,7 +9,6 @@ import { service } from '@ember/service';
 import { set } from '@ember/object';
 import RSVP from 'rsvp';
 import config from '../config/environment';
-import fetch from 'fetch';
 
 const { APP } = config;
 const { POLLING_URLS, NAMESPACE_ROOT_URLS } = APP;

diff --git a/ui/app/components/raft-storage-restore.js b/ui/app/components/raft-storage-restore.js
@@ -8,7 +8,6 @@ import { task } from 'ember-concurrency';
 import { getOwner } from '@ember/owner';
 import { service } from '@ember/service';
 import { alias } from '@ember/object/computed';
-import { AbortController } from 'fetch';
 
 export default Component.extend({
   file: null,

diff --git a/ui/app/services/auth.js b/ui/app/services/auth.js
@@ -11,7 +11,6 @@ import { computed, get } from '@ember/object';
 import { alias } from '@ember/object/computed';
 import Service, { inject as service } from '@ember/service';
 import { capitalize } from '@ember/string';
-import fetch from 'fetch';
 import { resolve, reject } from 'rsvp';
 
 import getStorage from 'vault/lib/token-storage';

diff --git a/ui/mirage/handlers/mfa-login.js b/ui/mirage/handlers/mfa-login.js
@@ -5,7 +5,6 @@
 
 import { Response } from 'miragejs';
 import Ember from 'ember';
-import fetch from 'fetch';
 
 // initial auth response cache -- lookup by mfa_request_id key
 const authResponses = {};

diff --git a/ui/package.json b/ui/package.json
@@ -126,7 +126,6 @@
     "ember-data": "~4.12.4",
     "ember-engines": "0.8.23",
     "ember-exam": "^9.0.0",
-    "ember-fetch": "^8.1.2",
     "ember-inflector": "4.0.2",
     "ember-load-initializers": "^2.1.2",
     "ember-modal-dialog": "^4.0.1",

diff --git a/ui/tests/integration/components/clients/page-header-test.js b/ui/tests/integration/components/clients/page-header-test.js
@@ -5,7 +5,7 @@
 
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'vault/tests/helpers';
-import { click, fillIn, render } from '@ember/test-helpers';
+import { click, fillIn, render, waitFor, waitUntil } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import { Response } from 'miragejs';
@@ -79,6 +79,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
 
     await click(CLIENT_COUNT.exportButton);
     await click(GENERAL.confirmButton);
+    await waitFor('[data-test-export-error]');
     assert.dom('[data-test-export-error]').hasText('permission denied');
   });
 
@@ -98,6 +99,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
     await click(CLIENT_COUNT.exportButton);
     await fillIn('[data-test-download-format]', 'jsonl');
     await click(GENERAL.confirmButton);
+    await waitUntil(() => this.downloadStub.calledOnce);
     const extension = this.downloadStub.lastCall.args[2];
     assert.strictEqual(extension, 'jsonl');
   });
@@ -119,6 +121,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
     await click(CLIENT_COUNT.exportButton);
     await fillIn('[data-test-download-format]', 'csv');
     await click(GENERAL.confirmButton);
+    await waitUntil(() => this.downloadStub.calledOnce);
     const extension = this.downloadStub.lastCall.args[2];
     assert.strictEqual(extension, 'csv');
   });
@@ -175,6 +178,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
 
     await click(CLIENT_COUNT.exportButton);
     await click(GENERAL.confirmButton);
+    await waitFor('[data-test-export-error]');
     assert.dom('[data-test-export-error]').hasText('no data to export in provided time range.');
   });
 
@@ -184,6 +188,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
     ];
     await this.renderComponent();
     await click(CLIENT_COUNT.exportButton);
+    await waitFor('[data-test-export-upgrade-warning]');
     assert.dom('[data-test-export-upgrade-warning]').includesText('1.10.1 (Nov 18, 2021)');
   });
 
@@ -202,6 +207,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
       await this.renderComponent();
       await click(CLIENT_COUNT.exportButton);
       await click(GENERAL.confirmButton);
+      await waitUntil(() => this.downloadStub.calledOnce);
       const args = this.downloadStub.lastCall.args;
       const [filename] = args;
       assert.strictEqual(filename, 'clients_export_June 2022-December 2022', 'csv has expected filename');
@@ -222,6 +228,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
 
       await click(CLIENT_COUNT.exportButton);
       await click(GENERAL.confirmButton);
+      await waitUntil(() => this.downloadStub.calledOnce);
       const [filename] = this.downloadStub.lastCall.args;
       assert.strictEqual(filename, 'clients_export_June 2022', 'csv has single month in filename');
     });
@@ -241,6 +248,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
 
       await click(CLIENT_COUNT.exportButton);
       await click(GENERAL.confirmButton);
+      await waitUntil(() => this.downloadStub.calledOnce);
       const [filename] = this.downloadStub.lastCall.args;
       assert.strictEqual(filename, 'clients_export');
     });
@@ -263,6 +271,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
 
       await click(CLIENT_COUNT.exportButton);
       await click(GENERAL.confirmButton);
+      await waitUntil(() => this.downloadStub.calledOnce);
       const [filename] = this.downloadStub.lastCall.args;
       assert.strictEqual(filename, 'clients_export_bar');
     });
@@ -284,6 +293,7 @@ module('Integration | Component | clients/page-header', function (hooks) {
 
       await click(CLIENT_COUNT.exportButton);
       await click(GENERAL.confirmButton);
+      await waitUntil(() => this.downloadStub.calledOnce);
       const [filename] = this.downloadStub.lastCall.args;
       assert.strictEqual(filename, 'clients_export_foo');
     });

diff --git a/ui/tests/integration/components/raft-storage-restore-test.js b/ui/tests/integration/components/raft-storage-restore-test.js
@@ -6,7 +6,7 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-import { render, triggerEvent, click } from '@ember/test-helpers';
+import { render, triggerEvent, click, waitFor } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 
 module('Integration | Component | raft-storage-restore', function (hooks) {
@@ -30,6 +30,7 @@ module('Integration | Component | raft-storage-restore', function (hooks) {
       files: [new Blob(['Raft Snapshot'])],
     });
     await click('[data-test-edit-form-submit]');
+    await waitFor('#force-restore');
     await click('#force-restore');
     await click('[data-test-edit-form-submit]');
   });