docs-combiner 0.1.15 → 0.1.17

package/dist/main.js

@@ -47,6 +47,20 @@ const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const http = __importStar(require("http"));
 const url = __importStar(require("url"));
+let pendingGoogleAuth = null;
+function abortPendingGoogleAuth(reason) {
+    const pending = pendingGoogleAuth;
+    if (!pending)
+        return;
+    pendingGoogleAuth = null;
+    try {
+        pending.server.close();
+    }
+    catch (_a) {
+        /* ignore */
+    }
+    pending.reject(new Error(reason));
+}
 function createWindow() {
     // Try to read theme preference from localStorage file
     // In Electron, localStorage is stored in a specific location
@@ -133,6 +147,7 @@ electron_1.app.whenReady().then(() => {
         return true;
     }));
     electron_1.ipcMain.handle('start-auth', (event, clientId) => __awaiter(void 0, void 0, void 0, function* () {
+        abortPendingGoogleAuth('AUTH_SUPERSEDED');
         return new Promise((resolve, reject) => {
             const server = http.createServer((req, res) => __awaiter(void 0, void 0, void 0, function* () {
                 try {
@@ -146,25 +161,54 @@ electron_1.app.whenReady().then(() => {
                         const port = address && typeof address !== 'string' ? address.port : 0;
                         res.writeHead(200, { 'Content-Type': 'text/html' });
                         res.end('<h1>Authentication successful!</h1><p>You can close this window and return to the app.</p><script>window.close();</script>');
-                        server.close();
+                        pendingGoogleAuth = null;
+                        try {
+                            server.close();
+                        }
+                        catch (_a) {
+                            /* ignore */
+                        }
                         resolve({ code: query.code, redirectUri: `http://127.0.0.1:${port}` });
                     }
                     else if (query.error) {
                         res.writeHead(400, { 'Content-Type': 'text/html' });
                         res.end('Authentication failed.');
-                        server.close();
+                        pendingGoogleAuth = null;
+                        try {
+                            server.close();
+                        }
+                        catch (_b) {
+                            /* ignore */
+                        }
                         reject(new Error(query.error));
                     }
                 }
                 catch (e) {
-                    server.close();
-                    reject(e);
+                    pendingGoogleAuth = null;
+                    try {
+                        server.close();
+                    }
+                    catch (_c) {
+                        /* ignore */
+                    }
+                    reject(e instanceof Error ? e : new Error(String(e)));
                 }
             }));
+            server.on('error', (err) => {
+                if ((pendingGoogleAuth === null || pendingGoogleAuth === void 0 ? void 0 : pendingGoogleAuth.server) === server) {
+                    pendingGoogleAuth = null;
+                }
+                reject(err);
+            });
             server.listen(0, '127.0.0.1', () => {
                 const address = server.address();
                 if (!address || typeof address === 'string') {
-                    server.close();
+                    try {
+                        server.close();
+                    }
+                    catch (_a) {
+                        /* ignore */
+                    }
                     reject(new Error('Failed to get server port'));
                     return;
                 }
@@ -173,10 +217,25 @@ electron_1.app.whenReady().then(() => {
                 // Google Drive Scope: https://www.googleapis.com/auth/drive (Full Access)
                 // Added prompt=consent to force new refresh token with correct scopes
                 const authUrl = `https://accounts.google.com/o/oauth2/v2/auth?access_type=offline&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdrive&response_type=code&client_id=${clientId}&redirect_uri=${redirectUri}&prompt=consent`;
+                pendingGoogleAuth = { authUrl, server, resolve, reject };
                 electron_1.shell.openExternal(authUrl);
             });
         });
     }));
+    electron_1.ipcMain.handle('reopen-pending-auth-browser', () => __awaiter(void 0, void 0, void 0, function* () {
+        if (!pendingGoogleAuth) {
+            return { ok: false };
+        }
+        yield electron_1.shell.openExternal(pendingGoogleAuth.authUrl);
+        return { ok: true };
+    }));
+    electron_1.ipcMain.handle('cancel-pending-auth', () => __awaiter(void 0, void 0, void 0, function* () {
+        if (!pendingGoogleAuth) {
+            return { ok: false };
+        }
+        abortPendingGoogleAuth('LOGIN_CANCELLED');
+        return { ok: true };
+    }));
     electron_1.ipcMain.handle('open-external', (event, url) => __awaiter(void 0, void 0, void 0, function* () {
         yield electron_1.shell.openExternal(url);
     }));

package/dist/preload.js

@@ -55,6 +55,8 @@ electron_1.contextBridge.exposeInMainWorld('electronAPI', {
     saveConfig: (config) => electron_1.ipcRenderer.invoke('save-config', config),
     loadConfig: () => electron_1.ipcRenderer.invoke('load-config'),
     startAuth: (clientId) => electron_1.ipcRenderer.invoke('start-auth', clientId),
+    reopenPendingAuthBrowser: () => electron_1.ipcRenderer.invoke('reopen-pending-auth-browser'),
+    cancelPendingAuth: () => electron_1.ipcRenderer.invoke('cancel-pending-auth'),
     openExternal: (url) => electron_1.ipcRenderer.invoke('open-external', url),
     log: (level, ...args) => electron_1.ipcRenderer.invoke('log', level, ...args),
 });