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

Fix login issues for mobile

Browse Source
This commit is contained in:
TheNetsky
2025-06-08 18:28:37 +02:00
parent 9f5601d44b
commit e7c27ac16e
2 changed files with 100 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/browser/BrowserUtil.ts
View File

@@ -13,7 +13,6 @@ export default class BrowserUtil {
async tryDismissAllMessages(page: Page): Promise<void> { async tryDismissAllMessages(page: Page): Promise<void> {
const buttons = [ const buttons = [
{ selector: 'button[type="submit"]', label: 'Submit Button' },
{ selector: '#acceptButton', label: 'AcceptButton' }, { selector: '#acceptButton', label: 'AcceptButton' },
{ selector: '.ext-secondary.ext-button', label: '"Skip for now" Button' }, { selector: '.ext-secondary.ext-button', label: '"Skip for now" Button' },
{ selector: '#iLandingViewAction', label: 'iLandingViewAction' }, { selector: '#iLandingViewAction', label: 'iLandingViewAction' },

158
src/functions/Login.ts
View File

@@ -29,6 +29,8 @@ export class Login {
async login(page: Page, email: string, password: string) { async login(page: Page, email: string, password: string) {
try { try {
this.bot.log(this.bot.isMobile, 'LOGIN', 'Starting login process!')
// Navigate to the Bing login page // Navigate to the Bing login page
await page.goto('https://rewards.bing.com/signin') await page.goto('https://rewards.bing.com/signin')
@@ -126,8 +128,24 @@ export class Login {
private async enterPassword(page: Page, password: string) { private async enterPassword(page: Page, password: string) {
const passwordInputSelector = 'input[type="password"]' const passwordInputSelector = 'input[type="password"]'
try { try {
const viewFooter = await page.waitForSelector('[data-testid="viewFooter"]', { timeout: 2000 }).catch(() => null)
if (viewFooter) {
this.bot.log(this.bot.isMobile, 'LOGIN', 'Page "Get a code to sign in" found by "viewFooter"')
const otherWaysButton = await viewFooter.$('span[role="button"]')
if (otherWaysButton) {
await otherWaysButton.click()
await this.bot.utils.wait(5000)
const secondListItem = page.locator('[role="listitem"]').nth(1)
if (await secondListItem.isVisible()) {
await secondListItem.click()
}
}
}
// Wait for password field // Wait for password field
const passwordField = await page.waitForSelector(passwordInputSelector, { state: 'visible', timeout: 5000 }).catch(() => null) const passwordField = await page.waitForSelector(passwordInputSelector, { state: 'visible', timeout: 5000 }).catch(() => null)
if (!passwordField) { if (!passwordField) {
@@ -159,7 +177,6 @@ export class Login {
} }
} }
private async handle2FA(page: Page) { private async handle2FA(page: Page) {
try { try {
const numberToPress = await this.get2FACode(page) const numberToPress = await this.get2FACode(page)
@@ -239,62 +256,6 @@ export class Login {
this.bot.log(this.bot.isMobile, 'LOGIN', '2FA code entered successfully') this.bot.log(this.bot.isMobile, 'LOGIN', '2FA code entered successfully')
} }
private async checkLoggedIn(page: Page) {
const targetHostname = 'rewards.bing.com'
const targetPathname = '/'
// eslint-disable-next-line no-constant-condition
while (true) {
await this.bot.browser.utils.tryDismissAllMessages(page)
const currentURL = new URL(page.url())
if (currentURL.hostname === targetHostname && currentURL.pathname === targetPathname) {
break
}
}
// Wait for login to complete
await page.waitForSelector('html[data-role-name="RewardsPortal"]', { timeout: 10000 })
this.bot.log(this.bot.isMobile, 'LOGIN', 'Successfully logged into the rewards portal')
}
private async checkBingLogin(page: Page): Promise<void> {
try {
this.bot.log(this.bot.isMobile, 'LOGIN-BING', 'Verifying Bing login')
await page.goto('https://www.bing.com/fd/auth/signin?action=interactive&provider=windows_live_id&return_url=https%3A%2F%2Fwww.bing.com%2F')
const maxIterations = 5
for (let iteration = 1; iteration <= maxIterations; iteration++) {
const currentUrl = new URL(page.url())
if (currentUrl.hostname === 'www.bing.com' && currentUrl.pathname === '/') {
await this.bot.browser.utils.tryDismissAllMessages(page)
const loggedIn = await this.checkBingLoginStatus(page)
// If mobile browser, skip this step
if (loggedIn || this.bot.isMobile) {
this.bot.log(this.bot.isMobile, 'LOGIN-BING', 'Bing login verification passed!')
break
}
}
await this.bot.utils.wait(1000)
}
} catch (error) {
this.bot.log(this.bot.isMobile, 'LOGIN-BING', 'An error occurred:' + error, 'error')
}
}
private async checkBingLoginStatus(page: Page): Promise<boolean> {
try {
await page.waitForSelector('#id_n', { timeout: 5000 })
return true
} catch (error) {
return false
}
}
async getMobileAccessToken(page: Page, email: string) { async getMobileAccessToken(page: Page, email: string) {
const authorizeUrl = new URL(this.authBaseUrl) const authorizeUrl = new URL(this.authBaseUrl)
@@ -345,6 +306,87 @@ export class Login {
return tokenData.access_token return tokenData.access_token
} }
// Utils
private async checkLoggedIn(page: Page) {
const targetHostname = 'rewards.bing.com'
const targetPathname = '/'
// eslint-disable-next-line no-constant-condition
while (true) {
await this.dismissLoginMessages(page)
const currentURL = new URL(page.url())
if (currentURL.hostname === targetHostname && currentURL.pathname === targetPathname) {
break
}
}
// Wait for login to complete
await page.waitForSelector('html[data-role-name="RewardsPortal"]', { timeout: 10000 })
this.bot.log(this.bot.isMobile, 'LOGIN', 'Successfully logged into the rewards portal')
}
private async dismissLoginMessages(page: Page) {
// Use Passekey
if (await page.waitForSelector('[data-testid="biometricVideo"]', { timeout: 2000 }).catch(() => null)) {
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')
await page.waitForTimeout(500)
}
}
// Use Keep me signed in
if (await page.waitForSelector('[data-testid="kmsiVideo"]', { timeout: 2000 }).catch(() => null)) {
const yesButton = await page.$('[data-testid="primaryButton"]')
if (yesButton) {
await yesButton.click()
this.bot.log(this.bot.isMobile, 'DISMISS-ALL-LOGIN-MESSAGES', 'Dismissed "Keep me signed in" modal')
await page.waitForTimeout(500)
}
}
}
private async checkBingLogin(page: Page): Promise<void> {
try {
this.bot.log(this.bot.isMobile, 'LOGIN-BING', 'Verifying Bing login')
await page.goto('https://www.bing.com/fd/auth/signin?action=interactive&provider=windows_live_id&return_url=https%3A%2F%2Fwww.bing.com%2F')
const maxIterations = 5
for (let iteration = 1; iteration <= maxIterations; iteration++) {
const currentUrl = new URL(page.url())
if (currentUrl.hostname === 'www.bing.com' && currentUrl.pathname === '/') {
await this.bot.browser.utils.tryDismissAllMessages(page)
const loggedIn = await this.checkBingLoginStatus(page)
// If mobile browser, skip this step
if (loggedIn || this.bot.isMobile) {
this.bot.log(this.bot.isMobile, 'LOGIN-BING', 'Bing login verification passed!')
break
}
}
await this.bot.utils.wait(1000)
}
} catch (error) {
this.bot.log(this.bot.isMobile, 'LOGIN-BING', 'An error occurred:' + error, 'error')
}
}
private async checkBingLoginStatus(page: Page): Promise<boolean> {
try {
await page.waitForSelector('#id_n', { timeout: 5000 })
return true
} catch (error) {
return false
}
}
private async checkAccountLocked(page: Page) { private async checkAccountLocked(page: Page) {
await this.bot.utils.wait(2000) await this.bot.utils.wait(2000)
const isLocked = await page.waitForSelector('#serviceAbuseLandingTitle', { state: 'visible', timeout: 1000 }).then(() => true).catch(() => false) const isLocked = await page.waitForSelector('#serviceAbuseLandingTitle', { state: 'visible', timeout: 1000 }).then(() => true).catch(() => false)