Feat/second-window

packages/insomnia/src/account/session.ts

@@ -37,22 +37,12 @@ export interface SessionData {
   publicKey: JsonWebKey;
   encPrivateKey: crypt.AESMessage;
 }
-
-const loginCallbacks: LoginCallback[] = [];
-
-function _callCallbacks() {
-  const loggedIn = isLoggedIn();
-  console.log('[session] Sync state changed loggedIn=' + loggedIn);
-
-  for (const cb of loginCallbacks) {
-    if (typeof cb === 'function') {
-      cb(loggedIn);
-    }
-  }
-}
-
 export function onLoginLogout(loginCallback: LoginCallback) {
-  loginCallbacks.push(loginCallback);
+  window.main.on('loggedIn', () => {
+    console.log('onLoginLogout', isLoggedIn());
+
+    loginCallback(isLoggedIn());
+  });
 }
 
 /** Creates a session from a sessionId and derived symmetric key. */
@@ -80,7 +70,7 @@ export async function absorbKey(sessionId: string, key: string) {
     JSON.parse(encPrivateKey),
   );
 
-  _callCallbacks();
+  window.main.loginStateChange();
 }
 
 export async function changePasswordWithToken(rawNewPassphrase: string, confirmationCode: string) {
@@ -193,13 +183,12 @@ export async function logout() {
   }
 
   _unsetSessionData();
-
-  _callCallbacks();
+  window.main.loginStateChange();
 }
 
 /** Set data for the new session and store it encrypted with the sessionId */
 export function setSessionData(
-  sessionId: string,
+  id: string,
   accountId: string,
   firstName: string,
   lastName: string,
@@ -209,19 +198,20 @@ export function setSessionData(
   encPrivateKey: crypt.AESMessage,
 ) {
   const sessionData: SessionData = {
-    id: sessionId,
-    accountId: accountId,
-    symmetricKey: symmetricKey,
-    publicKey: publicKey,
-    encPrivateKey: encPrivateKey,
-    email: email,
-    firstName: firstName,
-    lastName: lastName,
+    id,
+    accountId,
+    symmetricKey,
+    publicKey,
+    encPrivateKey,
+    email,
+    firstName,
+    lastName,
   };
   const dataStr = JSON.stringify(sessionData);
-  window.localStorage.setItem(_getSessionKey(sessionId), dataStr);
+  window.localStorage.setItem(_getSessionKey(id), dataStr);
   // NOTE: We're setting this last because the stuff above might fail
-  window.localStorage.setItem('currentSessionId', sessionId);
+  window.localStorage.setItem('currentSessionId', id);
+  return sessionData;
 }
 export async function listTeams() {
   return fetch.get('/api/teams', getCurrentSessionId());

packages/insomnia/src/main.development.ts

@@ -149,6 +149,7 @@ const _launchApp = async () => {
     console.log('[main] Window ready, handling command line arguments', process.argv);
     const args = process.argv.slice(1).filter(a => a !== '.');
     if (args.length) {
+      window = windowUtils.getOrCreateWindow();
       window.webContents.send('shell:open', args.join());
     }
   });
@@ -163,6 +164,7 @@ const _launchApp = async () => {
       // Called when second instance launched with args (Windows/Linux)
       app.on('second-instance', (_1, args) => {
         console.log('Second instance listener received:', args.join('||'));
+        window = windowUtils.getOrCreateWindow();
         if (window) {
           if (window.isMinimized()) {
             window.restore();
@@ -173,15 +175,24 @@ const _launchApp = async () => {
         console.log('[main] Open Deep Link URL sent from second instance', lastArg);
         window.webContents.send('shell:open', lastArg);
       });
-      window = windowUtils.createWindow();
+      window = windowUtils.getOrCreateWindow();
 
       app.on('open-url', (_event, url) => {
         console.log('[main] Open Deep Link URL', url);
+        window = windowUtils.getOrCreateWindow();
+        if (window) {
+          if (window.isMinimized()) {
+            window.restore();
+          }
+          window.focus();
+        } else {
+          window = windowUtils.getOrCreateWindow();
+        }
         window.webContents.send('shell:open', url);
       });
     }
   } else {
-    window = windowUtils.createWindow();
+    window = windowUtils.getOrCreateWindow();
   }
 
   // Don't send origin header from Insomnia because we're not technically using CORS

packages/insomnia/src/main/ipc/main.ts

@@ -4,7 +4,7 @@ import { Spectral } from '@stoplight/spectral-core';
 // @ts-expect-error - This is a bundled file not sure why it's not found
 import { bundleAndLoadRuleset } from '@stoplight/spectral-ruleset-bundler/with-loader';
 import { oas } from '@stoplight/spectral-rulesets';
-import { app, ipcMain, IpcRendererEvent } from 'electron';
+import { app, BrowserWindow, ipcMain, IpcRendererEvent } from 'electron';
 import fs from 'fs';
 
 import { axiosRequest } from '../../network/axios-request';
@@ -16,6 +16,7 @@ import { WebSocketBridgeAPI } from '../network/websocket';
 import { gRPCBridgeAPI } from './grpc';
 
 export interface MainBridgeAPI {
+  loginStateChange: () => void;
   restart: () => void;
   halfSecondAfterAppStart: () => void;
   manualUpdateCheck: () => void;
@@ -32,6 +33,13 @@ export interface MainBridgeAPI {
   grpc: gRPCBridgeAPI;
 }
 export function registerMainHandlers() {
+  ipcMain.on('loginStateChange', async () => {
+    console.log('get windows');
+    BrowserWindow.getAllWindows().forEach(w => {
+      console.log('sending login state change to window');
+      w.webContents.send('loggedIn');
+    });
+  });
   ipcMain.handle('exportAllWorkspaces', async () => {
     return exportAllWorkspaces();
   });