feat: CI auto-import, updated Dockerfile, docs, and env config

- GitHub Actions auto-imports registered accounts to admin panel
- Added OUTLOOK2API_URL, ADMIN_PASSWORD secrets for CI
- Updated Dockerfile.api with SQLite data directory
- Updated .env.example with DATABASE_URL and admin config
- Comprehensive README with admin API documentation

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.env.example

@@ -2,11 +2,13 @@
 OUTLOOK2API_JWT_SECRET=change-me-in-production
 OUTLOOK2API_HOST=0.0.0.0
 OUTLOOK2API_PORT=8001
-OUTLOOK2API_ACCOUNTS_FILE=data/outlook_accounts.json
-
-# === Admin ===
 ADMIN_PASSWORD=admin
+
+# === Database ===
+# SQLite (default, no setup needed):
 DATABASE_URL=sqlite+aiosqlite:///./data/outlook2api.db
+# PostgreSQL (production):
+# DATABASE_URL=postgresql://user:pass@host:5432/outlook2api
 
 # === Registration (captcha) ===
 CAPTCHA_CLIENT_KEY=              # YesCaptcha / CapSolver API key
@@ -15,3 +17,7 @@ FUNCAPTCHA_PUBLIC_KEY=B7D8911C-5CC8-A9A3-35B0-554ACEE604DA
 
 # === Optional ===
 PROXY_URL=                       # HTTP/SOCKS5 proxy for registration
+
+# === CI Auto-Import ===
+# Set OUTLOOK2API_URL in GitHub Actions to auto-import registered accounts
+# OUTLOOK2API_URL=https://ohmyapi-outlook2api.hf.space

.github/workflows/register-outlook.yml

@@ -17,8 +17,6 @@ on:
 env:
   CAPTCHA_CLIENT_KEY: ${{ secrets.CAPTCHA_CLIENT_KEY }}
   PROXY_URL: ${{ secrets.PROXY_URL }}
-  OUTLOOK2API_URL: ${{ secrets.OUTLOOK2API_URL }}
-  ADMIN_PASSWORD: ${{ secrets.ADMIN_PASSWORD }}
 
 jobs:
   register:
@@ -70,33 +68,64 @@ jobs:
 
       - name: Auto-import to admin panel
         if: success()
+        env:
+          OUTLOOK2API_URL: ${{ secrets.OUTLOOK2API_URL }}
+          ADMIN_PASSWORD: ${{ secrets.ADMIN_PASSWORD }}
         run: |
           if [ -z "$OUTLOOK2API_URL" ] || [ -z "$ADMIN_PASSWORD" ]; then
-            echo "OUTLOOK2API_URL or ADMIN_PASSWORD not set, skipping import"
+            echo "Skipping auto-import (OUTLOOK2API_URL or ADMIN_PASSWORD not set)"
+            exit 0
+          fi
+          # Login and get token
+          TOKEN=$(curl -sf -X POST "$OUTLOOK2API_URL/admin/api/login" \
+            -H 'Content-Type: application/json' \
+            -d "{\"password\": \"$ADMIN_PASSWORD\"}" | python3 -c "import sys,json;print(json.load(sys.stdin)['token'])" 2>/dev/null)
+          if [ -z "$TOKEN" ]; then
+            echo "Admin login failed, skipping import"
             exit 0
           fi
-          # Extract accounts from the generated zip file
-          ACCOUNTS=$(python -c "
-          import json, glob, zipfile
+          # Collect accounts from staging files
+          ACCOUNTS="[]"
+          if [ -d "output/.staging_outlook" ]; then
+            ACCOUNTS=$(python3 -c "
+          import os, json, glob
           accs = []
-          for zf in glob.glob('output/*Outlook.zip'):
+          for f in glob.glob('output/.staging_outlook/outlook_*.json'):
               try:
-                  with zipfile.ZipFile(zf) as z:
-                      data = z.read('accounts.txt').decode().strip()
-                      for line in data.splitlines():
-                          if ':' in line:
-                              accs.append(line.strip())
+                  d = json.load(open(f))
+                  if d.get('email') and d.get('password'):
+                      accs.append(d['email'] + ':' + d['password'])
               except: pass
           print(json.dumps(accs))
           ")
-          if [ "$ACCOUNTS" = "[]" ]; then
+          fi
+          # Also try the zip file
+          for z in output/*Outlook.zip; do
+            [ -f "$z" ] || continue
+            python3 -c "
+          import zipfile, json, sys
+          with zipfile.ZipFile('$z') as zf:
+              for name in zf.namelist():
+                  if name.endswith('.txt'):
+                      content = zf.read(name).decode('utf-8', errors='replace')
+                      existing = json.loads(sys.argv[1]) if sys.argv[1] != '[]' else []
+                      for line in content.strip().splitlines():
+                          line = line.strip()
+                          if ':' in line and line not in existing:
+                              existing.append(line)
+                      print(json.dumps(existing))
+                      sys.exit(0)
+          print(sys.argv[1])
+          " "$ACCOUNTS" > /tmp/accs.json && ACCOUNTS=$(cat /tmp/accs.json)
+          done
+          COUNT=$(echo "$ACCOUNTS" | python3 -c "import sys,json;print(len(json.load(sys.stdin)))")
+          if [ "$COUNT" = "0" ]; then
             echo "No accounts to import"
             exit 0
           fi
-          echo "Importing accounts to $OUTLOOK2API_URL..."
-          curl -sf -X POST "${OUTLOOK2API_URL}/admin/api/accounts/bulk" \
-            -H "Authorization: Bearer ${ADMIN_PASSWORD}" \
-            -H "Content-Type: application/json" \
-            -d "{\"accounts\": $ACCOUNTS, \"source\": \"ci\"}" \
-            && echo "Import successful" \
-            || echo "Import failed (non-fatal)"
+          echo "Importing $COUNT accounts..."
+          RESULT=$(curl -sf -X POST "$OUTLOOK2API_URL/admin/api/accounts/bulk" \
+            -H "Authorization: Bearer $TOKEN" \
+            -H 'Content-Type: application/json' \
+            -d "{\"accounts\": $ACCOUNTS, \"source\": \"ci\"}")
+          echo "Import result: $RESULT"

Dockerfile.api

@@ -8,4 +8,8 @@ RUN pip install --no-cache-dir -r requirements-api.txt
 COPY outlook2api/ outlook2api/
 COPY pyproject.toml .
 
+RUN mkdir -p /tmp/data
+
+ENV DATABASE_URL=sqlite+aiosqlite:////tmp/data/outlook2api.db
+
 CMD ["uvicorn", "outlook2api.app:app", "--host", "0.0.0.0", "--port", "8001"]

README.md

@@ -1,45 +1,47 @@
 # Outlook2API
 
-Mail.tm-compatible REST API for Outlook/Hotmail/Live accounts with admin panel, batch registration, and CI auto-import.
+Mail.tm-compatible REST API for Outlook/Hotmail/Live accounts with admin panel and batch account registration.
 
 ## Features
 
-- Mail.tm-compatible Hydra API (drop-in replacement for Outlook accounts)
-- Admin panel with account management, bulk import, and API docs
-- Batch account registration via GitHub Actions (DrissionPage + YesCaptcha)
-- CI auto-import: registered accounts automatically pushed to admin database
-- SQLite/PostgreSQL backend
-- HuggingFace Spaces deployment
+- **Mail API** — Mail.tm-compatible Hydra API endpoints (domains, accounts, token, messages)
+- **Admin Panel** — Web UI for account management, bulk import/export, stats dashboard
+- **Batch Registration** — Automated Outlook account creation via GitHub Actions
+- **CI Auto-Import** — Registered accounts automatically imported to admin panel
+- **Verification Code Extraction** — `GET /messages/{id}/code` extracts OTP from emails
 
 ## Quick Start
 
 ```bash
+# Install dependencies
 pip install -r requirements-api.txt
+
+# Start the API server
 python -m outlook2api.app
-# Open http://localhost:8001 (homepage) or http://localhost:8001/admin (admin panel)
-# Default admin password: admin
+
+# Open http://localhost:8001 for homepage
+# Open http://localhost:8001/admin for admin panel (default password: admin)
 ```
 
-## Admin Panel
+### Docker
 
-Access at `/admin`. Features:
-- Dashboard with account stats
-- Account management (search, filter, toggle, delete)
-- Bulk import (text, file upload, CI API)
-- Full API documentation with curl examples
+```bash
+cp .env.example .env
+docker compose up -d outlook2api
+```
 
 ## API Endpoints
 
-### Mail API (mail.tm-compatible)
+### Mail API (Mail.tm-compatible)
 
 | Method | Path | Auth | Description |
 |--------|------|------|-------------|
-| GET | `/domains` | No | List supported domains |
-| POST | `/accounts` | No | Register account (IMAP validation) |
-| POST | `/token` | No | Get JWT token |
+| GET | `/domains` | No | List supported email domains |
+| POST | `/accounts` | No | Register account (validates IMAP) |
+| POST | `/token` | No | Get JWT bearer token |
 | GET | `/me` | Bearer | Current user info |
-| GET | `/messages` | Bearer | List messages |
-| GET | `/messages/{id}` | Bearer | Get message |
+| GET | `/messages` | Bearer | List inbox messages |
+| GET | `/messages/{id}` | Bearer | Get single message |
 | GET | `/messages/{id}/code` | Bearer | Extract verification code |
 | DELETE | `/accounts/me` | Bearer | Delete account |
 
@@ -48,61 +50,66 @@ Access at `/admin`. Features:
 | Method | Path | Description |
 |--------|------|-------------|
 | POST | `/admin/api/login` | Login (returns token) |
-| GET | `/admin/api/stats` | Dashboard stats |
-| GET | `/admin/api/accounts` | List accounts (paginated) |
+| GET | `/admin/api/stats` | Dashboard statistics |
+| GET | `/admin/api/accounts` | List accounts (search, filter, paginate) |
 | POST | `/admin/api/accounts` | Add single account |
-| POST | `/admin/api/accounts/bulk` | Bulk import |
-| POST | `/admin/api/accounts/upload` | File upload import |
-| PATCH | `/admin/api/accounts/{id}` | Update account |
+| POST | `/admin/api/accounts/bulk` | Bulk import (`["email:pass",...]`) |
+| POST | `/admin/api/accounts/upload` | File upload (email:password per line) |
+| PATCH | `/admin/api/accounts/{id}` | Toggle active / update notes |
 | DELETE | `/admin/api/accounts/{id}` | Delete account |
-| GET | `/admin/api/export` | Export all accounts |
+| GET | `/admin/api/accounts/{id}/password` | Reveal password |
+| GET | `/admin/api/export` | Export all active accounts |
 
 ## CI Auto-Import
 
-GitHub Actions workflow registers accounts and auto-imports to admin panel.
+GitHub Actions automatically imports registered accounts to the admin panel.
 
-Required secrets:
-- `CAPTCHA_CLIENT_KEY` — YesCaptcha API key
-- `PROXY_URL` — Residential proxy
-- `OUTLOOK2API_URL` — Admin panel URL (e.g. `https://ohmyapi-outlook2api.hf.space`)
-- `ADMIN_PASSWORD` — Admin password
+**Required secrets:**
+- `CAPTCHA_CLIENT_KEY` — YesCaptcha/CapSolver API key
+- `PROXY_URL` — HTTP/SOCKS5 proxy
+- `OUTLOOK2API_URL` — Admin panel URL (e.g., `https://ohmyapi-outlook2api.hf.space`)
+- `ADMIN_PASSWORD` — Admin panel password
 
 ```bash
-gh workflow run register-outlook.yml --repo shenhao-stu/outlook2api -f count=5
+# Trigger registration + auto-import
+gh workflow run register-outlook.yml -f count=5 -f threads=1
 ```
 
 ## Environment Variables
 
 | Name | Default | Description |
 |------|---------|-------------|
+| `OUTLOOK2API_JWT_SECRET` | `change-me-in-production` | JWT signing secret |
 | `ADMIN_PASSWORD` | `admin` | Admin panel password |
 | `DATABASE_URL` | `sqlite+aiosqlite:///./data/outlook2api.db` | Database URL |
-| `OUTLOOK2API_JWT_SECRET` | `change-me-in-production` | JWT secret |
-| `OUTLOOK2API_PORT` | `8001` | API port |
+| `OUTLOOK2API_HOST` | `0.0.0.0` | API bind host |
+| `OUTLOOK2API_PORT` | `8001` | API bind port |
 
-## Deployment
+## HuggingFace Deployment
 
-Live at: **https://ohmyapi-outlook2api.hf.space**
+Deployed at: **https://ohmyapi-outlook2api.hf.space**
 
 ## Project Structure
 
 ```
 outlook2api/
-├── outlook2api/
-│   ├── app.py              # FastAPI entry point
-│   ├── database.py         # SQLAlchemy models + async DB
-│   ├── admin_routes.py     # Admin API (CRUD, import, export)
-│   ├── routes.py           # Mail.tm-compatible API
-│   ├── auth.py             # JWT authentication
-│   ├── config.py           # Configuration
-│   ├── outlook_imap.py     # IMAP client
-│   ├── store.py            # Legacy JSON store
-│   └── static/             # Frontend (index.html, admin.html)
-├── register/
-│   ├── outlook_register.py # Batch registrar
-│   └── captcha.py          # FunCaptcha solver
+├── outlook2api/               # FastAPI mail API + admin
+│   ├── app.py                 # Application entry point
+│   ├── routes.py              # Mail.tm-compatible API routes
+│   ├── admin_routes.py        # Admin API routes
+│   ├── database.py            # SQLAlchemy models (Account)
+│   ├── auth.py                # JWT auth helpers
+│   ├── config.py              # Environment config
+│   ├── outlook_imap.py        # IMAP client
+│   ├── store.py               # Legacy JSON file store
+│   └── static/                # Frontend
+│       ├── index.html         # Homepage
+│       └── admin.html         # Admin panel
+├── register/                  # Batch registration
+│   ├── outlook_register.py    # DrissionPage registrar
+│   └── captcha.py             # FunCaptcha cloud solver
 ├── .github/workflows/
-│   └── register-outlook.yml # CI with auto-import
+│   └── register-outlook.yml   # CI: register + auto-import
 ├── Dockerfile.api
 ├── Dockerfile.register
 ├── docker-compose.yml