@circleback/cli 0.3.4 → 0.3.5

package/dist/auth/oauth.js

@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forceRefreshOAuthToken = exports.getValidOAuthTokens = exports.login = void 0;
-const node_child_process_1 = require("node:child_process");
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const constants_1 = require("../constants");
+const stdin_1 = require("../helpers/stdin");
+const url_1 = require("../helpers/url");
 const types_1 = require("../types");
 const server_1 = require("./server");
 const tokenStorage_1 = require("./tokenStorage");
@@ -89,9 +90,10 @@ const refreshAccessToken = async (refreshToken, clientId) => {
     }
     return tokenData;
 };
-const login = async (options = {}) => {
+const login = async () => {
     const { port, waitForCallback, shutdown } = await (0, server_1.startCallbackServer)();
     const redirectUri = `http://127.0.0.1:${port}`;
+    const promptAbort = new AbortController();
     try {
         const clientId = await registerClient(redirectUri);
         const { verifier, challenge } = generatePkce();
@@ -105,21 +107,24 @@ const login = async (options = {}) => {
         authorizeUrl.searchParams.set('code_challenge', challenge);
         authorizeUrl.searchParams.set('code_challenge_method', 'S256');
         const url = authorizeUrl.toString();
-        options.onAuthorizeUrl?.(url);
-        const isWindows = process.platform === 'win32';
-        const escapedUrl = isWindows ? url.replace(/&/g, '^&') : url;
-        const [command, ...arguments_] = isWindows
-            ? ['start', '', escapedUrl]
-            : process.platform === 'darwin'
-                ? ['open', url]
-                : ['xdg-open', url];
-        (0, node_child_process_1.spawn)(command, arguments_, { stdio: 'ignore', shell: isWindows });
-        const callback = await waitForCallback();
-        if (callback.state !== state) {
+        await (0, url_1.openUrlInBrowser)(url);
+        const callback = waitForCallback();
+        const retryBrowserOnEnter = async () => {
+            if (await (0, stdin_1.promptToOpenAuthorizeUrl)(url, promptAbort.signal)) {
+                await (0, url_1.openUrlInBrowser)(url);
+            }
+            return callback;
+        };
+        const receivedCallback = await Promise.race([
+            callback,
+            retryBrowserOnEnter(),
+        ]);
+        promptAbort.abort();
+        if (receivedCallback.state !== state) {
             throw new Error('State mismatch. Possible CSRF attack.');
         }
         const tokenResponse = await exchangeCode({
-            code: callback.code,
+            code: receivedCallback.code,
             redirectUri,
             clientId,
             codeVerifier: verifier,
@@ -128,9 +133,9 @@ const login = async (options = {}) => {
         (0, tokenStorage_1.saveCredentials)(tokens);
         return tokens;
     }
-    catch (error) {
+    finally {
+        promptAbort.abort();
         shutdown();
-        throw error;
     }
 };
 exports.login = login;

package/dist/auth/server.js

@@ -57,17 +57,9 @@ const startCallbackServer = () => new Promise((resolve, reject) => {
         response.end(SUCCESS_HTML);
         callbackResolve({ code, state });
     });
-    const timeout = setTimeout(() => {
-        shutdown();
-        callbackReject(new Error('Authentication timed out. Please try again.'));
-    }, constants_1.CALLBACK_TIMEOUT_MILLISECONDS);
-    let isShutdown = false;
     const shutdown = () => {
-        if (isShutdown)
-            return;
-        isShutdown = true;
-        clearTimeout(timeout);
-        server.close();
+        if (server.listening)
+            server.close();
     };
     server.listen(0, '127.0.0.1', () => {
         const address = server.address();
@@ -78,6 +70,11 @@ const startCallbackServer = () => new Promise((resolve, reject) => {
         resolve({
             port: address.port,
             waitForCallback: async () => {
+                const timeout = setTimeout(() => {
+                    shutdown();
+                    callbackReject(new Error('Authentication timed out. Please try again.'));
+                }, constants_1.CALLBACK_TIMEOUT_MILLISECONDS);
+                server.once('close', () => clearTimeout(timeout));
                 const result = await callbackPromise;
                 shutdown();
                 return result;

package/dist/commands/auth.js

@@ -13,24 +13,6 @@ const tokenStorage_1 = require("../auth/tokenStorage");
 const constants_1 = require("../constants");
 const output_1 = require("../helpers/output");
 const types_1 = require("../types");
-const AUTHORIZATION_URL_FALLBACK_DELAY_MILLISECONDS = 500;
-const getOpenUrlInstruction = () => process.platform === 'darwin' ? '⌘-click' : 'Ctrl-click';
-const createAuthorizationUrlFallback = () => {
-    const abortController = new AbortController();
-    const schedule = (url) => {
-        const timeout = setTimeout(() => {
-            if (abortController.signal.aborted)
-                return;
-            (0, output_1.printText)(`Browser didn't open? ${getOpenUrlInstruction()} the URL below to log in.\n`, output_1.TextType.Default);
-            (0, output_1.printText)(chalk_1.default.cyan(url), output_1.TextType.Default);
-        }, AUTHORIZATION_URL_FALLBACK_DELAY_MILLISECONDS);
-        abortController.signal.addEventListener('abort', () => clearTimeout(timeout), { once: true });
-    };
-    return {
-        schedule,
-        cleanup: () => abortController.abort(),
-    };
-};
 const loginCommand = new commander_1.Command('login')
     .description('Authenticate with Circleback.')
     .option('--api-key', 'Authenticate with a Public API key')
@@ -54,16 +36,8 @@ const loginCommand = new commander_1.Command('login')
             (0, output_1.printText)('API key authentication successful.', output_1.TextType.Success);
             return;
         }
-        (0, output_1.printText)('Opening your browser for authentication…\n', output_1.TextType.Default);
-        const authorizationUrlFallback = createAuthorizationUrlFallback();
-        try {
-            await (0, oauth_1.login)({
-                onAuthorizeUrl: authorizationUrlFallback.schedule,
-            });
-        }
-        finally {
-            authorizationUrlFallback.cleanup();
-        }
+        (0, output_1.printText)('Opening your browser for authentication…', output_1.TextType.Default);
+        await (0, oauth_1.login)();
         (0, output_1.printText)('Authentication successful.', output_1.TextType.Success);
     }
     catch (error) {

package/dist/helpers/stdin.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promptToOpenAuthorizeUrl = void 0;
+const node_readline_1 = require("node:readline");
+const chalk_1 = __importDefault(require("chalk"));
+const output_1 = require("./output");
+const string_1 = require("./string");
+const promptToOpenAuthorizeUrl = async (url, signal, stdin = process.stdin) => {
+    const isInteractive = Boolean(stdin.isTTY && process.stdout.isTTY);
+    if (isInteractive) {
+        (0, output_1.printText)(`Browser didn't open? Press Enter to log in…`, output_1.TextType.Default);
+        (0, output_1.printText)('', output_1.TextType.Default);
+    }
+    (0, output_1.printText)(process.stdout.isTTY ? (0, string_1.link)(chalk_1.default.cyan.underline(url), url) : url, output_1.TextType.Default);
+    if (!isInteractive || signal?.aborted)
+        return false;
+    const readlineInterface = (0, node_readline_1.createInterface)({
+        input: stdin,
+        terminal: false,
+        signal,
+    });
+    return new Promise((resolve, reject) => {
+        readlineInterface.once('line', () => {
+            resolve(true);
+            readlineInterface.close();
+        });
+        readlineInterface.once('close', () => {
+            if (signal?.aborted) {
+                resolve(false);
+                return;
+            }
+            reject(new Error('Authentication canceled.'));
+        });
+    });
+};
+exports.promptToOpenAuthorizeUrl = promptToOpenAuthorizeUrl;

package/dist/helpers/url.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.openUrlInBrowser = void 0;
+const node_child_process_1 = require("node:child_process");
+const node_events_1 = require("node:events");
+const output_1 = require("./output");
+const openUrlInBrowser = async (url) => {
+    const isWindows = process.platform === 'win32';
+    const escapedUrl = isWindows ? url.replace(/&/g, '^&') : url;
+    const [command, ...arguments_] = isWindows
+        ? ['start', '', escapedUrl]
+        : process.platform === 'darwin'
+            ? ['open', url]
+            : ['xdg-open', url];
+    const warnAboutBrowserFailure = () => (0, output_1.printTextToStderr)('Unable to open your browser. Open the URL manually.', output_1.TextType.Warning);
+    try {
+        const child = (0, node_child_process_1.spawn)(command, arguments_, {
+            stdio: 'ignore',
+            shell: isWindows,
+        });
+        child.once('spawn', () => {
+            child.once('exit', (code) => {
+                if (code !== 0)
+                    warnAboutBrowserFailure();
+            });
+        });
+        await (0, node_events_1.once)(child, 'spawn');
+    }
+    catch {
+        warnAboutBrowserFailure();
+    }
+};
+exports.openUrlInBrowser = openUrlInBrowser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@circleback/cli",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Circleback CLI. Search and access meetings, emails, calendar events, and more.",
   "license": "MIT",
   "author": "Circleback <support@circleback.ai> (https://circleback.ai)",