@datacamp/learn-vm-scripts 0.0.8-rc.2 → 0.0.9

package/dist/index.cjs

@@ -92696,6 +92696,14 @@ var log = (message) => {
 };
 
 // src/azureLogin.ts
+var optionalPartsOfLogin = 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);
+};
 async function loginToAzure({
   url,
   username,
@@ -92736,10 +92744,27 @@ async function loginToAzure({
   log("Ensuring user stays signed in ...");
   await page.waitForSelector('[type="submit"]');
   await page.click('[type="submit"]');
+  void optionalPartsOfLogin(page);
   log("Logged in to Azure successfully");
 }
 
 // src/awsLogin.ts
+var oldUi = async (page) => {
+  const rememberAccountCheckbox = 'input[id="remember_account_checkbox"]';
+  await page.waitForSelector(rememberAccountCheckbox);
+  await page.click(rememberAccountCheckbox);
+  const signInButton = 'a[id="signin_button"]';
+  await page.waitForSelector(signInButton);
+  await page.click(signInButton);
+};
+var newUi = async (page) => {
+  const rememberAccountCheckbox = 'span[data-testid="remember-account"] input[type="checkbox"]';
+  await page.waitForSelector(rememberAccountCheckbox);
+  await page.click(rememberAccountCheckbox);
+  const signInButton = 'button[type="submit"]';
+  await page.waitForSelector(signInButton);
+  await page.click(signInButton);
+};
 async function loginToAWS({
   url,
   username,
@@ -92750,12 +92775,19 @@ async function loginToAWS({
   await page.goto(ensureHttps(url));
   await page.waitForSelector('input[name="username"]');
   await page.type('input[name="username"]', username);
+  await setInput({
+    page,
+    querySelector: 'input[name="username"]',
+    value: username
+  });
   await page.waitForSelector('input[name="password"]');
   await page.type('input[name="password"]', password);
-  await page.waitForSelector('input[id="remember_account_checkbox"]');
-  await page.click('input[id="remember_account_checkbox"]');
-  await page.waitForSelector('a[id="signin_button"]');
-  await page.click('a[id="signin_button"]');
+  await setInput({
+    page,
+    querySelector: 'input[name="password"]',
+    value: password
+  });
+  await Promise.any([oldUi(page), newUi(page)]);
   log("Logged in to AWS successfully");
 }
 

package/dist/local.cjs

@@ -85610,11 +85610,11 @@ async function setupPuppeteerPage({
 }) {
   const browser = await puppeteer_core_default.launch({
     args: [
-      "--start-maximized",
-      "--kiosk",
-      "--kiosk-mode-single-window",
-      "--kiosk-mode-no-prompts",
-      "--kiosk-mode-no-dialogs"
+      "--start-maximized"
+      // '--kiosk',
+      // '--no-prompts',
+      // '--no-dialogs',
+      // '--disable-pinch',
     ],
     executablePath: executablePath3,
     headless: false,
@@ -85630,6 +85630,7 @@ 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) {
@@ -85657,47 +85658,57 @@ var setInput = ({
   );
 };
 
-// src/awsLogin.ts
-var oldUi = async (page) => {
-  const rememberAccountCheckbox = 'input[id="remember_account_checkbox"]';
-  await page.waitForSelector(rememberAccountCheckbox);
-  await page.click(rememberAccountCheckbox);
-  const signInButton = 'a[id="signin_button"]';
-  await page.waitForSelector(signInButton);
-  await page.click(signInButton);
+// src/azureLogin.ts
+var optionalPartsOfLogin = 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);
 };
-var newUi = async (page) => {
-  const rememberAccountCheckbox = 'span[data-testid="remember-account"] input[type="checkbox"]';
-  await page.waitForSelector(rememberAccountCheckbox);
-  await page.click(rememberAccountCheckbox);
-  const signInButton = 'button[type="submit"]';
-  await page.waitForSelector(signInButton);
-  await page.click(signInButton);
-};
-async function loginToAWS({
+async function loginToAzure({
   url,
   username,
   page,
   password
 }) {
-  log("Navigating to AWS login page...");
-  await page.goto(ensureHttps(url));
-  await page.waitForSelector('input[name="username"]');
-  await page.type('input[name="username"]', username);
+  log("Navigating to Azure login page...");
+  await Promise.all([
+    page.waitForNavigation(),
+    page.goto(ensureHttps(url || AZURE_LOGIN_URL))
+  ]);
+  log("Entering email...");
+  const usernameQuerySelector = '[name="loginfmt"]';
+  await page.waitForSelector(usernameQuerySelector);
   await setInput({
     page,
-    querySelector: 'input[name="username"]',
+    querySelector: usernameQuerySelector,
     value: username
   });
-  await page.waitForSelector('input[name="password"]');
-  await page.type('input[name="password"]', password);
+  await Promise.all([
+    page.waitForNavigation({ waitUntil: "networkidle0" }),
+    page.click('input[type="submit"]')
+  ]);
+  log("Email entered successfully");
+  log("Entering password...");
+  const passwordQuerySelector = 'input[type="password"]';
+  await page.waitForSelector(passwordQuerySelector, { visible: true });
   await setInput({
     page,
-    querySelector: 'input[name="password"]',
+    querySelector: passwordQuerySelector,
     value: password
   });
-  await Promise.any([oldUi(page), newUi(page)]);
-  log("Logged in to AWS successfully");
+  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"]');
+  void optionalPartsOfLogin(page);
+  log("Logged in to Azure successfully");
 }
 
 // src/local.ts
@@ -85708,10 +85719,10 @@ var main = async () => {
     executablePath: executablePath2,
     userDataDir
   });
-  await loginToAWS({
-    url: "https://288761764123.signin.aws.amazon.com/console?region=us-east-1",
-    username: "datacamp-learner-user",
-    password: "bHo%V)VFWmdAyjT5P@5s",
+  await loginToAzure({
+    url: "https://portal.azure.com",
+    username: "student-be1288f0-5375-4105-ab58-ed0fc2ca5d2e@datacamplearn.onmicrosoft.com",
+    password: "9y4*E6kr&q)dtfiWP@5s",
     page
   });
 };

package/package.json

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