LightZirconite/Microsoft-Rewards-Bot
1
1
Fork 0
mirror of https://github.com/LightZirconite/Microsoft-Rewards-Bot.git synced 2026-01-10 17:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: add password option selectors and improve password link handling in login flow

Browse Source
This commit is contained in:
LightZirconite
2025-12-06 13:52:52 +01:00
parent 87166cf3ea
commit 76ed1ca9a6
1 changed files with 61 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/functions/Login.ts
View File

@@ -57,6 +57,39 @@ export class Login {
private tokenUrl = 'https://login.microsoftonline.com/consumers/oauth2/v2.0/token' private tokenUrl = 'https://login.microsoftonline.com/consumers/oauth2/v2.0/token'
private scope = 'service::prod.rewardsplatform.microsoft.com::MBI_SSL' private scope = 'service::prod.rewardsplatform.microsoft.com::MBI_SSL'
private static readonly PASSWORD_OPTION_SELECTORS = {
otherWays: [
'#signInAnotherWay',
'button#signInAnotherWay',
'button[data-id="signInAnotherWay"]',
'button:has-text("Other ways to sign in")',
'span[role="button"]:has-text("Other ways to sign in")',
'a:has-text("Other ways to sign in")',
'button:has-text("Sign in another way")',
'span[role="button"]:has-text("Sign in another way")',
'a:has-text("Sign in another way")',
'button:has-text("Try another way")',
'span[role="button"]:has-text("Try another way")',
'button:has-text("Use a different verification option")'
],
usePassword: [
'button:has-text("Use your password")',
'button:has-text("Use my password")',
'span[role="button"]:has-text("Use your password")',
'span[role="button"]:has-text("Use my password")',
'a:has-text("Use your password")',
'a:has-text("Use my password")',
'div[role="menuitem"]:has-text("Use your password")',
'div[role="menuitem"]:has-text("Use my password")',
'div[role="button"]:has-text("Use your password")',
'div[role="button"]:has-text("Use my password")',
'div[role="option"]:has-text("Use your password")',
'div[role="option"]:has-text("Use my password")',
'button[data-value="Password"]',
'div[data-value="Password"]'
]
} as const
// Handlers // Handlers
private totpHandler: TotpHandler private totpHandler: TotpHandler
private passkeyHandler: PasskeyHandler private passkeyHandler: PasskeyHandler
@@ -933,13 +966,35 @@ export class Login {
private async switchToPasswordLink(page: Page) { private async switchToPasswordLink(page: Page) {
try { try {
const link = await page.locator('xpath=//span[@role="button" and (contains(translate(normalize-space(.),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz"),"use your password") or contains(translate(normalize-space(.),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz"),"utilisez votre mot de passe"))]').first() const passwordClicked = await this.tryClickPasswordOption(page)
if (await link.isVisible().catch(() => false)) { if (passwordClicked) return
await link.click().catch(logError('LOGIN', 'Use password link click failed', this.bot.isMobile))
const otherWays = await this.clickFirstVisibleSelector(page, Login.PASSWORD_OPTION_SELECTORS.otherWays)
if (otherWays) {
await this.bot.utils.wait(600)
this.bot.log(this.bot.isMobile, 'LOGIN', 'Opened alternate sign-in options')
await this.tryClickPasswordOption(page)
}
} catch { /* Link may not be present - expected on password-first flows */ }
}
private async tryClickPasswordOption(page: Page): Promise<boolean> {
const clicked = await this.clickFirstVisibleSelector(page, Login.PASSWORD_OPTION_SELECTORS.usePassword)
if (clicked) {
await this.bot.utils.wait(800)
this.bot.log(this.bot.isMobile, 'LOGIN', 'Clicked "Use your password" option')
return true
}
const legacy = await page.locator('xpath=//span[@role="button" and (contains(translate(normalize-space(.),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz"),"use your password") or contains(translate(normalize-space(.),"ABCDEFGHIJKLMNOPQRSTUVWXYZ","abcdefghijklmnopqrstuvwxyz"),"utilisez votre mot de passe"))]').first()
if (await legacy.isVisible().catch(() => false)) {
await legacy.click().catch(logError('LOGIN', 'Use password link click failed', this.bot.isMobile))
await this.bot.utils.wait(800) await this.bot.utils.wait(800)
this.bot.log(this.bot.isMobile, 'LOGIN', 'Clicked "Use your password" link') this.bot.log(this.bot.isMobile, 'LOGIN', 'Clicked "Use your password" link')
return true
} }
} catch { /* ignore */ }
return false
} }
private async disableFido(page: Page) { private async disableFido(page: Page) {