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

feat: Enhance login state detection with strict checks for portal elements and improved handling of unknown states

Browse Source
This commit is contained in:
LightZirconite
2025-11-04 23:09:31 +01:00
parent d89816c817
commit 4e8bd59ff4
2 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/functions/Login.ts
View File

@@ -461,13 +461,24 @@ export class Login {
) )
if (passwordPageReached === LoginState.LoggedIn) { if (passwordPageReached === LoginState.LoggedIn) {
this.bot.log(this.bot.isMobile, 'LOGIN', 'Already authenticated after email (fast path)') // Double-check: verify we're actually on rewards portal with activities
return const actuallyLoggedIn = await page.locator('#more-activities, html[data-role-name*="RewardsPortal"]')
.first()
.isVisible({ timeout: 2000 })
.catch(() => false)
if (actuallyLoggedIn) {
this.bot.log(this.bot.isMobile, 'LOGIN', 'Already authenticated after email (fast path)')
return
} else {
this.bot.log(this.bot.isMobile, 'LOGIN', 'False positive on LoggedIn state, continuing with password entry', 'warn')
// Continue to password entry
}
} }
if (!passwordPageReached) { if (!passwordPageReached) {
this.bot.log(this.bot.isMobile, 'LOGIN', 'Password page not reached after 8s, continuing anyway...', 'warn') this.bot.log(this.bot.isMobile, 'LOGIN', 'Password page not reached after 8s, continuing anyway...', 'warn')
} else { } else if (passwordPageReached !== LoginState.LoggedIn) {
this.bot.log(this.bot.isMobile, 'LOGIN', `Transitioned to state: ${passwordPageReached}`) this.bot.log(this.bot.isMobile, 'LOGIN', `Transitioned to state: ${passwordPageReached}`)
} }

28
src/util/LoginStateDetector.ts
View File

@@ -43,9 +43,10 @@ export class LoginStateDetector {
// State 1: Already logged in (rewards portal) // State 1: Already logged in (rewards portal)
if (url.includes('rewards.bing.com') || url.includes('rewards.microsoft.com')) { if (url.includes('rewards.bing.com') || url.includes('rewards.microsoft.com')) {
const hasPortal = await page.locator('html[data-role-name*="RewardsPortal"], #dashboard, main[data-bi-name="dashboard"]') // STRICT CHECK: Must have actual portal elements, not just domain
const hasPortal = await page.locator('html[data-role-name*="RewardsPortal"], #dashboard, main[data-bi-name="dashboard"], #more-activities')
.first() .first()
.isVisible({ timeout: 1000 }) .isVisible({ timeout: 2000 })
.catch(() => false) .catch(() => false)
if (hasPortal) { if (hasPortal) {
@@ -53,12 +54,25 @@ export class LoginStateDetector {
return { state: LoginState.LoggedIn, confidence: 'high', url, indicators } return { state: LoginState.LoggedIn, confidence: 'high', url, indicators }
} }
// On rewards domain but no portal = might be loading or error // On rewards domain but no portal = still loading or redirecting to login
const bodyLength = await page.evaluate(() => document.body?.innerText?.length || 0).catch(() => 0) // Do NOT assume logged in just because of domain
if (bodyLength > 100) { indicators.push('On rewards domain but portal not detected')
indicators.push('On rewards domain, checking content...')
return { state: LoginState.LoggedIn, confidence: 'medium', url, indicators } // Check if actually redirecting to login
const isRedirectingToLogin = url.includes('login.live.com') ||
url.includes('login.microsoftonline.com') ||
await page.locator('input[type="email"], input[name="loginfmt"]')
.first()
.isVisible({ timeout: 500 })
.catch(() => false)
if (isRedirectingToLogin) {
indicators.push('Redirecting to login')
return { state: LoginState.EmailPage, confidence: 'medium', url, indicators }
} }
// Unknown state - not logged in, not login page
return { state: LoginState.Unknown, confidence: 'low', url, indicators }
} }
// State 2: Microsoft login pages // State 2: Microsoft login pages