fix: attempt to fix windows sso login. increase logging

Signed-off-by: Adam Setch <[email protected]>

Author: setchy

src/main/main.ts

@@ -4,7 +4,8 @@ import { menubar } from 'menubar';
 
 import { APPLICATION } from '../shared/constants';
 import { namespacedEvent } from '../shared/events';
-import { isMacOS, isWindows } from '../shared/platform';
+import { logInfo, logWarn } from '../shared/logger';
+import { isLinux, isMacOS, isWindows } from '../shared/platform';
 import { onFirstRunMaybe } from './first-run';
 import { TrayIcons } from './icons';
 import MenuBuilder from './menu';
@@ -90,6 +91,31 @@ app.whenReady().then(async () => {
     });
   });
 
+  /** Prevent second instances */
+  if (isWindows() || isLinux()) {
+    const gotTheLock = app.requestSingleInstanceLock();
+
+    if (!gotTheLock) {
+      logWarn('main:gotTheLock', 'Second instance detected, quitting');
+      app.quit(); // Quit the second instance
+      return;
+    }
+
+    app.on('second-instance', (_event, commandLine, _workingDirectory) => {
+      logInfo(
+        'main:second-instance',
+        'Second instance was launched.  extracting command to forward',
+      );
+
+      // Get the URL from the command line arguments
+      const url = commandLine.find((arg) => arg.startsWith(`${protocol}://`));
+
+      if (url) {
+        handleURL(url);
+      }
+    });
+  }
+
   /**
    * Gitify custom IPC events
    */
@@ -183,5 +209,13 @@ ipc.handle(namespacedEvent('safe-storage-decrypt'), (_, settings) => {
 // Handle gitify:// custom protocol URL events for OAuth 2.0 callback
 app.on('open-url', (event, url) => {
   event.preventDefault();
-  mb.window.webContents.send(namespacedEvent('auth-callback'), url);
+  logInfo('main:open-url', `URL received ${url}`);
+  handleURL(url);
 });
+
+const handleURL = (url: string) => {
+  if (url.startsWith(`${protocol}://`)) {
+    logInfo('main:handleUrl', `forwarding URL ${url} to renderer process`);
+    mb.window.webContents.send(namespacedEvent('auth-callback'), url);
+  }
+};

src/renderer/utils/auth/utils.ts

@@ -4,7 +4,7 @@ import semver from 'semver';
 import { ipcRenderer } from 'electron';
 import { APPLICATION } from '../../../shared/constants';
 import { namespacedEvent } from '../../../shared/events';
-import { logError, logWarn } from '../../../shared/logger';
+import { logError, logInfo, logWarn } from '../../../shared/logger';
 import type {
   Account,
   AuthCode,
@@ -62,6 +62,10 @@ export function authGitHub(
     ipcRenderer.on(
       namespacedEvent('auth-callback'),
       (_, callbackUrl: string) => {
+        logInfo(
+          'renderer:auth-callback',
+          `received authentication callback URL ${callbackUrl}`,
+        );
         handleCallback(callbackUrl);
       },
     );