@bigbinary/neeto-playwright-commons 1.26.34 → 1.26.36

package/index.d.ts

@@ -751,8 +751,10 @@ declare class ApiKeysApi {
 declare class CustomDomainApi {
   private neetoPlaywrightUtilities;
   constructor(neetoPlaywrightUtilities: CustomCommands);
+  create: (hostname: string, baseUrl?: string) => Promise<playwright_core.APIResponse | undefined>;
   delete: (customDomain: string) => Promise<playwright_core.APIResponse | undefined>;
-  fetch: () => Promise<playwright_core.APIResponse | undefined>;
+  fetch: (baseUrl?: string) => Promise<playwright_core.APIResponse | undefined>;
+  validate: (baseUrl?: string) => Promise<playwright_core.APIResponse | undefined>;
 }
 interface AllowedIpRange {
   ipStart: string;
@@ -4773,7 +4775,7 @@ declare class CustomDomainPage {
   customDomainApi: CustomDomainApi;
   subdomain: string;
   loginPage: Page;
-  baseURL: string;
+  customDomainURL: string;
   t: TFunction;
   constructor({
     browser,
@@ -4808,6 +4810,7 @@ declare class CustomDomainPage {
    * @endexample
   */
   validateCustomDomain: (domain: string) => Promise<void>;
+  private getDomainStatus;
   private loginToCustomDomain;
   private waitForTrustedSSL;
   private saveCustomDomainState;
@@ -4824,7 +4827,17 @@ declare class CustomDomainPage {
   setupCustomDomain: () => Promise<void>;
   /**
    *
-   * Connects and validates a custom domain for the specified product.
+   * Sets up a custom domain using the API instead of the UI.
+   *
+   * @example 
+   *
+   * await customDomainPage.setupCustomDomainViaAPI();
+   * @endexample
+  */
+  setupCustomDomainViaAPI: () => Promise<void>;
+  /**
+   *
+   * Connects and validates a custom domain for the specified product via the UI.
    *
    * subdomain (optional): The subdomain to use for generating the custom domain.
    *
@@ -4834,6 +4847,20 @@ declare class CustomDomainPage {
    * @endexample
   */
   connectCustomDomain: (subdomain?: string) => Promise<void>;
+  /**
+   *
+   * Connects and validates a custom domain using only API calls.
+   *
+   * subdomain (optional): The subdomain to use for generating the custom domain. If omitted, uses the subdomain from global user state.
+   *
+   * @example 
+   *
+   * await customDomainPage.connectViaAPI("cpt-form-534343434");
+   * @endexample
+  */
+  connectViaAPI: (subdomain?: string) => Promise<void>;
+  private validateDomain;
+  private awaitDomainValidation;
   private getCustomDomainFromAPI;
   /**
    *
@@ -6268,6 +6295,7 @@ declare const COMMON_SELECTORS: {
   columnsDropdownIcon: string;
   columnDragHandle: string;
   reactSelectContainer: string;
+  calloutElement: string;
 };
 /**
  *

package/index.js

@@ -131,15 +131,26 @@ class ApiKeysApi {
     }
 }
 
+const CUSTOM_DOMAIN_BASE_URL = `${BASE_URL}/custom_domains`;
 class CustomDomainApi {
     constructor(neetoPlaywrightUtilities) {
         this.neetoPlaywrightUtilities = neetoPlaywrightUtilities;
+        this.create = (hostname, baseUrl = "") => this.neetoPlaywrightUtilities.apiRequest({
+            url: `${baseUrl}${CUSTOM_DOMAIN_BASE_URL}`,
+            method: "post",
+            body: { hostname },
+        });
         this.delete = (customDomain) => this.neetoPlaywrightUtilities.apiRequest({
-            url: `${BASE_URL}/custom_domains/${customDomain}`,
+            url: `${CUSTOM_DOMAIN_BASE_URL}/${customDomain}`,
             method: "delete",
         });
-        this.fetch = () => this.neetoPlaywrightUtilities.apiRequest({
-            url: `${BASE_URL}/custom_domains`,
+        this.fetch = (baseUrl = "") => this.neetoPlaywrightUtilities.apiRequest({
+            url: `${baseUrl}${CUSTOM_DOMAIN_BASE_URL}`,
+        });
+        this.validate = (baseUrl = "") => this.neetoPlaywrightUtilities.apiRequest({
+            url: `${baseUrl}${CUSTOM_DOMAIN_BASE_URL}/validate_domain`,
+            failOnStatusCode: false,
+            method: "patch",
         });
     }
 }
@@ -4961,6 +4972,7 @@ const COMMON_SELECTORS = {
     columnsDropdownIcon: "columns-dropdown-icon",
     columnDragHandle: "column-drag-handle",
     reactSelectContainer: ".neeto-ui-react-select__container",
+    calloutElement: "callout-element",
 };
 
 const THANK_YOU_SELECTORS = {
@@ -119313,13 +119325,13 @@ class AuditLogsPage {
         this.messageBuilders = {
             [ACTIONS.inviteUsers]: (data) => `${this.admin} added ${data.emails.join(", ").toLowerCase()} to Neeto${this.product}.`,
             [ACTIONS.updatedUser]: (data) => `${this.admin} changed ${data.emails[1].toLowerCase()}'s email from ${data.emails[0].toLowerCase()} to ${data.emails[1]} on Neeto${this.product}.`,
-            [ACTIONS.removedUser]: (data) => `${this.admin} changed ${data.emails[0].toLowerCase()}'s active from true to false on Neeto${this.product}.`,
+            [ACTIONS.removedUser]: (data) => `${this.admin} removed ${data.emails[0].toLowerCase()} from Neeto${this.product}.`,
             [ACTIONS.createdRole]: (data) => `${this.admin} created ${data.roleName} role on Neeto${this.product}.`,
             [ACTIONS.addedPermission]: (data) => `${this.admin} added ${data.permissions.join(", ").toLowerCase()} permission to ${data.roleName} role on Neeto${this.product}.`,
             [ACTIONS.removedPermission]: (data) => `${this.admin} removed ${data.permissions.join(", ")} permissions from ${data.roleName} role on Neeto${this.product}.`,
             [ACTIONS.updatedRole]: (data) => `${this.admin} updated ${data.roleName} role on Neeto${this.product}.`,
             [ACTIONS.deletedRole]: (data) => `${this.admin} deleted ${data.roleName} role on Neeto${this.product}.`,
-            [ACTIONS.updatedName]: (data) => `${this.admin} updated their first name: from ${data.name} to ${this.admin.split(" ")[0]} on Neeto${this.product}.`,
+            [ACTIONS.updatedName]: (data) => `${this.admin} changed first name from ${data.name} to ${this.admin.split(" ")[0]} in Neeto${this.product}.`,
         };
     }
 }
@@ -119351,12 +119363,13 @@ class CustomDomainPage {
                     .getByRole("cell", { name: domain.split(".")[0] })).toBeVisible(),
             ]);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
+            await validateButton.click();
+            await expect(this.page.getByTestId(COMMON_SELECTORS.calloutElement)).toBeVisible({ timeout: 15000 });
             let isCertificateLimitExceeded = false;
             await expect(async () => {
                 isCertificateLimitExceeded = await this.isCertificateLimitExceeded();
                 if (isCertificateLimitExceeded)
                     return;
-                await validateButton.click();
                 await this.neetoPlaywrightUtilities.verifyToast({
                     message: this.t("neetoCustomDomains.validation.successMessage"),
                 });
@@ -119366,13 +119379,21 @@ class CustomDomainPage {
                 return;
             }
             await this.neetoPlaywrightUtilities.waitForPageLoad();
-            await expect(this.page.getByTestId(CUSTOM_DOMAIN_SELECTORS.activeTagContainer)).toBeVisible();
+            await expect(validateButton).toBeHidden();
+        };
+        this.getDomainStatus = async (hostname, baseURL) => {
+            var _a;
+            const response = await this.customDomainApi
+                .fetch(baseURL)
+                .then(response => response === null || response === void 0 ? void 0 : response.json());
+            const domain = (_a = response === null || response === void 0 ? void 0 : response.custom_domains) === null || _a === void 0 ? void 0 : _a.find((domain) => { var _a; return ((_a = domain.hostname) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === hostname.toLowerCase(); });
+            return domain === null || domain === void 0 ? void 0 : domain.status;
         };
         this.loginToCustomDomain = async () => {
             await this.page.close();
             const loginPage = this.loginPage;
             const { email } = getGlobalUserState();
-            const loginUrl = `${this.baseURL}${ROUTES.admin}`;
+            const loginUrl = `${this.customDomainURL}${ROUTES.admin}`;
             const playwrightUtils = new CustomCommands(loginPage, loginPage.request);
             const organizationPage = new OrganizationPage(loginPage, playwrightUtils);
             await loginPage.goto(loginUrl);
@@ -119384,7 +119405,7 @@ class CustomDomainPage {
         this.waitForTrustedSSL = () => expect
             .poll(() => new Promise(resolve => {
             https
-                .get(this.baseURL, { rejectUnauthorized: true }, res => {
+                .get(this.customDomainURL, { rejectUnauthorized: true }, res => {
                 res.resume();
                 resolve(true);
             })
@@ -119398,7 +119419,7 @@ class CustomDomainPage {
             await this.loginPage.context().storageState({ path: STORAGE_STATE });
             const mergedCredentials = mergeAll([readFileSyncIfExists(), { user }]);
             writeDataToFile(JSON.stringify(mergedCredentials, null, 2));
-            updateCredentials({ key: "baseUrl", value: this.baseURL });
+            updateCredentials({ key: "baseUrl", value: this.customDomainURL });
             updateCredentials({ key: "domain", value: CUSTOM_DOMAIN_SUFFIX });
         };
         // eslint-disable-next-line playwright/no-wait-for-timeout
@@ -119412,21 +119433,57 @@ class CustomDomainPage {
             await this.loginToCustomDomain();
             await this.saveCustomDomainState();
         };
+        this.setupCustomDomainViaAPI = async () => {
+            if (shouldSkipCustomDomainSetup())
+                return;
+            await this.connectViaAPI();
+            const context = await this.browser.newContext(EMPTY_STORAGE_STATE);
+            this.loginPage = await context.newPage();
+            await this.loginToCustomDomain();
+            await this.saveCustomDomainState();
+        };
         this.connectCustomDomain = async (subdomain) => {
             if (shouldSkipCustomDomainSetup())
                 return;
-            const baseURL = baseURLGenerator(this.product, subdomain);
             const domain = this.getCustomDomain(subdomain);
-            this.baseURL = `https://${domain}`;
+            const baseURL = baseURLGenerator(this.product, this.subdomain);
+            this.customDomainURL = `https://${domain}`;
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.page.goto(`${baseURL}${ROUTES.adminPanel.customDomain}`);
             await this.neetoPlaywrightUtilities.waitForPageLoad();
             await this.addCustomDomain(domain);
             await this.validateCustomDomain(domain);
-            process.env.BASE_URL = this.baseURL;
+            process.env.BASE_URL = this.customDomainURL;
+            await this.waitForTrustedSSL();
+            await this.waitForDomainPropagation();
+        };
+        this.connectViaAPI = async (subdomain) => {
+            if (shouldSkipCustomDomainSetup())
+                return;
+            const domain = this.getCustomDomain(subdomain);
+            this.customDomainURL = `https://${domain}`;
+            const baseURL = baseURLGenerator(this.product, this.subdomain);
+            await this.page.goto(`${baseURL}${ROUTES.adminPanel.customDomain}`);
+            await this.page.waitForLoadState("domcontentloaded");
+            await this.customDomainApi.create(domain, baseURL);
+            await this.validateDomain(baseURL);
+            await this.awaitDomainValidation(domain, baseURL);
+            process.env.BASE_URL = this.customDomainURL;
             await this.waitForTrustedSSL();
             await this.waitForDomainPropagation();
         };
+        this.validateDomain = (baseURL) => expect
+            .poll(async () => { var _a; return (_a = (await this.customDomainApi.validate(baseURL))) === null || _a === void 0 ? void 0 : _a.status(); }, {
+            timeout: 2 * 60000,
+            intervals: [10000],
+        })
+            .toBe(200);
+        this.awaitDomainValidation = (hostname, baseURL) => expect
+            .poll(async () => this.getDomainStatus(hostname, baseURL), {
+            timeout: 2 * 60000,
+            intervals: [5000],
+        })
+            .toBe("active");
         this.getCustomDomainFromAPI = async () => {
             const { custom_domains } = await this.customDomainApi
                 .fetch()