Merge branch 'feature/cli-module'

src/porchlight/authn/routes.py

@@ -75,9 +75,13 @@ async def register_magic_link(request: Request, token: str) -> Response:
     if link is None:
         return HTMLResponse("<p>Invalid or expired registration link.</p>", status_code=400)
 
-    userid = await generate_unique_userid(user_repo)
-    user = User(userid=userid, username=link.username, groups=["users"])
-    await user_repo.create(user)
+    existing_user = await user_repo.get_by_username(link.username)
+    if existing_user is not None:
+        user = existing_user
+    else:
+        userid = await generate_unique_userid(user_repo)
+        user = User(userid=userid, username=link.username, groups=["users"])
+        await user_repo.create(user)
 
     await magic_link_service.mark_used(token)
 

src/porchlight/cli.py

@@ -0,0 +1,74 @@
+import asyncio
+from pathlib import Path
+from typing import Annotated
+
+import typer
+
+from porchlight.config import Settings
+from porchlight.invite.service import MagicLinkService
+from porchlight.models import User
+from porchlight.store.sqlite.db import open_db
+from porchlight.store.sqlite.repositories import SQLiteMagicLinkRepository, SQLiteUserRepository
+from porchlight.userid import generate_unique_userid
+
+PACKAGE_DIR = Path(__file__).resolve().parent
+MIGRATIONS_DIR = PACKAGE_DIR / "store" / "sqlite" / "migrations"
+
+app = typer.Typer()
+
+
+async def _create_invite(settings: Settings, username: str, ttl: int, note: str | None) -> str:
+    """Create an invite link and return the full registration URL."""
+    async with open_db(settings.sqlite_path, MIGRATIONS_DIR) as db:
+        repo = SQLiteMagicLinkRepository(db)
+        service = MagicLinkService(repo, ttl=ttl)
+        link = await service.create(username=username, created_by="cli", note=note)
+        return f"{settings.issuer}/register/{link.token}"
+
+
+async def _initial_admin(settings: Settings, username: str, groups: list[str]) -> str:
+    """Create an admin user and invite link, return the full registration URL."""
+    async with open_db(settings.sqlite_path, MIGRATIONS_DIR) as db:
+        user_repo = SQLiteUserRepository(db)
+
+        existing = await user_repo.get_by_username(username)
+        if existing is not None:
+            raise typer.BadParameter(f"User '{username}' already exists.")
+
+        userid = await generate_unique_userid(user_repo)
+        user = User(userid=userid, username=username, groups=groups)
+        await user_repo.create(user)
+
+        magic_link_repo = SQLiteMagicLinkRepository(db)
+        service = MagicLinkService(magic_link_repo, ttl=settings.invite_ttl)
+        link = await service.create(username=username, created_by="cli", note="initial admin setup")
+        return f"{settings.issuer}/register/{link.token}"
+
+
+@app.command()
+def create_invite(
+    username: str,
+    ttl: Annotated[int | None, typer.Option(help="Link expiration in seconds")] = None,
+    note: Annotated[str | None, typer.Option(help="Optional note stored with the link")] = None,
+) -> None:
+    """Generate a magic link registration URL for a new user."""
+    settings = Settings()  # type: ignore[call-arg]
+    effective_ttl = ttl if ttl is not None else settings.invite_ttl
+    url = asyncio.run(_create_invite(settings, username, effective_ttl, note))
+    typer.echo(url)
+
+
+@app.command()
+def initial_admin(
+    username: str,
+    group: Annotated[list[str] | None, typer.Option(help="Groups to assign (repeatable)")] = None,
+) -> None:
+    """Bootstrap the first admin user with a registration link."""
+    settings = Settings()  # type: ignore[call-arg]
+    groups = group if group is not None else ["admin", "users"]
+    url = asyncio.run(_initial_admin(settings, username, groups))
+    typer.echo(url)
+
+
+def main() -> None:
+    app()