Adds types to FetchService

web/app/components/inputs/people-select.ts

@@ -3,6 +3,8 @@ import { tracked } from "@glimmer/tracking";
 import { inject as service } from "@ember/service";
 import { task } from "ember-concurrency";
 import { action } from "@ember/object";
+import FetchService from "hermes/services/fetch";
+import { assert } from "@ember/debug";
 
 export interface Person {
   emailAddresses: { value: string }[];
@@ -18,9 +20,7 @@ interface PeopleSelectComponentSignature {
 }
 
 export default class PeopleSelectComponent extends Component<PeopleSelectComponentSignature> {
-  // @ts-ignore
-  // FetchService not yet in the registry
-  @service("fetch") declare fetchSvc: any;
+  @service("fetch") declare fetchSvc: FetchService;
 
   /**
    * The list of people to display in the dropdown.
@@ -66,7 +66,7 @@ export default class PeopleSelectComponent extends Component<PeopleSelectCompone
         }),
       });
 
-      const peopleJson = await res.json();
+      const peopleJson = await res?.json();
 
       if (peopleJson) {
         this.people = peopleJson.map((p: Person) => {

web/app/routes/authenticated/drafts.ts

@@ -93,7 +93,10 @@ export default class DraftsRoute extends Route {
             "/api/v1/drafts?" +
               this.createDraftURLSearchParams(params, ownerFacetOnly)
           )
-          .then((response) => response.json());
+          .then((response) => {
+            assert("response must be defined", response);
+            return response.json();
+          });
         return response;
       } catch (e: unknown) {
         console.error(e);

web/app/routes/authenticated/settings.ts

@@ -4,6 +4,7 @@ import ConfigService from "hermes/services/config";
 import AlgoliaService from "hermes/services/algolia";
 import FetchService from "hermes/services/fetch";
 import AuthenticatedUserService from "hermes/services/authenticated-user";
+import { assert } from "@ember/debug";
 
 export default class SettingsRoute extends Route {
   @service("config") declare configSvc: ConfigService;
@@ -15,7 +16,9 @@ export default class SettingsRoute extends Route {
     const allProducts = await this.fetchSvc
       .fetch("/api/v1/products")
       .then((resp) => {
-        return resp.json()})
+        assert("response must be defined", resp);
+        return resp.json();
+      })
       .catch((err) => {
         console.log(`Error requesting products: ${err}`);
       });

web/app/services/authenticated-user.ts

@@ -83,6 +83,8 @@ export default class AuthenticatedUserService extends Service {
             this.session.data.authenticated.access_token,
         },
       });
+
+      assert('response must be defined', response)
       let subscriptions: string[] = await response.json();
 
       let newSubscriptions: Subscription[] = [];

web/app/services/fetch.ts

@@ -1,13 +1,20 @@
-// @ts-nocheck
-// TODO: Type this file.
 import Service from "@ember/service";
 import fetch from "fetch";
 import { inject as service } from "@ember/service";
+import SessionService from "./session";
+
+interface FetchOptions {
+  method?: string;
+  headers?: {
+    [key: string]: string;
+  };
+  body?: string;
+}
 
 export default class FetchService extends Service {
-  @service session;
+  @service declare session: SessionService;
 
-  async fetch(url, options = {}) {
+  async fetch(url: string, options: FetchOptions = {}) {
     // Add the Google access token in a header (for auth) if the URL starts with
     // a frontslash, which will only target the application backend.
     if (Array.from(url)[0] == "/") {
@@ -18,7 +25,6 @@ export default class FetchService extends Service {
       };
     }
     try {
-
       const resp = await fetch(url, options);
 
       if (!resp.ok) {

web/tsconfig.json

@@ -12,7 +12,8 @@
       "hermes/tests/*": ["tests/*"],
       "hermes/*": ["app/*"],
       "hermes/mirage/*": ["mirage/*"],
-      "*": ["types/*"]
+      "*": ["types/*"],
+      "fetch": ["node_modules/ember-fetch"]
     }
   },
   "include": ["app/**/*", "tests/**/*", "types/**/*"]