chore: convert various files from JS to TS (#2010)

10 files changed, 62 insertions, 31 deletions

diff --git a/src/api/AppApi.js b/src/api/AppApi.ts
index 411c187f4..6e5e5c806 100644
--- a/src/api/AppApi.js
+++ b/src/api/AppApi.ts
@@ -1,5 +1,7 @@
 export default class AppApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
diff --git a/src/api/FeaturesApi.js b/src/api/FeaturesApi.ts
index c66f28f5b..ccad4a189 100644
--- a/src/api/FeaturesApi.js
+++ b/src/api/FeaturesApi.ts
@@ -1,5 +1,7 @@
 export default class FeaturesApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
diff --git a/src/api/LocalApi.js b/src/api/LocalApi.ts
index ccdedd3f5..0140a5450 100644
--- a/src/api/LocalApi.js
+++ b/src/api/LocalApi.ts
@@ -1,14 +1,18 @@
 export default class LocalApi {
-  constructor(server, local) {
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
     this.local = local;
   }
 
-  getAppSettings(type) {
+  getAppSettings(type: any) {
     return this.local.getAppSettings(type);
   }
 
-  updateAppSettings(type, data) {
+  updateAppSettings(type: any, data: any) {
     return this.local.updateAppSettings(type, data);
   }
 
diff --git a/src/api/NewsApi.js b/src/api/NewsApi.ts
index 294957511..31d3d903b 100644
--- a/src/api/NewsApi.js
+++ b/src/api/NewsApi.ts
@@ -1,5 +1,9 @@
 export default class NewsApi {
-  constructor(server, local) {
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
     this.local = local;
   }
@@ -8,7 +12,7 @@ export default class NewsApi {
     return this.server.getLatestNews();
   }
 
-  hide(id) {
+  hide(id: any) {
     return this.server.hideNews(id);
   }
 }
diff --git a/src/api/RecipePreviewsApi.js b/src/api/RecipePreviewsApi.ts
index a56fa587f..78f2a9596 100644
--- a/src/api/RecipePreviewsApi.js
+++ b/src/api/RecipePreviewsApi.ts
@@ -1,5 +1,7 @@
 export default class RecipePreviewsApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
@@ -11,7 +13,7 @@ export default class RecipePreviewsApi {
     return this.server.getFeaturedRecipePreviews();
   }
 
-  search(needle) {
+  search(needle: string) {
     return this.server.searchRecipePreviews(needle);
   }
 }
diff --git a/src/api/RecipesApi.js b/src/api/RecipesApi.ts
index 800888b00..11d2241b5 100644
--- a/src/api/RecipesApi.js
+++ b/src/api/RecipesApi.ts
@@ -1,5 +1,7 @@
 export default class RecipesApi {
-  constructor(server) {
+  server: any;
+
+  constructor(server: any) {
     this.server = server;
   }
 
@@ -7,11 +9,11 @@ export default class RecipesApi {
     return this.server.getInstalledRecipes();
   }
 
-  install(recipeId) {
+  install(recipeId: string) {
     return this.server.getRecipePackage(recipeId);
   }
 
-  update(recipes) {
+  update(recipes: any) {
     return this.server.getRecipeUpdates(recipes);
   }
 }
diff --git a/src/api/ServicesApi.js b/src/api/ServicesApi.ts
index 85efd26a6..5bd8aa60e 100644
--- a/src/api/ServicesApi.js
+++ b/src/api/ServicesApi.ts
@@ -1,30 +1,34 @@
 export default class ServicesApi {
-  constructor(server, local) {
-    this.local = local;
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
+    this.local = local;
   }
 
   all() {
     return this.server.getServices();
   }
 
-  create(recipeId, data) {
+  create(recipeId: string, data: any) {
     return this.server.createService(recipeId, data);
   }
 
-  delete(serviceId) {
+  delete(serviceId: string) {
     return this.server.deleteService(serviceId);
   }
 
-  update(serviceId, data) {
+  update(serviceId: string, data: any) {
     return this.server.updateService(serviceId, data);
   }
 
-  reorder(data) {
+  reorder(data: any) {
     return this.server.reorderService(data);
   }
 
-  clearCache(serviceId) {
+  clearCache(serviceId: string) {
     return this.local.clearCache(serviceId);
   }
 }
diff --git a/src/api/UserApi.js b/src/api/UserApi.ts
index edfb88988..31c8acead 100644
--- a/src/api/UserApi.js
+++ b/src/api/UserApi.ts
@@ -1,12 +1,17 @@
+import { BinaryLike } from 'crypto';
 import { hash } from '../helpers/password-helpers';
 
 export default class UserApi {
-  constructor(server, local) {
+  server: any;
+
+  local: any;
+
+  constructor(server: any, local: any) {
     this.server = server;
     this.local = local;
   }
 
-  login(email, password) {
+  login(email: string, password: BinaryLike) {
     return this.server.login(email, hash(password));
   }
 
@@ -14,18 +19,18 @@ export default class UserApi {
     return this;
   }
 
-  signup(data) {
+  signup(data: { password: BinaryLike }) {
     Object.assign(data, {
       password: hash(data.password),
     });
     return this.server.signup(data);
   }
 
-  password(email) {
+  password(email: string) {
     return this.server.retrievePassword(email);
   }
 
-  invite(data) {
+  invite(data: any) {
     return this.server.inviteUser(data);
   }
 
@@ -33,7 +38,7 @@ export default class UserApi {
     return this.server.userInfo();
   }
 
-  updateInfo(data) {
+  updateInfo(data: { oldPassword: string; newPassword: string }) {
     const userData = data;
     if (userData.oldPassword && userData.newPassword) {
       userData.oldPassword = hash(userData.oldPassword);
diff --git a/src/api/index.js b/src/api/index.ts
index ed6c13488..73f613da1 100644
--- a/src/api/index.js
+++ b/src/api/index.ts
@@ -7,12 +7,12 @@ import LocalApi from './LocalApi';
 import NewsApi from './NewsApi';
 import FeaturesApi from './FeaturesApi';
 
-export default (server, local) => ({
-  app: new AppApi(server, local),
+export default (server: any, local: any) => ({
+  app: new AppApi(server),
   services: new ServicesApi(server, local),
-  recipePreviews: new RecipePreviewsApi(server, local),
-  recipes: new RecipesApi(server, local),
-  features: new FeaturesApi(server, local),
+  recipePreviews: new RecipePreviewsApi(server),
+  recipes: new RecipesApi(server),
+  features: new FeaturesApi(server),
   user: new UserApi(server, local),
   local: new LocalApi(server, local),
   news: new NewsApi(server, local),
diff --git a/src/api/utils/auth.js b/src/api/utils/auth.ts
index 07b0c096b..98295d1a4 100644
--- a/src/api/utils/auth.js
+++ b/src/api/utils/auth.ts
@@ -15,6 +15,7 @@ export const prepareAuthRequest = (
       'X-Franz-platform': process.platform,
       'X-Franz-Timezone-Offset': new Date().getTimezoneOffset(),
       'X-Franz-System-Locale': ferdiLocale,
+      // @ts-expect-error Property 'headers' does not exist on type '{ method: string; }'.
       ...options.headers,
     },
   });
@@ -28,5 +29,10 @@ export const prepareAuthRequest = (
   return request;
 };
 
-export const sendAuthRequest = (url, options, auth) =>
+export const sendAuthRequest = (
+  url: RequestInfo,
+  options: { method: string } | undefined,
+  auth?: boolean,
+) =>
+  // @ts-expect-error Argument of type '{ method: string; } & { mode: string; headers: any; }' is not assignable to parameter of type 'RequestInit | undefined'.
   window.fetch(url, prepareAuthRequest(options, auth));