Update from GitHub Actions

functions/utils/authService.ts

@@ -48,6 +48,7 @@ export class AuthService {
             const authUrl = this.buildAuthUrl(clientId, redirectUri, account.email);
             await this.handleLoginProcess(page, account, authUrl);
             await this.handleMultiFactorAuth(page, account);
+            await this.confirmLogin(page, account);
             await this.handleConsent(page, redirectUri);
         } finally {
             if (context) await context.close();
@@ -133,7 +134,7 @@ export class AuthService {
 
             //可能需要修改密码..这里就不处理了
         } catch (error) {
-           console.log(account.email, `没有帮助我们保护帐户确认，继续执行: ${error}`);
+            console.log(account.email, `没有帮助我们保护帐户确认，继续执行: ${error}`);
         }
 
     }
@@ -196,10 +197,65 @@ export class AuthService {
         }
     }
 
-    private async handleConsent(page: Page, redirectUri: string) {
-        await page.waitForURL((url: any) => url.href.startsWith("https://login.live.com"));
-        await page.click('button[type="submit"]#acceptButton');
 
+
+    async confirmLogin(page: Page, account: Account) {
+        try {
+            await page.waitForURL('https://account.live.com/interrupt/**', { timeout: 3000 });
+
+            // 尝试查找"暂时跳过"按钮
+            const skipButtonExists = await page.isVisible('button[data-testid="secondaryButton"]', { timeout: 5000 });
+            if (skipButtonExists) {
+                console.log(account.email, "找到新版'暂时跳过'按钮，正在点击...");
+                await page.click('button[data-testid="secondaryButton"]');
+            }
+
+            // 最后尝试你提到的另一个按钮
+            const otherButtonExists = await page.isVisible('div[data-testid="textButtonContainer"] > div:first-child > button[type="button"]', { timeout: 5000 });
+            if (otherButtonExists) {
+                console.log(account.email, "找到旧版'暂时跳过'按钮，正在点击...");
+                await page.click('div[data-testid="textButtonContainer"] > div:first-child > button[type="button"]');
+            }
+
+        } catch (error) {
+            //暂时跳过.下一个.获取微软的通行密钥软件
+            console.log(account.email, `无获取通行密钥提示，继续执行: ${error}`);
+        }
+
+        try {
+            //和下面一样.随机出现
+            await page.waitForURL('https://login.live.com/ppsecure/**', { timeout: 3000 });
+            //新版可能有问题.换成如下.
+            //await page.click('#acceptButton', { timeout: 10000 });
+            //await page.locator('button[type="submit"]').nth(0).click({ timeout: 10000 });
+            await page.locator('button[type="submit"]').first().click({ timeout: 10000 });
+        } catch (error) {
+            console.log(account.email, `无ppsecure登录确认，继续执行: ${error}`);
+        }
+
+        try {
+            //和上面一样.随机出现
+            await page.waitForURL((url) => {
+                return url.href.startsWith('https://login.live.com/oauth20_authorize.srf');
+            }, { timeout: 3000 });
+            await page.click('button[type="submit"]', { timeout: 10000 });
+        } catch (error) {
+            console.log(account.email, `无oauth20_authorize登录确认，继续执行: ${error}`);
+        }
+
+
+        try {
+            //旧版的登录确认
+            await page.waitForURL((url) => {
+                return url.href.startsWith('https://login.live.com');
+            }, { timeout: 3000 });
+            await page.click('button[type="submit"]#acceptButton',{timeout: 3000});
+        } catch (error) {
+            console.log(account.email, `无其他登录确认，继续执行: ${error}`);
+        }
+    }
+
+    private async handleConsent(page: Page, redirectUri: string) {
         try {
             await page.waitForURL("https://account.live.com/Consent/**", { timeout: 10000 });
             await page.click('button[type="submit"][data-testid="appConsentPrimaryButton"]');

package.json

@@ -4,7 +4,7 @@
 	"private": true,
 	"type": "module",
 	"scripts": {
-		"dev": "vite --host --port 5009",
+		"dev": "vite --host --port 5010",
 		"dev:server": "cross-env NODE_ENV=development tsx watch --no-cache index.ts",
 		"dev:pages": "wrangler pages dev dist",
 		"build": "vue-tsc -b && vite build",