Move autoconnect to main process and check if account has expired

1 files changed, 15 insertions, 0 deletions

diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts
index d64ff7cf93..ba9f8a9baa 100644
--- a/gui/src/main/index.ts
+++ b/gui/src/main/index.ts
@@ -1108,6 +1108,7 @@ class ApplicationMain {
       }
 
       await this.daemonRpc.setAccount(accountToken);
+      consumePromise(this.autoConnect());
     } catch (error) {
       log.error(`Failed to login: ${error.message}`);
 
@@ -1119,6 +1120,20 @@ class ApplicationMain {
     }
   }
 
+  private async autoConnect() {
+    if (
+      !this.accountData ||
+      !new AccountExpiry(this.accountData.expiry, this.locale).hasExpired()
+    ) {
+      try {
+        log.info('Auto-connecting the tunnel');
+        await this.daemonRpc.connectTunnel();
+      } catch (error) {
+        log.error(`Failed to auto-connect the tunnel: ${error.message}`);
+      }
+    }
+  }
+
   private async logout(): Promise<void> {
     try {
       await this.daemonRpc.setAccount();