@bigbinary/neeto-playwright-commons 1.26.11 → 1.26.13

package/index.d.ts

@@ -2146,7 +2146,7 @@ declare class GooglePage extends IntegrationBase {
    * @endexample
   */
   loginToGoogle: () => Promise<void>;
-  enterTotpCode: (locator: Locator) => Promise<void>;
+  enterTotpCode: () => Promise<void>;
   /**
    *
    * Logs out of the Google account by navigating to the account settings and clicking the "Sign Out" button.
@@ -7690,7 +7690,7 @@ declare const getListCount: ({
 declare const getGlobalUserProps: (page: Page) => Promise<Record<string, string>>;
 /**
  *
- * Fetches the current text content from the system clipboard in the browser context.
+ * Fetches the current text content from the system clipboard in the browser context. It first attempts to use the native clipboard API (navigator.clipboard.readText()). If that fails, it falls back to creating a temporary textarea and using keyboard paste to retrieve the clipboard content.
  *
  * page: The Playwright Page object representing the current browser page.
  *

package/index.js

@@ -8,7 +8,7 @@ import path__default from 'path';
 import test, { expect, test as test$1, chromium as chromium$1, defineConfig, devices } from '@playwright/test';
 import { getI18nInstance, initI18n } from 'playwright-i18next-fixture';
 import require$$0$4 from 'util';
-import { curry, not, isEmpty, pluck, mergeDeepLeft, isNil, isNotNil, mergeAll } from 'ramda';
+import { curry, isNotNil, not, isEmpty, pluck, mergeDeepLeft, isNil, mergeAll } from 'ramda';
 import { execSync } from 'child_process';
 import dayjs from 'dayjs';
 import require$$0$7 from 'stream';
@@ -4886,7 +4886,7 @@ const removeCredentialFile = () => {
     require$$0$3.unlink(STORAGE_STATE, error => {
         if (!error)
             return;
-        console.log(error);
+        console.error(error);
     });
 };
 const clearCredentials = () => {
@@ -4955,7 +4955,43 @@ const getListCount = async ({ page, countSelector, }) => {
     return Number(countText === null || countText === void 0 ? void 0 : countText.trim().split(" ")[0]);
 };
 const getGlobalUserProps = async (page) => (await page.evaluate(() => window.globalProps.user));
-const getClipboardContent = (page) => page.evaluate(() => navigator.clipboard.readText());
+const createTextareaAndEvaluateCopiedText = async (page) => {
+    const textareaHandle = await page.evaluateHandle(() => {
+        const textarea = document.createElement("textarea");
+        Object.assign(textarea.style, {
+            position: "fixed",
+            top: "0",
+            left: "0",
+            opacity: "0",
+            pointerEvents: "none",
+            zIndex: "9999",
+        });
+        document.body.appendChild(textarea);
+        textarea.focus();
+        return textarea;
+    });
+    try {
+        await page.keyboard.press("ControlOrMeta+v");
+        return await page.evaluate(el => el.value, textareaHandle);
+    }
+    finally {
+        await textareaHandle.evaluate(el => el.remove());
+        await textareaHandle.dispose();
+    }
+};
+const getClipboardContent = async (page) => {
+    // Attempt 1: Native Clipboard API
+    const clipboardText = await page.evaluate(async () => {
+        var _a;
+        if (!((_a = navigator.clipboard) === null || _a === void 0 ? void 0 : _a.readText))
+            return null;
+        return await navigator.clipboard.readText();
+    });
+    if (isNotNil(clipboardText))
+        return clipboardText;
+    // Attempt 2: Keyboard paste fallback
+    return createTextareaAndEvaluateCopiedText(page);
+};
 const grantClipboardPermissions = (context) => context.grantPermissions(["clipboard-read", "clipboard-write"]);
 const getFullUrl = (path) => shouldSkipCustomDomainSetup() ? path : `${process.env.BASE_URL}${path}`;
 const globalShortcuts = (t) => [
@@ -116391,11 +116427,8 @@ class GooglePage extends IntegrationBase {
                 .getByRole("link", { name: GOOGLE_LOGIN_TEXTS.neetoAutomation })
                 .click();
             await expect(chooseAnAccountHeading).toBeHidden({ timeout: 10000 });
-            const verificationCode = this.page
-                .locator("form")
-                .getByText(GOOGLE_LOGIN_TEXTS.verificationCode);
             this.page.url().includes(THIRD_PARTY_ROUTES.google.totpChallenge) &&
-                (await this.enterTotpCode(verificationCode));
+                (await this.enterTotpCode());
             await this.handleNotVerifiedPage();
             const signInHeading = this.page.getByRole("heading", {
                 name: GOOGLE_LOGIN_TEXTS.signInHeading(appName),
@@ -116434,32 +116467,29 @@ class GooglePage extends IntegrationBase {
                     .click());
             await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.totpChallenge));
-            const twoStepVerification = this.page.locator("form").getByRole("heading", {
-                name: GOOGLE_LOGIN_TEXTS.twoStepVerification,
-                level: 2,
-                exact: true,
-            });
-            await expect(twoStepVerification).toBeVisible({ timeout: 15000 });
-            await this.enterTotpCode(twoStepVerification);
+            await this.enterTotpCode();
             await this.page.waitForLoadState("load", { timeout: 25000 });
             await this.page.waitForURL(new RegExp(THIRD_PARTY_ROUTES.google.myAccount));
         };
-        this.enterTotpCode = async (locator) => {
+        this.enterTotpCode = async () => {
             let previousToken = null;
+            const codeInput = this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode);
+            await expect(codeInput).toBeVisible({ timeout: 20000 });
             await expect(async () => {
                 let totpToken = this.totp.generate({ timestamp: Date.now() });
                 if (totpToken === previousToken) {
                     const remainingTime = this.totp.remaining({ timestamp: Date.now() });
+                    // Wait for the remaining time plus a small buffer to ensure new token is generated
                     // eslint-disable-next-line playwright/no-wait-for-timeout
-                    await this.page.waitForTimeout(remainingTime + 500); // Wait for the remaining time plus a small buffer (500ms) to ensure new token
+                    await this.page.waitForTimeout(remainingTime + 500);
                     totpToken = this.totp.generate({ timestamp: Date.now() });
                 }
                 previousToken = totpToken;
-                await this.page.getByLabel(GOOGLE_LOGIN_TEXTS.enterCode).fill(totpToken);
+                await codeInput.fill(totpToken);
                 expect(this.totp.validate({ token: totpToken })).not.toBeNull();
                 await this.page.locator(GOOGLE_LOGIN_SELECTORS.totpNext).click();
                 await expect(this.page.getByText(GOOGLE_LOGIN_TEXTS.wrongCode)).toBeHidden({ timeout: 10000 });
-                await expect(locator).toBeHidden({ timeout: 10000 });
+                await expect(codeInput).toBeHidden({ timeout: 15000 });
             }).toPass({ timeout: 2 * 60 * 1000 });
         };
         this.logoutFromGoogle = async () => {