Update from GitHub Actions

functions/utils/authService.ts

@@ -74,22 +74,90 @@ export class AuthService {
             await page.waitForSelector('#idA_PWD_SwitchToPassword', { timeout: 3000 });
             await page.click('#idA_PWD_SwitchToPassword');
         } catch (error) {
-            console.log(`没有切换到密码登录，继续执行: ${error}`);
+            console.log(account.email, `没有旧版切换到密码登录，继续执行: ${error}`);
         }
 
+        try {
+            const passwordButtonByRole = page.getByRole('button', { name: '使用密码' });
+            if (await passwordButtonByRole.isVisible({ timeout: 3000 })) {
+                await passwordButtonByRole.click();
+            }
+        } catch (error) {
+            console.log(account.email, `没有新版切换到密码登录，继续执行: ${error}`);
+        }
         await page.waitForURL("https://login.live.com/**");
         await page.fill('input[type="password"]', account.password);
         await page.fill('input[type="password"]', account.password);
         await page.click('button[type="submit"]');
 
+
+        const proofEmail = account.proofEmail;
+
+        try {
+            await page.waitForURL((url) => {
+                return url.href.startsWith('https://account.live.com/recover');
+            }, { timeout: 3000 });
+            await page.click('input[type="submit"]#iLandingViewAction');
+            const timestamp = Math.floor(Date.now() / 1000);
+            await page.fill("#iProofEmail", proofEmail)
+            await page.click('input[type="submit"]')
+
+            const proofConfig = this.getProofConfig(proofEmail);
+            const verificationCode = await getVerificationCode(proofConfig.apiUrl, proofConfig.token!, proofEmail, timestamp);
+            await page.fill('input[type="tel"]', verificationCode);
+            await page.click('input[type="submit"]');
+
+            //可能需要修改密码..这里就不处理了
+        } catch (error) {
+            console.log(account.email, `没有帮助我们保护帐户确认，继续执行: ${error}`);
+        }
+
         try {
-            await page.waitForURL("https://account.live.com/recover/**", { timeout: 5000 });
-            await page.click('#iLandingViewAction');
+            //新版的邮箱验证
+            await page.waitForURL((url) => {
+                return url.href.startsWith('https://login.live.com/oauth20_authorize.srf');
+            }, { timeout: 3000 });
+
+            const timestamp = Math.floor(Date.now() / 1000);
+            await page.fill("#proof-confirmation-email-input", proofEmail)
+            await page.click('button[type="submit"]')
+
+            const proofConfig = this.getProofConfig(proofEmail);
+            const verificationCode = await getVerificationCode(proofConfig.apiUrl, proofConfig.token!, proofEmail, timestamp);
+            await page.fill('input#codeEntry-0', verificationCode[0]);
+            await page.fill('input#codeEntry-1', verificationCode[1]);
+            await page.fill('input#codeEntry-2', verificationCode[2]);
+            await page.fill('input#codeEntry-3', verificationCode[3]);
+            await page.fill('input#codeEntry-4', verificationCode[4]);
+            await page.fill('input#codeEntry-5', verificationCode[5]);
+
+            //可能需要修改密码..这里就不处理了
         } catch (error) {
-            console.log("验证确定 page not found or timeout, skipping...");
+           console.log(account.email, `没有帮助我们保护帐户确认，继续执行: ${error}`);
         }
+
+    }
+
+    private getProofConfig(proofEmail: string) {
+        const proof = [
+            {
+                "suffix": "godgodgame.com",
+                "apiUrl": "https://seedmail.igiven.com/api/latest-email",
+                "token": this.env.PROOF_GODGODGAME_TOKEN
+            },
+            {
+                "suffix": "igiven.com",
+                "apiUrl": "https://mail.igiven.com/api/latest-email",
+                "token": this.env.PROOF_IGIVEN_TOKEN
+            }
+        ];
+
+        const suffix = proofEmail.substring(proofEmail.indexOf('@') + 1);
+        const proofConfig = proof.find(p => p.suffix === suffix)!;
+        return proofConfig;
     }
 
+
     private async handleMultiFactorAuth(page: Page, account: Account) {
         for (let i = 0; i < 3; i++) {
             try {
@@ -110,21 +178,7 @@ export class AuthService {
                 await page.fill("#iProofEmail", proofEmail);
                 await page.click('input[type="submit"]');
 
-                const proof = [
-                    {
-                        "suffix": "godgodgame.com",
-                        "apiUrl": "https://seedmail.igiven.com/api/latest-email",
-                        "token": this.env.PROOF_GODGODGAME_TOKEN
-                    },
-                    {
-                        "suffix": "igiven.com",
-                        "apiUrl": "https://mail.igiven.com/api/latest-email",
-                        "token": this.env.PROOF_IGIVEN_TOKEN
-                    }
-                ];
-
-                const suffix = proofEmail.substring(proofEmail.indexOf('@') + 1);
-                const proofConfig = proof.find(p => p.suffix === suffix)!;
+                const proofConfig = this.getProofConfig(proofEmail);
                 const verificationCode = await getVerificationCode(
                     proofConfig.apiUrl,
                     proofConfig.token!,

src/App.vue

@@ -61,7 +61,7 @@ const jwtToken = parseToken();
         <template #logo>
           <router-link to="/" class="flex items-center gap-2 p-4">
             <img :src="logo" alt="logo" class="w-8 h-8" />
-            <h1 class="text-xl font-bold text-white">SEED LOG</h1>
+            <h1 class="text-xl font-bold text-white">MS MAIL</h1>
           </router-link>
         </template>
         <t-menu-item v-for="item in menu" :key="item.path" :value="item.path" :to="item.path"
@@ -80,7 +80,7 @@ const jwtToken = parseToken();
         <template #logo>
           <router-link to="/" class="flex items-center gap-2">
             <img :src="logo" alt="logo" class="w-10 h-10 transition-transform hover:scale-110" />
-            <h1 class="text-2xl font-bold text-white tracking-wider">SEED LOG</h1>
+            <h1 class="text-2xl font-bold text-white tracking-wider">MS MAIL</h1>
           </router-link>
         </template>
         <t-menu-item v-for="item in menu" :key="item.path" :value="item.path" :to="item.path"