5 files changed, 59 insertions, 51 deletions

diff --git a/src/stores/AppStore.ts b/src/stores/AppStore.ts
index 9af0a9a4f..b8356bd56 100644
--- a/src/stores/AppStore.ts
+++ b/src/stores/AppStore.ts
@@ -121,13 +121,11 @@ export default class AppStore extends TypedStore {
 
   @observable isFocused = true;
 
-  @observable lockingFeatureEnabled =
-    DEFAULT_APP_SETTINGS.lockingFeatureEnabled;
+  @observable isLockingFeatureEnabled =
+    DEFAULT_APP_SETTINGS.isLockingFeatureEnabled;
 
   @observable launchInBackground = DEFAULT_APP_SETTINGS.autoLaunchInBackground;
 
-  dictionaries = [];
-
   fetchDataInterval: NodeJS.Timeout | null = null;
 
   @observable downloads: Download[] = [];
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 95aae6ccb..d7804a3fe 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -1,5 +1,5 @@
 import { join } from 'node:path';
-import { ipcRenderer, shell } from 'electron';
+import { clipboard, ipcRenderer, shell } from 'electron';
 import { action, reaction, computed, observable, makeObservable } from 'mobx';
 import { debounce, remove } from 'lodash';
 import ms from 'ms';
@@ -65,6 +65,8 @@ export default class ServicesStore extends TypedStore {
   // No service ID should be in the list multiple times, not all service IDs have to be in the list
   @observable lastUsedServices: string[] = [];
 
+  private toggleToTalkCallback = () => this.active?.toggleToTalk();
+
   constructor(stores: Stores, api: ApiInterface, actions: Actions) {
     super(stores, api, actions);
 
@@ -239,6 +241,8 @@ export default class ServicesStore extends TypedStore {
   initialize() {
     super.initialize();
 
+    ipcRenderer.on('toggle-to-talk', this.toggleToTalkCallback);
+
     // Check services to become hibernated
     this.serviceMaintenanceTick();
   }
@@ -246,6 +250,8 @@ export default class ServicesStore extends TypedStore {
   teardown() {
     super.teardown();
 
+    ipcRenderer.off('toggle-to-talk', this.toggleToTalkCallback);
+
     // Stop checking services for hibernation
     this.serviceMaintenanceTick.cancel();
   }
@@ -828,6 +834,54 @@ export default class ServicesStore extends TypedStore {
         break;
       }
       case 'notification': {
+        const { notificationId, options } = args[0];
+
+        const { isTwoFactorAutoCatcherEnabled, twoFactorAutoCatcherMatcher } =
+          this.stores.settings.all.app;
+
+        debug(
+          'Settings for catch tokens',
+          isTwoFactorAutoCatcherEnabled,
+          twoFactorAutoCatcherMatcher,
+        );
+
+        if (isTwoFactorAutoCatcherEnabled) {
+          /*
+        parse the token digits from sms body, find "token" or "code" in options.body which reflect the sms content
+        ---
+        Token: 03624 / SMS-Code = PIN Token
+        ---
+        Prüfcode 010313 für Microsoft-Authentifizierung verwenden.
+        ---
+        483133 is your GitHub authentication code. @github.com #483133
+        ---
+        eBay: Ihr Sicherheitscode lautet 080090. \nEr läuft in 15 Minuten ab. Geben Sie den Code nicht an andere weiter.
+        ---
+        PayPal: Ihr Sicherheitscode lautet: 989605. Geben Sie diesen Code nicht weiter.
+      */
+
+          const rawBody = options.body;
+          const { 0: token } = /\d{5,6}/.exec(options.body) || [];
+
+          const wordsToCatch = twoFactorAutoCatcherMatcher
+            .replaceAll(', ', ',')
+            .split(',');
+
+          debug('wordsToCatch', wordsToCatch);
+
+          if (
+            token &&
+            wordsToCatch.some(a =>
+              options.body.toLowerCase().includes(a.toLowerCase()),
+            )
+          ) {
+            // with the extra "+ " it shows its copied to clipboard in the notification
+            options.body = `+ ${rawBody}`;
+            clipboard.writeText(token);
+            debug('Token parsed and copied to clipboard');
+          }
+        }
+
         // Check if we are in scheduled Do-not-Disturb time
         const { scheduledDNDEnabled, scheduledDNDStart, scheduledDNDEnd } =
           this.stores.settings.all.app;
@@ -839,8 +893,6 @@ export default class ServicesStore extends TypedStore {
           return;
         }
 
-        const { notificationId, options } = args[0];
-
         if (service.isMuted || this.stores.settings.all.app.isAppMuted) {
           Object.assign(options, {
             silent: true,
diff --git a/src/stores/SettingsStore.ts b/src/stores/SettingsStore.ts
index 90cd82690..010290a4a 100644
--- a/src/stores/SettingsStore.ts
+++ b/src/stores/SettingsStore.ts
@@ -11,17 +11,11 @@ import {
   LOCAL_SERVER,
 } from '../config';
 import { hash } from '../helpers/password-helpers';
-import Request from './lib/Request';
 import TypedStore from './lib/TypedStore';
 
 const debug = require('../preload-safe-debug')('Ferdium:SettingsStore');
 
 export default class SettingsStore extends TypedStore {
-  @observable updateAppSettingsRequest = new Request(
-    this.api.local,
-    'updateAppSettings',
-  );
-
   @observable loaded: boolean = false;
 
   fileSystemSettingsTypes = FILE_SYSTEM_SETTINGS_TYPES;
@@ -67,7 +61,7 @@ export default class SettingsStore extends TypedStore {
     let inactivityTimer;
     getCurrentWindow().on('blur', () => {
       if (
-        this.all.app.lockingFeatureEnabled &&
+        this.all.app.isLockingFeatureEnabled &&
         this.all.app.inactivityLock !== 0
       ) {
         inactivityTimer = setTimeout(
@@ -94,7 +88,7 @@ export default class SettingsStore extends TypedStore {
       if (
         !this.loaded &&
         resp.type === 'app' &&
-        resp.data.lockingFeatureEnabled
+        resp.data.isLockingFeatureEnabled
       ) {
         process.nextTick(() => {
           if (!this.all.app.locked) {
diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts
index f98f7d340..9c3fcd3b9 100644
--- a/src/stores/UserStore.ts
+++ b/src/stores/UserStore.ts
@@ -60,11 +60,6 @@ export default class UserStore extends TypedStore {
     'updateInfo',
   );
 
-  @observable getLegacyServicesRequest: CachedRequest = new CachedRequest(
-    this.api.user,
-    'getLegacyServices',
-  );
-
   @observable deleteAccountRequest: CachedRequest = new CachedRequest(
     this.api.user,
     'delete',
@@ -93,8 +88,6 @@ export default class UserStore extends TypedStore {
 
   @observable logoutReason: string | null = null;
 
-  fetchUserInfoInterval = null;
-
   constructor(stores: Stores, api: ApiInterface, actions: Actions) {
     super(stores, api, actions);
 
@@ -132,26 +125,10 @@ export default class UserStore extends TypedStore {
     return this.LOGIN_ROUTE;
   }
 
-  get logoutRoute(): string {
-    return this.LOGOUT_ROUTE;
-  }
-
   get signupRoute(): string {
     return this.SIGNUP_ROUTE;
   }
 
-  get setupRoute(): string {
-    return this.SETUP_ROUTE;
-  }
-
-  get inviteRoute(): string {
-    return this.INVITE_ROUTE;
-  }
-
-  get importRoute(): string {
-    return this.IMPORT_ROUTE;
-  }
-
   get passwordRoute(): string {
     return this.PASSWORD_ROUTE;
   }
@@ -191,10 +168,6 @@ export default class UserStore extends TypedStore {
     return this.data.team || null;
   }
 
-  @computed get legacyServices(): any {
-    return this.getLegacyServicesRequest.execute() || {};
-  }
-
   // Actions
   @action async _login({ email, password }): Promise<void> {
     const authToken = await this.loginRequest.execute(email, password).promise;
diff --git a/src/stores/lib/Request.ts b/src/stores/lib/Request.ts
index 911c5ccfb..587af87d7 100644
--- a/src/stores/lib/Request.ts
+++ b/src/stores/lib/Request.ts
@@ -1,5 +1,4 @@
 import { observable, action, computed, makeObservable } from 'mobx';
-import { isEqual } from 'lodash/fp';
 
 // eslint-disable-next-line no-use-before-define
 type Hook = (request: Request) => void;
@@ -123,14 +122,6 @@ export default class Request {
     return this.execute(...args);
   }
 
-  isExecutingWithArgs(...args: any[]): boolean {
-    return (
-      this.isExecuting &&
-      this.currentApiCall &&
-      isEqual(this.currentApiCall.args, args)
-    );
-  }
-
   @computed get isExecutingFirstTime(): boolean {
     return !this.wasExecuted && this.isExecuting;
   }