refactor: some minor cleanup
This commit is contained in:
parent
6dd26ad3d8
commit
0a71012709
15 changed files with 188 additions and 91 deletions
|
|
@ -5,7 +5,6 @@ import logging
|
|||
import random
|
||||
import re
|
||||
import secrets
|
||||
import string
|
||||
import time
|
||||
from datetime import datetime
|
||||
from pathlib import Path
|
||||
|
|
@ -24,6 +23,7 @@ from playwright.async_api import (
|
|||
from browser import launch as launch_browser
|
||||
from email_providers import BaseProvider
|
||||
from providers.base import ProviderTokens
|
||||
from utils.randoms import generate_password
|
||||
from .tokens import CLIENT_ID
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
|
@ -56,11 +56,6 @@ async def save_error_screenshot(page: Page | None, step: str):
|
|||
logger.warning("Failed to save screenshot at step %s: %s", step, e)
|
||||
|
||||
|
||||
def generate_password(length: int = 20) -> str:
|
||||
alphabet = string.ascii_letters + string.digits
|
||||
return "".join(random.choice(alphabet) for _ in range(length))
|
||||
|
||||
|
||||
def generate_name() -> str:
|
||||
first_names = [
|
||||
"James",
|
||||
|
|
@ -255,8 +250,8 @@ async def exchange_code_for_tokens(code: str, verifier: str) -> ProviderTokens:
|
|||
raise RuntimeError(f"Token exchange response parse error: {e}") from e
|
||||
|
||||
|
||||
async def get_latest_code(email_provider: BaseProvider, email: str) -> str | None:
|
||||
message = await email_provider.get_latest_message(email)
|
||||
async def get_latest_code(email_provider: BaseProvider) -> str | None:
|
||||
message = await email_provider.get_latest_message()
|
||||
if not message:
|
||||
return None
|
||||
return extract_verification_code(message)
|
||||
|
|
@ -403,7 +398,7 @@ async def register_chatgpt_account(
|
|||
)
|
||||
|
||||
logger.info("[3/5] Getting verification message from email provider...")
|
||||
code = await get_latest_code(email_provider, email)
|
||||
code = await get_latest_code(email_provider)
|
||||
if not code:
|
||||
raise AutomationError(
|
||||
"email_provider", "Email provider returned no verification message"
|
||||
|
|
@ -472,7 +467,7 @@ async def register_chatgpt_account(
|
|||
|
||||
if await oauth_needs_email_check(oauth_page):
|
||||
logger.info("OAuth requested email confirmation code")
|
||||
new_code = await get_latest_code(email_provider, email)
|
||||
new_code = await get_latest_code(email_provider)
|
||||
if new_code and new_code != last_oauth_email_code:
|
||||
filled = await fill_oauth_code_if_present(oauth_page, new_code)
|
||||
if filled:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue