ag-awsauth 0.0.292 → 0.0.293

package/dist/helpers/browser.d.ts

@@ -2,7 +2,9 @@ import type { Page } from 'puppeteer';
 export declare const closeBrowser: () => Promise<void>;
 export declare const launchBrowser: () => Promise<void>;
 export declare const goToPage: (url: string) => Promise<Page>;
-export declare const allowAccessIfRequested: (page: Page) => Promise<void>;
+export declare const allowAccessSelectors: string[];
+export declare const dismissAllowAccessPrompt: (page: Page, perSelectorTimeout?: number) => Promise<boolean>;
+export declare const allowAccessIfRequested: (page: Page, timeout?: number) => Promise<boolean>;
 export declare function getMFA(p: {
     verificationUriComplete: string;
     creds: {

package/dist/helpers/browser.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.allowAccessIfRequested = exports.goToPage = exports.launchBrowser = exports.closeBrowser = void 0;
+exports.allowAccessIfRequested = exports.dismissAllowAccessPrompt = exports.allowAccessSelectors = exports.goToPage = exports.launchBrowser = exports.closeBrowser = void 0;
 exports.getMFA = getMFA;
 const log_1 = require("ag-common/dist/common/helpers/log");
 const puppeteer_1 = require("puppeteer");
@@ -83,15 +83,154 @@ const goToPage = (url) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 exports.goToPage = goToPage;
-const allowAccessIfRequested = (page) => __awaiter(void 0, void 0, void 0, function* () {
-    const allowAccess = yield page.waitForSelector('[data-testid="allow-access-button"]', { timeout: config_1.timeoutMs, visible: true });
-    if (!allowAccess) {
-        throw new Error('allow access button not found');
+exports.allowAccessSelectors = [
+    '[data-testid="allow-access-button"]',
+    '[data-analytics="allow-access-button"]',
+    'button[data-testid="allow-access-button"]',
+];
+const clickSelectorIfPresent = (page_1, selector_1, ...args_1) => __awaiter(void 0, [page_1, selector_1, ...args_1], void 0, function* (page, selector, timeout = config_1.timeoutShortMs) {
+    try {
+        const el = yield page.waitForSelector(selector, {
+            timeout,
+            visible: true,
+        });
+        if (!el) {
+            return false;
+        }
+        try {
+            yield el.click();
+        }
+        catch (_a) {
+            // Element may detach between query and click (SPA re-render).
+            // Fall back to an in-page click which re-queries the selector.
+            yield page
+                .$eval(selector, (bn) => bn.click())
+                .catch(() => undefined);
+        }
+        return true;
+    }
+    catch (_b) {
+        return false;
+    }
+});
+const clickAllowAccessByText = (page) => __awaiter(void 0, void 0, void 0, function* () {
+    try {
+        return yield page.evaluate(() => {
+            const isVisible = (el) => {
+                const rect = el.getBoundingClientRect();
+                return (rect.width > 0 &&
+                    rect.height > 0 &&
+                    getComputedStyle(el).visibility !== 'hidden');
+            };
+            // Match button, link, or ARIA-button variants: AWS renders the
+            // "Allow access" consent action differently across releases
+            // (orange button vs link), so don't assume a <button>.
+            const candidates = Array.from(document.querySelectorAll('button, a, [role="button"], input[type="submit"], input[type="button"]')).filter((el) => isVisible(el));
+            const label = (el) => {
+                var _a, _b;
+                return ((_b = (_a = el.value) !== null && _a !== void 0 ? _a : el.textContent) !== null && _b !== void 0 ? _b : '')
+                    .trim()
+                    .toLowerCase();
+            };
+            const exact = candidates.find((el) => label(el) === 'allow access');
+            const target = exact !== null && exact !== void 0 ? exact : candidates.find((el) => label(el).includes('allow access'));
+            if (target) {
+                target.click();
+                return true;
+            }
+            return false;
+        });
+    }
+    catch (_a) {
+        return false;
     }
-    (0, log_1.info)('click allow-access-button');
-    yield allowAccess.click();
+});
+const dismissAllowAccessPrompt = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, perSelectorTimeout = 1000) {
+    for (const selector of exports.allowAccessSelectors) {
+        if (yield clickSelectorIfPresent(page, selector, perSelectorTimeout)) {
+            (0, log_1.info)(`click allow-access-button (${selector})`);
+            return true;
+        }
+    }
+    if (yield clickAllowAccessByText(page)) {
+        (0, log_1.info)('click allow-access-button (text match "Allow access")');
+        return true;
+    }
+    return false;
+});
+exports.dismissAllowAccessPrompt = dismissAllowAccessPrompt;
+const allowAccessIfRequested = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, timeout = config_1.timeoutMs) {
+    const deadline = Date.now() + timeout;
+    // Poll so a slow-rendering consent dialog is not missed, while still
+    // returning quickly when the prompt appears (or never appears).
+    while (Date.now() < deadline) {
+        if (yield (0, exports.dismissAllowAccessPrompt)(page)) {
+            return true;
+        }
+        if (Date.now() + 500 >= deadline) {
+            break;
+        }
+        yield new Promise((resolve) => setTimeout(resolve, 500));
+    }
+    return false;
 });
 exports.allowAccessIfRequested = allowAccessIfRequested;
+const waitForSuccessDefensively = (page_1, ...args_1) => __awaiter(void 0, [page_1, ...args_1], void 0, function* (page, timeout = config_1.timeoutMs) {
+    var _a;
+    const deadline = Date.now() + timeout;
+    let lastError;
+    while (Date.now() < deadline) {
+        // Success already visible?
+        try {
+            const success = yield page.waitForSelector('[data-analytics-alert="success"]', { timeout: 2000 });
+            if (success) {
+                return;
+            }
+        }
+        catch (e) {
+            lastError = e;
+        }
+        // Defensively dismiss the consent prompt if it is (still) showing.
+        // This covers the "Allow <user> to access your data? / Allow access"
+        // dialog which otherwise blocks success indefinitely.
+        try {
+            if (yield (0, exports.dismissAllowAccessPrompt)(page)) {
+                (0, log_1.info)('dismissed allow-access prompt while waiting for success');
+                continue;
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error dismissing allow-access prompt:', e);
+        }
+        // Also re-check the other intermediate confirmations while polling.
+        try {
+            if (yield clickSelectorIfPresent(page, '[data-analytics="accept-user-code"]', 1000)) {
+                (0, log_1.info)('click accept-user-code (while waiting for success)');
+                continue;
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking accept-user-code while waiting:', e);
+        }
+        try {
+            if (yield clickSelectorIfPresent(page, '#cli_verification_btn', 1000)) {
+                (0, log_1.info)('clicking auth request button (while waiting for success)');
+            }
+        }
+        catch (e) {
+            (0, log_1.debug)('error clicking auth request button while waiting:', e);
+        }
+    }
+    // Final wait to surface a clear TimeoutError if success never arrived.
+    try {
+        yield page.waitForSelector('[data-analytics-alert="success"]', {
+            timeout: config_1.timeoutShortMs,
+        });
+    }
+    catch (_b) {
+        throw ((_a = lastError) !== null && _a !== void 0 ? _a : new Error('Timed out waiting for success'));
+    }
+});
 function getMFA(p) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -203,15 +342,11 @@ function getMFA(p) {
         }
         try {
             (0, log_1.info)('accept-user-code');
-            const messageDiv = yield page.waitForSelector('[data-analytics="accept-user-code"]', {
-                timeout: config_1.timeoutMs,
-            });
-            if (messageDiv) {
+            if (yield clickSelectorIfPresent(page, '[data-analytics="accept-user-code"]', config_1.timeoutMs)) {
                 (0, log_1.info)('click accept-user-code');
-                yield messageDiv.click();
             }
             else {
-                throw new Error('access prompt not found');
+                (0, log_1.debug)('accept-user-code prompt not present, continuing');
             }
         }
         catch (e) {
@@ -220,8 +355,10 @@ function getMFA(p) {
         let accessStateFound = false;
         try {
             (0, log_1.info)('allow-access-button');
-            yield (0, exports.allowAccessIfRequested)(page);
-            accessStateFound = true;
+            accessStateFound = yield (0, exports.allowAccessIfRequested)(page, config_1.timeoutMedMs);
+            if (!accessStateFound) {
+                (0, log_1.debug)('allow-access prompt not present, continuing');
+            }
         }
         catch (e) {
             (0, log_1.debug)('error clicking allow-access-button:', e);
@@ -242,9 +379,7 @@ function getMFA(p) {
         }
         //
         (0, log_1.info)('waiting for success');
-        yield page.waitForSelector('[data-analytics-alert="success"]', {
-            timeout: config_1.timeoutMs,
-        });
+        yield waitForSuccessDefensively(page, config_1.timeoutMs);
         (0, log_1.warn)('mfa success');
         const cookies = yield page.cookies();
         const ssoAuthn = (_a = cookies.find((c) => c.name === 'x-amz-sso_authn')) === null || _a === void 0 ? void 0 : _a.value;

package/package.json

@@ -5,7 +5,7 @@
   "author": "andreigec@hotmail.com",
   "license": "ISC",
   "private": false,
-  "version": "0.0.292",
+  "version": "0.0.293",
   "preferGlobal": true,
   "bin": {
     "ag-awsauth": "./bin/awsauth.js"