LightZirconite/Microsoft-Rewards-Script
1
0
Fork 0
mirror of https://github.com/TheNetsky/Microsoft-Rewards-Script.git synced 2026-01-10 02:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Login.ts (#349)

Browse Source
This commit is contained in:
Light
2025-09-10 20:44:20 +02:00
committed by GitHub
parent 072e96dd53
commit 2e80266ad1
1 changed files with 47 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/functions/Login.ts
View File

@@ -347,13 +347,56 @@ export class Login {
}
private async dismissLoginMessages(page: Page) {
// Use Passekey
if (await page.waitForSelector('[data-testid="biometricVideo"]', { timeout: 2000 }).catch(() => null)) {
// Passkey / Windows Hello prompt ("Sign in faster"), click "Skip for now"
// Primary heuristics: presence of biometric video OR title mentions passkey/sign in faster
const passkeyVideo = await page.waitForSelector('[data-testid="biometricVideo"]', { timeout: 2000 }).catch(() => null)
let handledPasskey = false
if (passkeyVideo) {
const skipButton = await page.$('[data-testid="secondaryButton"]')
if (skipButton) {
await skipButton.click()
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Dismissed "Use Passekey" modal')
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Dismissed "Use Passkey" modal via data-testid=secondaryButton')
await page.waitForTimeout(500)
handledPasskey = true
}
}
if (!handledPasskey) {
// Fallback heuristics: title text or presence of primary+secondary buttons typical of the passkey screen
const titleEl = await page.waitForSelector('[data-testid="title"]', { timeout: 1000 }).catch(() => null)
const titleText = (titleEl ? (await titleEl.textContent()) : '')?.trim() || ''
const looksLikePasskeyTitle = /sign in faster|passkey/i.test(titleText)
const secondaryBtn = await page.waitForSelector('button[data-testid="secondaryButton"]', { timeout: 1000 }).catch(() => null)
const primaryBtn = await page.waitForSelector('button[data-testid="primaryButton"]', { timeout: 1000 }).catch(() => null)
if (looksLikePasskeyTitle && secondaryBtn) {
await secondaryBtn.click()
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Dismissed Passkey screen by title + secondaryButton')
await page.waitForTimeout(500)
handledPasskey = true
} else if (secondaryBtn && primaryBtn) {
// If both buttons are visible (Next + Skip for now), prefer the secondary (Skip for now)
await secondaryBtn.click()
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Dismissed Passkey screen by button pair heuristic')
await page.waitForTimeout(500)
handledPasskey = true
} else if (!handledPasskey) {
// Last-resort fallbacks by text and close icon
const skipByText = await page.locator('xpath=//button[contains(normalize-space(.), "Skip for now")]').first()
if (await skipByText.isVisible().catch(() => false)) {
await skipByText.click()
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Dismissed Passkey screen via text fallback')
await page.waitForTimeout(500)
handledPasskey = true
} else {
const closeBtn = await page.$('#close-button')
if (closeBtn) {
await closeBtn.click().catch(() => { })
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Attempted to close Passkey screen via close button')
await page.waitForTimeout(500)
}
}
}
}
@@ -414,4 +457,4 @@ export class Login {
throw this.bot.log(this.bot.isMobile, 'CHECK-LOCKED', 'This account has been locked! Remove the account from "accounts.json" and restart!', 'error')
}
}
}
}