@datacamp/learn-vm-scripts 1.1.1 → 1.2.0

package/dist/index.cjs

@@ -92815,6 +92815,8 @@ async function loginToDatabricks({
 // src/resetChrome.ts
 var import_node_child_process = require("node:child_process");
 var import_promises3 = require("node:fs/promises");
+
+// src/retryWithExponentialBackoff.ts
 var retryWithExponentialBackoff = async ({
   fn,
   maxRetries,
@@ -92835,6 +92837,8 @@ var retryWithExponentialBackoff = async ({
   }
   throw new Error("Max retries exceeded");
 };
+
+// src/resetChrome.ts
 var resetChrome = async ({ userDataDir }) => {
   try {
     const stdout = (0, import_node_child_process.execSync)("taskkill /IM chrome.exe /F");
@@ -92899,17 +92903,36 @@ async function loginToFabric({
   username,
   password
 }) {
-  log("Logging in via Azure login...");
-  await loginToAzure({
-    url: AZURE_LOGIN_URL,
-    username,
-    page,
-    password,
-    skipOnboarding: false
-  });
   log("Navigating to Fabric login page...");
   await page.goto(ensureHttps(url));
-  log("Logged in to Fabric successfully");
+  log("Entering email...");
+  await page.waitForSelector('input[id="email"]');
+  await setInput({
+    page,
+    querySelector: 'input[id="email"]',
+    value: username
+  });
+  await page.waitForSelector("button#submitBtn[onclick]");
+  await retryWithExponentialBackoff({
+    fn: () => page.click("button#submitBtn[onclick]"),
+    initialDelay: 100,
+    maxRetries: 10
+  });
+  log("Entering password...");
+  await page.waitForSelector('input[type="password"]');
+  await setInput({
+    page,
+    querySelector: 'input[type="password"]',
+    value: password
+  });
+  await page.waitForSelector('input[type="submit"]');
+  await Promise.all([
+    page.waitForNavigation(),
+    page.click('input[type="submit"]')
+  ]);
+  log("Making sure user stays signed in...");
+  await page.waitForSelector('input[type="submit"]');
+  await page.click('input[type="submit"]');
 }
 
 // src/startInputWatcher.ts

package/dist/local.cjs

@@ -85624,7 +85624,6 @@ async function setupPuppeteerPage({
 }
 
 // src/utils.ts
-var AZURE_LOGIN_URL = "https://portal.azure.com/";
 function ensureHttps(url) {
   const hasProtocol = /^(http|https):\/\//i.test(url);
   if (!hasProtocol) {
@@ -85652,79 +85651,65 @@ var log = (message) => {
   console.log(`[${(/* @__PURE__ */ new Date()).toISOString()}] ${message}`);
 };
 
-// src/azureLogin.ts
-var closeOnboardingPopups = async (page) => {
-  const welcomeSurveyCloseButton = 'span.fxs-welcomesurvey-close-icon[role="button"]';
-  await page.waitForSelector(welcomeSurveyCloseButton);
-  await page.click(welcomeSurveyCloseButton);
-  const popupButton = "button.fxs-teaching-bubble-close";
-  await page.waitForSelector(popupButton);
-  await page.click(popupButton);
+// src/retryWithExponentialBackoff.ts
+var retryWithExponentialBackoff = async ({
+  fn,
+  maxRetries,
+  initialDelay
+}) => {
+  let retries = 0;
+  while (retries < maxRetries) {
+    try {
+      await fn();
+      return;
+    } catch (e) {
+      console.error(`Error in exponential backoff iteration ${retries}:`, e);
+      await new Promise(
+        (resolve5) => setTimeout(resolve5, 2 ** retries * initialDelay)
+      );
+      retries++;
+    }
+  }
+  throw new Error("Max retries exceeded");
 };
-async function loginToAzure({
+
+// src/fabricLogin.ts
+async function loginToFabric({
   url,
-  username,
   page,
-  password,
-  skipOnboarding = true
+  username,
+  password
 }) {
-  log("Navigating to Azure login page...");
-  await Promise.all([page.waitForNavigation(), page.goto(ensureHttps(url))]);
+  log("Navigating to Fabric login page...");
+  await page.goto(ensureHttps(url));
   log("Entering email...");
-  const usernameQuerySelector = '[name="loginfmt"]';
-  await page.waitForSelector(usernameQuerySelector);
+  await page.waitForSelector('input[id="email"]');
   await setInput({
     page,
-    querySelector: usernameQuerySelector,
+    querySelector: 'input[id="email"]',
     value: username
   });
-  await Promise.all([
-    page.waitForNavigation({ waitUntil: "networkidle0" }),
-    page.click('input[type="submit"]')
-  ]);
-  log("Email entered successfully");
+  await page.waitForSelector("button#submitBtn[onclick]");
+  await retryWithExponentialBackoff({
+    fn: () => page.click("button#submitBtn[onclick]"),
+    initialDelay: 100,
+    maxRetries: 10
+  });
   log("Entering password...");
-  const passwordQuerySelector = 'input[type="password"]';
-  await page.waitForSelector(passwordQuerySelector, { visible: true });
+  await page.waitForSelector('input[type="password"]');
   await setInput({
     page,
-    querySelector: passwordQuerySelector,
+    querySelector: 'input[type="password"]',
     value: password
   });
+  await page.waitForSelector('input[type="submit"]');
   await Promise.all([
     page.waitForNavigation(),
     page.click('input[type="submit"]')
   ]);
-  log("Password entered successfully");
-  log("Ensuring user stays signed in ...");
-  await page.waitForSelector('[type="submit"]');
-  await page.click('[type="submit"]');
-  if (skipOnboarding) {
-    log("Skipping onboarding...");
-    void closeOnboardingPopups(page).catch((error) => {
-      console.error("Error in onboarding of Azure login: ", error);
-    });
-  }
-  log("Logged in to Azure successfully");
-}
-
-// src/fabricLogin.ts
-async function loginToFabric({
-  url,
-  page,
-  username,
-  password
-}) {
-  await loginToAzure({
-    url: AZURE_LOGIN_URL,
-    username,
-    page,
-    password,
-    skipOnboarding: false
-  });
-  log("Navigating to Fabric login page...");
-  await page.goto(ensureHttps(url));
-  log("Logged in to Fabric successfully");
+  log("Making sure user stays signed in...");
+  await page.waitForSelector('input[type="submit"]');
+  await page.click('input[type="submit"]');
 }
 
 // src/local.ts
@@ -85736,9 +85721,9 @@ var main = async () => {
     userDataDir
   });
   await loginToFabric({
-    url: "https://app.fabric.microsoft.com/groups/46077d92-40e8-4afd-8028-5785d8011fe9/list?ctid=348b43ee-8752-46f9-808c-350eaafe29b6&experience=data-engineering",
-    username: "student-f166763f-366f-41bf-9135-9f8def127578@datacamplearn.onmicrosoft.com",
-    password: "%lM4JMk!CX3oh1HCP@5s",
+    url: "https://app.fabric.microsoft.com/groups/e6ee3b8e-9bea-4387-acb8-c6f6e6c01ad3/list?ctid=348b43ee-8752-46f9-808c-350eaafe29b6&experience=data-engineering",
+    username: "student-f0ef13a1-ea92-4bb2-b6cf-781f7d222c8c@datacamplearn.onmicrosoft.com",
+    password: "s98BSHz@JYUEOyO9P@5s",
     page
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datacamp/learn-vm-scripts",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "repository": "git@github.com:datacamp-engineering/learn-vm-scripts.git",
   "description": "Scripts used by VMs in learn.",
   "main": "./dist/index.cjs",