diff --git a/frontend/app/analysis/index/controller.js b/frontend/app/analysis/index/controller.js index da2b2cd1d..4a948c0bd 100644 --- a/frontend/app/analysis/index/controller.js +++ b/frontend/app/analysis/index/controller.js @@ -11,7 +11,6 @@ import { task, hash, } from "ember-concurrency"; -import fetch from "fetch"; import moment from "moment"; import config from "../../config/environment"; @@ -319,7 +318,7 @@ export default class AnalysisController extends QPController { ), ); - const res = await fetch(`${url}?${queryString}`, { + const res = await window.fetch(`${url}?${queryString}`, { headers: { Authorization: `Bearer ${this.jwt}`, }, diff --git a/frontend/app/services/fetch.js b/frontend/app/services/fetch.js index 5dbd6f60b..ac21263b3 100644 --- a/frontend/app/services/fetch.js +++ b/frontend/app/services/fetch.js @@ -1,8 +1,6 @@ import Service, { service } from "@ember/service"; import { isEmpty } from "@ember/utils"; -import { isUnauthorizedResponse } from "ember-fetch/errors"; import { handleUnauthorized } from "ember-simple-auth-oidc"; -import fetch from "fetch"; const CONTENT_TYPE = "application/vnd.api+json"; @@ -53,10 +51,10 @@ export default class FetchService extends Service { init.body = stringifyBodyData(init); } - const response = await fetch(resource, init); + const response = await window.fetch(resource, init); if (!response.ok) { - if (isUnauthorizedResponse(response)) { + if (response.status === 401) { /* istanbul ignore next */ return handleUnauthorized(this.session); } diff --git a/frontend/ember-cli-build.js b/frontend/ember-cli-build.js index 9ff7d0ec5..f9196a564 100644 --- a/frontend/ember-cli-build.js +++ b/frontend/ember-cli-build.js @@ -26,9 +26,6 @@ module.exports = function (defaults) { // sassOptions: { // onlyIncluded: true, // }, - "ember-fetch": { - preferNative: true, - }, "ember-simple-auth": { useSessionSetupMethod: true, }, diff --git a/frontend/package.json b/frontend/package.json index a7a9f9a53..c70f57cac 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -73,7 +73,6 @@ "ember-data": "5.3.4", "ember-decorators": "6.1.1", "ember-event-helpers": "^0.1.1", - "ember-fetch": "8.1.2", "ember-focus-trap": "^1.1.1", "ember-in-viewport": "4.1.0", "ember-keyboard": "^9.0.1", @@ -154,4 +153,4 @@ } }, "packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0" -} \ No newline at end of file +} diff --git a/frontend/pnpm-lock.yaml b/frontend/pnpm-lock.yaml index 8d283ec37..f56f63f5f 100644 --- a/frontend/pnpm-lock.yaml +++ b/frontend/pnpm-lock.yaml @@ -155,9 +155,6 @@ importers: ember-event-helpers: specifier: ^0.1.1 version: 0.1.1 - ember-fetch: - specifier: 8.1.2 - version: 8.1.2(encoding@0.1.13) ember-focus-trap: specifier: ^1.1.1 version: 1.1.1(ember-source@5.4.1(@babel/core@7.22.9)(@glimmer/component@1.1.2(@babel/core@7.22.9))(@glint/template@1.4.0)(rsvp@4.8.5)(webpack@5.98.0))