chore: convert the last few stores to typescript

14 files changed, 186 insertions, 211 deletions

diff --git a/src/I18n.tsx b/src/I18n.tsx
index f5e157d97..1be6ab23d 100644
--- a/src/I18n.tsx
+++ b/src/I18n.tsx
@@ -17,7 +17,7 @@ type Props = {
 };
 
 class I18N extends Component<Props> {
-  componentDidUpdate() {
+  componentDidUpdate(): void {
     window['ferdium'].menu.rebuild();
   }
 
diff --git a/src/containers/auth/ImportScreen.tsx b/src/containers/auth/ImportScreen.tsx
index 756a2e59c..8d318cb2d 100644
--- a/src/containers/auth/ImportScreen.tsx
+++ b/src/containers/auth/ImportScreen.tsx
@@ -1,17 +1,17 @@
 import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
 import { RouterStore } from 'mobx-react-router';
+import { UserStore } from 'src/stores.types';
 import Import from '../../components/auth/Import';
-import UserStore from '../../stores/UserStore';
 
 interface IProps {
   actions: {
-    user: UserStore,
-  },
+    user: UserStore;
+  };
   stores: {
-    user: UserStore,
-    router: RouterStore,
-  }
+    user: UserStore;
+    router: RouterStore;
+  };
 }
 
 class ImportScreen extends Component<IProps> {
diff --git a/src/containers/auth/LockedScreen.tsx b/src/containers/auth/LockedScreen.tsx
index e6bb5e8e4..500bff0d6 100644
--- a/src/containers/auth/LockedScreen.tsx
+++ b/src/containers/auth/LockedScreen.tsx
@@ -1,20 +1,20 @@
-import { Component } from 'react';
+import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
+import { SettingsStore } from 'src/stores.types';
 import Locked from '../../components/auth/Locked';
-import SettingsStore from '../../stores/SettingsStore';
 
 import { hash } from '../../helpers/password-helpers';
 import UserStore from '../../stores/UserStore';
 
 interface IProps {
   actions: {
-    settings: SettingsStore,
-  },
+    settings: SettingsStore;
+  };
   stores: {
-    settings: SettingsStore,
-    user: UserStore,
-  }
-};
+    settings: SettingsStore;
+    user: UserStore;
+  };
+}
 
 class LockedScreen extends Component<IProps> {
   state = {
@@ -28,7 +28,7 @@ class LockedScreen extends Component<IProps> {
     this.unlock = this.unlock.bind(this);
   }
 
-  onSubmit(values) {
+  onSubmit(values): void {
     const { password } = values;
 
     let correctPassword = this.props.stores.settings.all.app.lockedPassword;
@@ -52,7 +52,7 @@ class LockedScreen extends Component<IProps> {
     }
   }
 
-  unlock() {
+  unlock(): void {
     this.props.actions.settings.update({
       type: 'app',
       data: {
@@ -61,7 +61,7 @@ class LockedScreen extends Component<IProps> {
     });
   }
 
-  render() {
+  render(): ReactElement {
     const { stores } = this.props;
     const { useTouchIdToUnlock } = this.props.stores.settings.all.app;
 
diff --git a/src/containers/auth/PasswordScreen.tsx b/src/containers/auth/PasswordScreen.tsx
index 864a11fa7..d88549712 100644
--- a/src/containers/auth/PasswordScreen.tsx
+++ b/src/containers/auth/PasswordScreen.tsx
@@ -1,15 +1,15 @@
 import { Component } from 'react';
 import { inject, observer } from 'mobx-react';
+import { UserStore } from 'src/stores.types';
 import Password from '../../components/auth/Password';
-import UserStore from '../../stores/UserStore';
 
 interface IProps {
   actions: {
-    user: UserStore,
-  },
+    user: UserStore;
+  };
   stores: {
-    user: UserStore,
-  }
+    user: UserStore;
+  };
 };
 
 class PasswordScreen extends Component<IProps> {
diff --git a/src/electron-util.ts b/src/electron-util.ts
index 4576de9a6..6250366dc 100644
--- a/src/electron-util.ts
+++ b/src/electron-util.ts
@@ -3,7 +3,7 @@
 import * as electron from 'electron';
 import { initialize, enable } from '@electron/remote/main';
 
-export const initializeRemote = () => {
+export const initializeRemote = (): void => {
   if (process.type !== 'browser') {
     throw new Error(
       'The remote api must be initialized from the main process.',
@@ -13,7 +13,7 @@ export const initializeRemote = () => {
   initialize();
 };
 
-export const enableWebContents = (webContents: electron.WebContents) => {
+export const enableWebContents = (webContents: electron.WebContents): void => {
   enable(webContents);
 };
 
diff --git a/src/enforce-macos-app-location.ts b/src/enforce-macos-app-location.ts
index 882a4664b..3661d08a5 100644
--- a/src/enforce-macos-app-location.ts
+++ b/src/enforce-macos-app-location.ts
@@ -4,7 +4,7 @@ import { isMac } from './environment';
 import { isDevMode } from './environment-remote';
 import { api } from './electron-util';
 
-export function enforceMacOSAppLocation() {
+export function enforceMacOSAppLocation(): void {
   if (isDevMode || !isMac || api.app.isInApplicationsFolder()) {
     return;
   }
diff --git a/src/environment-remote.ts b/src/environment-remote.ts
index 298004b90..0cd5d2ce4 100644
--- a/src/environment-remote.ts
+++ b/src/environment-remote.ts
@@ -26,8 +26,8 @@ import {
 import * as buildInfo from './buildInfo.json';
 
 export const { app } = electronApi;
-export const ferdiumVersion = app.getVersion();
-export const ferdiumLocale = app.getLocale();
+export const ferdiumVersion: string = app.getVersion();
+export const ferdiumLocale: string = app.getLocale();
 
 // Set app directory before loading user modules
 if (process.env.FERDIUM_APPDATA_DIR != null) {
@@ -44,7 +44,7 @@ if (process.env.FERDIUM_APPDATA_DIR != null) {
   app.setPath('userData', join(app.getPath('appData'), app.name));
 }
 
-export const isDevMode =
+export const isDevMode: boolean =
   process.env.ELECTRON_IS_DEV !== undefined
     ? Number.parseInt(process.env.ELECTRON_IS_DEV, 10) === 1
     : !app.isPackaged;
@@ -52,11 +52,11 @@ if (isDevMode) {
   app.setPath('userData', join(app.getPath('appData'), `${app.name}Dev`));
 }
 
-export function userDataPath(...segments: string[]) {
+export function userDataPath(...segments: string[]): string {
   return join(app.getPath('userData'), ...[segments].flat());
 }
 
-export function userDataRecipesPath(...segments: string[]) {
+export function userDataRecipesPath(...segments: string[]): string {
   return userDataPath('recipes', ...[segments].flat());
 }
 
@@ -84,13 +84,13 @@ if (!isDevMode || (isDevMode && useLiveAPI)) {
   todos = PRODUCTION_TODOS_FRONTEND_URL;
 }
 
-export const API = api;
-export const API_VERSION = 'v1';
-export const WS_API = wsApi;
-export const WEBSITE = web;
-export const TODOS_FRONTEND = todos;
+export const API: string = api;
+export const API_VERSION: string = 'v1';
+export const WS_API: string = wsApi;
+export const WEBSITE: string = web;
+export const TODOS_FRONTEND: string = todos;
 
-export function aboutAppDetails() {
+export function aboutAppDetails(): string {
   return [
     `Version: ${ferdiumVersion}`,
     `Electron: ${electronVersion}`,
diff --git a/src/environment.ts b/src/environment.ts
index 7208b16b6..271bc7571 100644
--- a/src/environment.ts
+++ b/src/environment.ts
@@ -6,18 +6,18 @@ export const isMac = process.platform === 'darwin';
 export const isWindows = process.platform === 'win32';
 export const isLinux = process.platform === 'linux';
 
-export const electronVersion = process.versions.electron;
-export const chromeVersion = process.versions.chrome;
-export const nodeVersion = process.versions.node;
+export const electronVersion: string = process.versions.electron;
+export const chromeVersion: string = process.versions.chrome;
+export const nodeVersion: string = process.versions.node;
 
-export const osArch = arch();
-export const osRelease = release();
-export const is64Bit = osArch.match(/64/);
+export const osArch: string = arch();
+export const osRelease: string = release();
+export const is64Bit: RegExpMatchArray | null = osArch.match(/64/);
 
 // for accelerator, show the shortform that electron/OS understands
 // for tooltip, show symbol
-const ctrlKey = isMac ? '⌘' : 'Ctrl';
-const cmdKey = isMac ? 'Cmd' : 'Ctrl';
+const ctrlKey: string = isMac ? '⌘' : 'Ctrl';
+const cmdKey: string = isMac ? 'Cmd' : 'Ctrl';
 
 export const altKey = (isAccelerator = true) =>
   !isAccelerator && isMac ? '⌥' : 'Alt';
diff --git a/src/routes.tsx b/src/routes.tsx
index b8f649740..490d13ee8 100644
--- a/src/routes.tsx
+++ b/src/routes.tsx
@@ -1,4 +1,4 @@
-import { Component } from 'react';
+import { Component, ReactElement } from 'react';
 import { inject, observer } from 'mobx-react';
 import { Router, Route, IndexRedirect } from 'react-router';
 
@@ -31,8 +31,7 @@ type Props = {
 };
 
 class Routes extends Component<Props> {
-  render() {
-
+  render(): ReactElement {
     const { history } = this.props;
 
     return (
diff --git a/src/stores.types.ts b/src/stores.types.ts
index 24eefc416..1899db92c 100644
--- a/src/stores.types.ts
+++ b/src/stores.types.ts
@@ -2,6 +2,7 @@ import Workspace from './features/workspaces/models/Workspace';
 import Recipe from './models/Recipe';
 import Service from './models/Service';
 import User from './models/User';
+import { Request } from './stores/lib/Request';
 import { CachedRequest } from './stores/lib/CachedRequest';
 import Reaction from './stores/lib/Reaction';
 
@@ -98,6 +99,7 @@ interface AppStore extends TypedStore {
   isSystemDarkModeEnabled: () => void;
   isSystemMuteOverridden: () => void;
   locale: () => void;
+  lockedPassword: string;
   reloadAfterResume: boolean;
   reloadAfterResumeTime: number;
   searchEngine: string;
@@ -192,7 +194,7 @@ interface RouterStore {
 
 export interface ServicesStore extends TypedStore {
   clearCacheRequest: () => void;
-  createServiceRequest: () => void;
+  createServiceRequest: CachedRequest;
   deleteServiceRequest: () => void;
   allServicesRequest: CachedRequest;
   filterNeedle: string;
@@ -216,7 +218,9 @@ interface ISettings {
   [key: string]: any;
 }
 
-interface SettingsStore extends TypedStore {
+export interface SettingsStore extends TypedStore {
+  update: (value: any) => void;
+  remove: (value: any) => void;
   fileSystemSettingsTypes: any[];
   loaded: boolean;
   updateAppSettingsRequest: () => void;
@@ -247,6 +251,7 @@ interface TodosStore extends TypedStore {
   isFeatureEnabledByUser: () => void;
   isTodoUrlValid: () => void;
   isTodosPanelForceHidden: () => void;
+  isTodosEnabled: boolean;
   isTodosPanelVisible: () => void;
   isUsingPredefinedTodoServer: () => void;
   settings: {
@@ -274,7 +279,7 @@ interface UIStore extends TypedStore {
   theme: () => void;
 }
 
-interface UserStore extends TypedStore {
+export interface UserStore extends TypedStore {
   BASE_ROUTE: '/auth';
   CHANGE_SERVER_ROUTE: '/auth/server';
   IMPORT_ROUTE: '/auth/signup/import';
@@ -293,30 +298,34 @@ interface UserStore extends TypedStore {
   getUserInfoRequest: CachedRequest;
   hasCompletedSignup: () => void;
   id: () => void;
+  importLegacyServices: () => Promise<void>;
   inviteRequest: () => void;
-  isImportLegacyServicesCompleted: () => void;
-  isImportLegacyServicesExecuting: () => void;
+  isImportLegacyServicesCompleted: boolean;
+  isImportLegacyServicesExecuting: boolean;
   isLoggingOut: () => void;
   loginRequest: () => void;
   logoutReason: () => void;
   logoutReasonTypes: { SERVER: 'SERVER' };
-  passwordRequest: () => void;
+  passwordRequest: Request;
+  retrievePassword: Promise<void>
   signupRequest: () => void;
   updateUserInfoRequest: () => void;
   userData: () => void;
   _requireAuthenticatedUser: () => void;
+  _importLegacyServices: () => void;
+  _retrievePassword: () => void;
   changeServerRoute: () => void;
   data: User;
-  importRoute: () => void;
-  inviteRoute: () => void;
+  importRoute: string;
+  inviteRoute: string;
   isLoggedIn: boolean;
-  isTokenExpired: () => boolean;
+  isTokenExpired: boolean;
   legacyServices: () => void;
-  loginRoute: () => void;
-  logoutRoute: () => void;
-  passwordRoute: () => void;
-  setupRoute: () => void;
-  signupRoute: () => void;
+  loginRoute: string;
+  logoutRoute: string;
+  passwordRoute: string;
+  setupRoute: string;
+  signupRoute: string;
   team: () => void;
 }
 
diff --git a/src/stores/SettingsStore.js b/src/stores/SettingsStore.ts
index 7afecd9df..524f2e50c 100644
--- a/src/stores/SettingsStore.js
+++ b/src/stores/SettingsStore.ts
@@ -2,6 +2,9 @@ import { ipcRenderer } from 'electron';
 import { getCurrentWindow } from '@electron/remote';
 import { action, computed, observable, reaction } from 'mobx';
 import localStorage from 'mobx-localstorage';
+import { Stores } from 'src/stores.types';
+import { ApiInterface } from 'src/api';
+import { Actions } from 'src/actions/lib/actions';
 import {
   DEFAULT_APP_SETTINGS,
   FILE_SYSTEM_SETTINGS_TYPES,
@@ -9,11 +12,11 @@ import {
 } from '../config';
 import { hash } from '../helpers/password-helpers';
 import Request from './lib/Request';
-import Store from './lib/Store';
+import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:SettingsStore');
 
-export default class SettingsStore extends Store {
+export default class SettingsStore extends TypedStore {
   @observable updateAppSettingsRequest = new Request(
     this.api.local,
     'updateAppSettings',
@@ -28,15 +31,15 @@ export default class SettingsStore extends Store {
     proxy: {},
   };
 
-  constructor(...args) {
-    super(...args);
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
     // Register action handlers
     this.actions.settings.update.listen(this._update.bind(this));
     this.actions.settings.remove.listen(this._remove.bind(this));
   }
 
-  async setup() {
+  async setup(): Promise<void> {
     await this._migrate();
 
     reaction(
@@ -81,7 +84,7 @@ export default class SettingsStore extends Store {
       }
     });
 
-    ipcRenderer.on('appSettings', (event, resp) => {
+    ipcRenderer.on('appSettings', (_, resp) => {
       // Lock on startup if enabled in settings
       if (
         !this.loaded &&
@@ -143,7 +146,7 @@ export default class SettingsStore extends Store {
     };
   }
 
-  @action async _update({ type, data }) {
+  @action async _update({ type, data }): Promise<void> {
     const appSettings = this.all;
     if (!this.fileSystemSettingsTypes.includes(type)) {
       debug('Update settings', type, data, this.all);
@@ -159,7 +162,7 @@ export default class SettingsStore extends Store {
     }
   }
 
-  @action async _remove({ type, key }) {
+  @action async _remove({ type, key }): Promise<void> {
     if (type === 'app') return; // app keys can't be deleted
 
     const appSettings = this.all[type];
@@ -173,7 +176,7 @@ export default class SettingsStore extends Store {
     }
   }
 
-  _ensureMigrationAndMarkDone(migrationName, callback) {
+  _ensureMigrationAndMarkDone(migrationName: string, callback: Function): void {
     if (!this.all.migration[migrationName]) {
       callback();
 
@@ -187,7 +190,7 @@ export default class SettingsStore extends Store {
   }
 
   // Helper
-  async _migrate() {
+  async _migrate(): Promise<void> {
     this._ensureMigrationAndMarkDone('password-hashing', () => {
       if (this.stores.settings.app.lockedPassword !== '') {
         const legacySettings = localStorage.getItem('app') || {};
diff --git a/src/stores/UIStore.js b/src/stores/UIStore.ts
index 091b9b8eb..306b14cb1 100644
--- a/src/stores/UIStore.js
+++ b/src/stores/UIStore.ts
@@ -1,17 +1,19 @@
 import { action, observable, computed, reaction } from 'mobx';
 import { nativeTheme } from '@electron/remote';
 
-import { theme, ThemeType } from '../themes';
-import Store from './lib/Store';
+import { Stores } from 'src/stores.types';
+import { ApiInterface } from 'src/api';
+import { Actions } from 'src/actions/lib/actions';
+import { Theme, theme, ThemeType } from '../themes';
+import TypedStore from './lib/TypedStore';
 
-export default class UIStore extends Store {
+export default class UIStore extends TypedStore {
   @observable showServicesUpdatedInfoBar = false;
 
   @observable isOsDarkThemeActive = nativeTheme.shouldUseDarkColors;
 
-  constructor(...args) {
-    super(...args);
-
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
     // Register action handlers
     this.actions.ui.openSettings.listen(this._openSettings.bind(this));
     this.actions.ui.closeSettings.listen(this._closeSettings.bind(this));
@@ -26,7 +28,7 @@ export default class UIStore extends Store {
     });
   }
 
-  setup() {
+  setup(): void {
     reaction(
       () => this.isDarkThemeActive,
       () => {
@@ -74,15 +76,15 @@ export default class UIStore extends Store {
     );
   }
 
-  @computed get isSplitModeActive() {
+  @computed get isSplitModeActive(): boolean {
     return this.stores.settings.app.splitMode;
   }
 
-  @computed get splitColumnsNo() {
+  @computed get splitColumnsNo(): number {
     return this.stores.settings.app.splitColumns;
   }
 
-  @computed get theme() {
+  @computed get theme(): Theme {
     const themeId =
       this.isDarkThemeActive || this.stores.settings.app.darkMode
         ? ThemeType.dark
@@ -92,16 +94,16 @@ export default class UIStore extends Store {
   }
 
   // Actions
-  @action _openSettings({ path = '/settings' }) {
+  @action _openSettings({ path = '/settings' }): void {
     const settingsPath = path !== '/settings' ? `/settings/${path}` : path;
     this.stores.router.push(settingsPath);
   }
 
-  @action _closeSettings() {
+  @action _closeSettings(): void {
     this.stores.router.push('/');
   }
 
-  @action _toggleServiceUpdatedInfoBar({ visible }) {
+  @action _toggleServiceUpdatedInfoBar({ visible }): void {
     let visibility = visible;
     if (visibility === null) {
       visibility = !this.showServicesUpdatedInfoBar;
@@ -110,7 +112,7 @@ export default class UIStore extends Store {
   }
 
   // Reactions
-  _setupThemeInDOM() {
+  _setupThemeInDOM(): void {
     if (!this.isDarkThemeActive) {
       document.body.classList.remove('theme__dark');
     } else {
@@ -118,16 +120,16 @@ export default class UIStore extends Store {
     }
   }
 
-  _setupModeInDOM() {
+  _setupModeInDOM(): void {
     if (!this.isSplitModeActive) {
       document.body.classList.remove('mode__split');
     } else {
       document.body.classList.add('mode__split');
-      document.body.dataset.columns = this.splitColumnsNo;
+      document.body.dataset.columns = this.splitColumnsNo.toString();
     }
   }
 
-  _setupColumnsInDOM() {
-    document.body.dataset.columns = this.splitColumnsNo;
+  _setupColumnsInDOM(): void {
+    document.body.dataset.columns = this.splitColumnsNo.toString();
   }
 }
diff --git a/src/stores/UserStore.js b/src/stores/UserStore.ts
index 661c03e2c..616ff29a6 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.ts
@@ -4,83 +4,94 @@ import jwt from 'jsonwebtoken';
 import localStorage from 'mobx-localstorage';
 import { ipcRenderer } from 'electron';
 
+import { ApiInterface } from 'src/api';
+import { Actions } from 'src/actions/lib/actions';
+import { Stores } from 'src/stores.types';
 import { TODOS_PARTITION_ID } from '../config';
 import { isDevMode } from '../environment-remote';
-import Store from './lib/Store';
 import Request from './lib/Request';
 import CachedRequest from './lib/CachedRequest';
+import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:UserStore');
 
 // TODO: split stores into UserStore and AuthStore
-export default class UserStore extends Store {
-  BASE_ROUTE = '/auth';
+export default class UserStore extends TypedStore {
+  BASE_ROUTE: string = '/auth';
 
-  WELCOME_ROUTE = `${this.BASE_ROUTE}/welcome`;
+  WELCOME_ROUTE: string = `${this.BASE_ROUTE}/welcome`;
 
-  LOGIN_ROUTE = `${this.BASE_ROUTE}/login`;
+  LOGIN_ROUTE: string = `${this.BASE_ROUTE}/login`;
 
-  LOGOUT_ROUTE = `${this.BASE_ROUTE}/logout`;
+  LOGOUT_ROUTE: string = `${this.BASE_ROUTE}/logout`;
 
-  SIGNUP_ROUTE = `${this.BASE_ROUTE}/signup`;
+  SIGNUP_ROUTE: string = `${this.BASE_ROUTE}/signup`;
 
-  SETUP_ROUTE = `${this.BASE_ROUTE}/signup/setup`;
+  SETUP_ROUTE: string = `${this.BASE_ROUTE}/signup/setup`;
 
-  IMPORT_ROUTE = `${this.BASE_ROUTE}/signup/import`;
+  IMPORT_ROUTE: string = `${this.BASE_ROUTE}/signup/import`;
 
-  INVITE_ROUTE = `${this.BASE_ROUTE}/signup/invite`;
+  INVITE_ROUTE: string = `${this.BASE_ROUTE}/signup/invite`;
 
-  PASSWORD_ROUTE = `${this.BASE_ROUTE}/password`;
+  PASSWORD_ROUTE: string = `${this.BASE_ROUTE}/password`;
 
-  CHANGE_SERVER_ROUTE = `${this.BASE_ROUTE}/server`;
+  CHANGE_SERVER_ROUTE: string = `${this.BASE_ROUTE}/server`;
 
-  @observable loginRequest = new Request(this.api.user, 'login');
+  @observable loginRequest: Request = new Request(this.api.user, 'login');
 
-  @observable signupRequest = new Request(this.api.user, 'signup');
+  @observable signupRequest: Request = new Request(this.api.user, 'signup');
 
-  @observable passwordRequest = new Request(this.api.user, 'password');
+  @observable passwordRequest: Request = new Request(this.api.user, 'password');
 
-  @observable inviteRequest = new Request(this.api.user, 'invite');
+  @observable inviteRequest: Request = new Request(this.api.user, 'invite');
 
-  @observable getUserInfoRequest = new CachedRequest(this.api.user, 'getInfo');
+  @observable getUserInfoRequest: CachedRequest = new CachedRequest(
+    this.api.user,
+    'getInfo',
+  );
 
-  @observable updateUserInfoRequest = new Request(this.api.user, 'updateInfo');
+  @observable updateUserInfoRequest: Request = new Request(
+    this.api.user,
+    'updateInfo',
+  );
 
-  @observable getLegacyServicesRequest = new CachedRequest(
+  @observable getLegacyServicesRequest: CachedRequest = new CachedRequest(
     this.api.user,
     'getLegacyServices',
   );
 
-  @observable deleteAccountRequest = new CachedRequest(this.api.user, 'delete');
-
-  @observable isImportLegacyServicesExecuting = false;
+  @observable deleteAccountRequest: CachedRequest = new CachedRequest(
+    this.api.user,
+    'delete',
+  );
 
-  @observable isImportLegacyServicesCompleted = false;
+  @observable isImportLegacyServicesExecuting: boolean = false;
 
-  @observable isLoggingOut = false;
+  @observable isImportLegacyServicesCompleted: boolean = false;
 
-  @observable id;
+  @observable isLoggingOut: boolean = false;
 
-  @observable authToken = localStorage.getItem('authToken') || null;
+  @observable id: string | null | undefined;
 
-  @observable accountType;
+  @observable authToken: string | null =
+    localStorage.getItem('authToken') || null;
 
-  @observable hasCompletedSignup = false;
+  @observable accountType: string | undefined;
 
-  @observable userData = {};
+  @observable hasCompletedSignup: boolean = false;
 
-  @observable actionStatus = [];
+  @observable userData: object = {};
 
   logoutReasonTypes = {
     SERVER: 'SERVER',
   };
 
-  @observable logoutReason = null;
+  @observable logoutReason: string | null = null;
 
   fetchUserInfoInterval = null;
 
-  constructor(...args) {
-    super(...args);
+  constructor(stores: Stores, api: ApiInterface, actions: Actions) {
+    super(stores, api, actions);
 
     // Register action handlers
     this.actions.user.login.listen(this._login.bind(this));
@@ -104,54 +115,58 @@ export default class UserStore extends Store {
     ]);
   }
 
-  setup() {
+  setup(): void {
     // Data migration
     this._migrateUserLocale();
   }
 
   // Routes
-  get loginRoute() {
+  get loginRoute(): string {
     return this.LOGIN_ROUTE;
   }
 
-  get logoutRoute() {
+  get logoutRoute(): string {
     return this.LOGOUT_ROUTE;
   }
 
-  get signupRoute() {
+  get signupRoute(): string {
     return this.SIGNUP_ROUTE;
   }
 
-  get setupRoute() {
+  get setupRoute(): string {
     return this.SETUP_ROUTE;
   }
 
-  get inviteRoute() {
+  get inviteRoute(): string {
     return this.INVITE_ROUTE;
   }
 
-  get importRoute() {
+  get importRoute(): string {
     return this.IMPORT_ROUTE;
   }
 
-  get passwordRoute() {
+  get passwordRoute(): string {
     return this.PASSWORD_ROUTE;
   }
 
-  get changeServerRoute() {
+  get changeServerRoute(): string {
     return this.CHANGE_SERVER_ROUTE;
   }
 
   // Data
-  @computed get isLoggedIn() {
+  @computed get isLoggedIn(): boolean {
     return Boolean(localStorage.getItem('authToken'));
   }
 
-  @computed get isTokenExpired() {
+  @computed get isTokenExpired(): boolean {
     if (!this.authToken) return false;
+    const parsedToken = this._parseToken(this.authToken);
 
-    const { tokenExpiry } = this._parseToken(this.authToken);
-    return this.authToken !== null && moment(tokenExpiry).isBefore(moment());
+    return (
+      parsedToken !== false &&
+      this.authToken !== null &&
+      moment(parsedToken.tokenExpiry).isBefore(moment())
+    );
   }
 
   @computed get data() {
@@ -160,23 +175,23 @@ export default class UserStore extends Store {
     return this.getUserInfoRequest.execute().result || {};
   }
 
-  @computed get team() {
+  @computed get team(): any {
     return this.data.team || null;
   }
 
-  @computed get legacyServices() {
+  @computed get legacyServices(): any {
     return this.getLegacyServicesRequest.execute() || {};
   }
 
   // Actions
-  @action async _login({ email, password }) {
+  @action async _login({ email, password }): Promise<void> {
     const authToken = await this.loginRequest.execute(email, password)._promise;
     this._setUserData(authToken);
 
     this.stores.router.push('/');
   }
 
-  @action _tokenLogin(authToken) {
+  @action _tokenLogin(authToken: string): void {
     this._setUserData(authToken);
 
     this.stores.router.push('/');
@@ -191,7 +206,7 @@ export default class UserStore extends Store {
     company,
     plan,
     currency,
-  }) {
+  }): Promise<void> {
     const authToken = await this.signupRequest.execute({
       firstname,
       lastname,
@@ -211,14 +226,14 @@ export default class UserStore extends Store {
     this.stores.router.push(this.SETUP_ROUTE);
   }
 
-  @action async _retrievePassword({ email }) {
+  @action async _retrievePassword({ email }): Promise<void> {
     const request = this.passwordRequest.execute(email);
 
     await request._promise;
     this.actionStatus = request.result.status || [];
   }
 
-  @action async _invite({ invites }) {
+  @action async _invite({ invites }): Promise<void> {
     const data = invites.filter(invite => invite.email !== '');
 
     const response = await this.inviteRequest.execute(data)._promise;
@@ -231,7 +246,7 @@ export default class UserStore extends Store {
     }
   }
 
-  @action async _update({ userData }) {
+  @action async _update({ userData }): Promise<void> {
     if (!this.isLoggedIn) return;
 
     const response = await this.updateUserInfoRequest.execute(userData)
@@ -241,11 +256,11 @@ export default class UserStore extends Store {
     this.actionStatus = response.status || [];
   }
 
-  @action _resetStatus() {
+  @action _resetStatus(): void {
     this.actionStatus = [];
   }
 
-  @action _logout() {
+  @action _logout(): void {
     // workaround mobx issue
     localStorage.removeItem('authToken');
     window.localStorage.removeItem('authToken');
@@ -260,7 +275,7 @@ export default class UserStore extends Store {
     }
   }
 
-  @action async _importLegacyServices({ services }) {
+  @action async _importLegacyServices({ services }): Promise<void> {
     this.isImportLegacyServicesExecuting = true;
 
     // Reduces recipe duplicates
@@ -289,12 +304,12 @@ export default class UserStore extends Store {
     this.isImportLegacyServicesCompleted = true;
   }
 
-  @action async _delete() {
+  @action async _delete(): Promise<void> {
     this.deleteAccountRequest.execute();
   }
 
   // This is a mobx autorun which forces the user to login if not authenticated
-  _requireAuthenticatedUser = () => {
+  _requireAuthenticatedUser = (): void => {
     if (this.isTokenExpired) {
       this._logout();
     }
@@ -328,13 +343,13 @@ export default class UserStore extends Store {
   };
 
   // Reactions
-  async _getUserData() {
+  async _getUserData(): Promise<void> {
     if (this.isLoggedIn) {
       let data;
       try {
         data = await this.getUserInfoRequest.execute()._promise;
       } catch {
-        return false;
+        return;
       }
 
       // We need to set the beta flag for the SettingsStore
@@ -364,9 +379,9 @@ export default class UserStore extends Store {
     }
   }
 
-  _setUserData(authToken) {
+  _setUserData(authToken: any): void {
     const data = this._parseToken(authToken);
-    if (data.authToken) {
+    if (data !== false && data.authToken) {
       localStorage.setItem('authToken', data.authToken);
 
       this.authToken = data.authToken;
@@ -377,20 +392,21 @@ export default class UserStore extends Store {
     }
   }
 
-  getAuthURL(url) {
+  getAuthURL(url: string): string {
     const parsedUrl = new URL(url);
     const params = new URLSearchParams(parsedUrl.search.slice(1));
 
-    params.append('authToken', this.authToken);
+    // TODO: Remove the neccesity for `as string`
+    params.append('authToken', this.authToken as string);
 
     return `${parsedUrl.origin}${parsedUrl.pathname}?${params.toString()}`;
   }
 
-  async _migrateUserLocale() {
+  async _migrateUserLocale(): Promise<void> {
     try {
       await this.getUserInfoRequest._promise;
     } catch {
-      return false;
+      return;
     }
 
     if (!this.data.locale) {
diff --git a/src/stores/lib/Store.js b/src/stores/lib/Store.js
deleted file mode 100644
index 739a47729..000000000
--- a/src/stores/lib/Store.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { computed, observable } from 'mobx';
-import Reaction from './Reaction';
-
-export default class Store {
-  /** @type Stores */
-  stores;
-
-  /** @type ApiInterface */
-  api;
-
-  /** @type Actions */
-  actions;
-
-  /** @type Reaction[] */
-  _reactions = [];
-
-  // status implementation
-  @observable _status = null;
-
-  @computed get actionStatus() {
-    return this._status || [];
-  }
-
-  set actionStatus(status) {
-    this._status = status;
-  }
-
-  constructor(stores, api, actions) {
-    this.stores = stores;
-    this.api = api;
-    this.actions = actions;
-  }
-
-  registerReactions(reactions) {
-    for (const reaction of reactions) {
-      this._reactions.push(new Reaction(reaction));
-    }
-  }
-
-  setup() {}
-
-  initialize() {
-    this.setup();
-    for (const reaction of this._reactions) reaction.start();
-  }
-
-  teardown() {
-    for (const reaction of this._reactions) reaction.stop();
-  }
-
-  resetStatus() {
-    this._status = null;
-  }
-}