3 files changed, 61 insertions, 27 deletions

diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.ts
index e2c0c08ef..b63c252df 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.ts
@@ -1,8 +1,6 @@
 import { computed, observable, runInAction } from 'mobx';
 
-import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
-
 import serviceProxy from '../features/serviceProxy';
 import basicAuth from '../features/basicAuth';
 import workspaces from '../features/workspaces';
@@ -11,8 +9,9 @@ import publishDebugInfo from '../features/publishDebugInfo';
 import communityRecipes from '../features/communityRecipes';
 import todos from '../features/todos';
 import appearance from '../features/appearance';
+import TypedStore from './lib/TypedStore';
 
-export default class FeaturesStore extends Store {
+export default class FeaturesStore extends TypedStore {
   @observable defaultFeaturesRequest = new CachedRequest(
     this.api.features,
     'default',
@@ -25,7 +24,7 @@ export default class FeaturesStore extends Store {
 
   @observable features = {};
 
-  async setup() {
+  async setup(): Promise<void> {
     this.registerReactions([
       this._updateFeatures,
       this._monitorLoginStatus.bind(this),
@@ -35,11 +34,11 @@ export default class FeaturesStore extends Store {
     setTimeout(this._setupFeatures.bind(this), 1);
   }
 
-  @computed get anonymousFeatures() {
+  @computed get anonymousFeatures(): any {
     return this.defaultFeaturesRequest.execute().result || {};
   }
 
-  _updateFeatures = () => {
+  _updateFeatures = (): void => {
     const features = {};
     if (this.stores.user.isLoggedIn) {
       let requestResult = {};
@@ -55,7 +54,7 @@ export default class FeaturesStore extends Store {
     });
   };
 
-  _monitorLoginStatus() {
+  _monitorLoginStatus(): void {
     if (this.stores.user.isLoggedIn) {
       this.featuresRequest.invalidate({ immediately: true });
     } else {
@@ -64,7 +63,7 @@ export default class FeaturesStore extends Store {
     }
   }
 
-  _setupFeatures() {
+  _setupFeatures(): void {
     serviceProxy(this.stores);
     basicAuth();
     workspaces(this.stores, this.actions);
diff --git a/src/stores/GlobalErrorStore.js b/src/stores/GlobalErrorStore.ts
index 356a6f298..cb364574b 100644
--- a/src/stores/GlobalErrorStore.js
+++ b/src/stores/GlobalErrorStore.ts
@@ -1,35 +1,61 @@
 import { observable, action } from 'mobx';
-import Store from './lib/Store';
+import { Actions } from 'src/actions/lib/actions';
+import { ApiInterface } from 'src/api';
+import { Stores } from 'src/stores.types';
 import Request from './lib/Request';
+import TypedStore from './lib/TypedStore';
 
-export default class GlobalErrorStore extends Store {
-  @observable error = null;
+interface Message {
+  type: 'error' | 'log' | 'info';
+  error?: {
+    message?: string;
+    status?: number;
+  };
+  request?: {
+    result: any;
+    wasExecuted: any;
+    method: any;
+  };
+  response?: any;
+  server?: any;
+  info?: any;
+  url?: string;
+  line?: number;
+}
+
+export default class GlobalErrorStore extends TypedStore {
+  @observable error: any | null = null;
 
-  @observable messages = [];
+  @observable messages: Message[] = [];
 
-  @observable response = {};
+  @observable response: object = {};
 
-  constructor(...args) {
-    super(...args);
+  // TODO: Get rid of the @ts-ignores in this function.
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
-    window.addEventListener('error', (...errorArgs) => {
+    window.addEventListener('error', (...errorArgs: any[]): void => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['error', ...errorArgs]);
     });
 
     const origConsoleError = console.error;
-    window.console.error = (...errorArgs) => {
+    window.console.error = (...errorArgs: any[]) => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['error', ...errorArgs]);
       origConsoleError.apply(this, errorArgs);
     };
 
     const origConsoleLog = console.log;
-    window.console.log = (...logArgs) => {
+    window.console.log = (...logArgs: any[]) => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['log', ...logArgs]);
       origConsoleLog.apply(this, logArgs);
     };
 
     const origConsoleInfo = console.info;
-    window.console.info = (...infoArgs) => {
+    window.console.info = (...infoArgs: any[]) => {
+      // @ts-ignore ts-message: Expected 5 arguments, but got 2.
       this._handleConsoleError.call(this, ['info', ...infoArgs]);
       origConsoleInfo.apply(this, infoArgs);
     };
@@ -37,7 +63,11 @@ export default class GlobalErrorStore extends Store {
     Request.registerHook(this._handleRequests);
   }
 
-  _handleConsoleError(type, error, url, line) {
+  async setup(): Promise<void> {
+    // Not implemented
+  }
+
+  _handleConsoleError(type: any, error: any, url: string, line: number) {
     if (typeof type === 'object' && type.length > 0) {
       this.messages.push({
         type: type[0],
@@ -53,7 +83,13 @@ export default class GlobalErrorStore extends Store {
     }
   }
 
-  _handleRequests = action(async request => {
+  @action _handleRequests = async (request: {
+    isError: any;
+    error: { json: () => object | PromiseLike<object> };
+    result: any;
+    wasExecuted: any;
+    _method: any;
+  }): Promise<void> => {
     if (request.isError) {
       this.error = request.error;
 
@@ -63,9 +99,8 @@ export default class GlobalErrorStore extends Store {
         } catch {
           this.response = {};
         }
-        if (this.error.status === 401) {
+        if (this.error?.status === 401) {
           window['ferdium'].stores.app.authRequestFailed = true;
-          // this.actions.user.logout({ serverLogout: true });
         }
       }
 
@@ -83,5 +118,5 @@ export default class GlobalErrorStore extends Store {
     } else {
       window['ferdium'].stores.app.authRequestFailed = false;
     }
-  });
+  };
 }
diff --git a/src/stores/lib/TypedStore.ts b/src/stores/lib/TypedStore.ts
index 5d8bf3bbd..7f9d2d60f 100644
--- a/src/stores/lib/TypedStore.ts
+++ b/src/stores/lib/TypedStore.ts
@@ -18,9 +18,9 @@ export default abstract class TypedStore {
   }
 
   constructor(
-    public stores: Stores,
-    public api: ApiInterface,
-    public actions: Actions,
+    public readonly stores: Stores,
+    public readonly api: ApiInterface,
+    public readonly actions: Actions,
   ) {}
 
   registerReactions(reactions: { (r: IReactionPublic): void }[]): void {