Standardize IDs, fix group APIs, fix tests

packages/sshecret-admin/src/sshecret_admin/core/app.py

@@ -58,12 +58,14 @@ def create_admin_app(
 
     def setup_password_manager() -> None:
         """Setup password manager."""
+        LOG.info("Setting up password manager")
         setup_private_key(settings, regenerate=False)
 
     @asynccontextmanager
     async def lifespan(_app: FastAPI):
         """Create database before starting the server."""
         if create_db:
+            LOG.info("Setting up database")
             Base.metadata.create_all(engine)
         setup_password_manager()
         yield

packages/sshecret-admin/src/sshecret_admin/core/cli.py

@@ -1,12 +1,9 @@
 """Sshecret admin CLI helper."""
 
-import asyncio
-import code
 import json
 import logging
-from collections.abc import Awaitable
 from pathlib import Path
-from typing import Any, cast
+from typing import cast
 
 import click
 import uvicorn
@@ -14,10 +11,9 @@ from pydantic import ValidationError
 from sqlalchemy import select, create_engine
 from sqlalchemy.orm import Session
 from sshecret_admin.auth.authentication import hash_password
-from sshecret_admin.auth.models import AuthProvider, PasswordDB, User
+from sshecret_admin.auth.models import AuthProvider, User
 from sshecret_admin.core.app import create_admin_app
 from sshecret_admin.core.settings import AdminServerSettings
-from sshecret_admin.services.admin_backend import AdminBackend
 
 handler = logging.StreamHandler()
 formatter = logging.Formatter(
@@ -143,36 +139,6 @@ def cli_run(
     )
 
 
-@cli.command("repl")
-@click.pass_context
-def cli_repl(ctx: click.Context) -> None:
-    """Run an interactive console."""
-    settings = cast(AdminServerSettings, ctx.obj)
-    engine = create_engine(settings.admin_db)
-    with Session(engine) as session:
-        password_db = session.scalars(
-            select(PasswordDB).where(PasswordDB.id == 1)
-        ).first()
-
-    if not password_db:
-        raise click.ClickException(
-            "Error: Password database has not yet been setup. Start the server to finish setup."
-        )
-
-    def run(func: Awaitable[Any]) -> Any:
-        """Run an async function."""
-        loop = asyncio.get_event_loop()
-        return loop.run_until_complete(func)
-
-    admin = AdminBackend(settings, )
-    locals = {
-        "run": run,
-        "admin": admin,
-    }
-    banner = "Sshecret-admin REPL\nAdmin backend API bound to 'admin'. Run async functions with run()"
-    console = code.InteractiveConsole(locals=locals, local_exit=True)
-    console.interact(banner=banner, exitmsg="Bye!")
-
 @cli.command("openapi")
 @click.argument("destination", type=click.Path(file_okay=False, dir_okay=True, path_type=Path))
 @click.pass_context

packages/sshecret-admin/src/sshecret_admin/core/db.py

@@ -23,7 +23,7 @@ def setup_database(
 ) -> tuple[Engine, Callable[[], Generator[Session, None, None]]]:
     """Setup database."""
 
-    engine = create_engine(db_url, echo=True, future=True)
+    engine = create_engine(db_url, echo=False, future=True)
     if db_url.drivername.startswith("sqlite"):
 
         @event.listens_for(engine, "connect")

packages/sshecret-admin/src/sshecret_admin/core/dependencies.py

@@ -15,7 +15,7 @@ from sshecret_admin.core.settings import AdminServerSettings
 DBSessionDep = Callable[[], Generator[Session, None, None]]
 AsyncSessionDep = Callable[[], AsyncGenerator[AsyncSession, None]]
 
-AdminDep = Callable[[Request, Session], AsyncGenerator[AdminBackend, None]]
+AdminDep = Callable[[Request], AsyncGenerator[AdminBackend, None]]
 
 GetUserDep = Callable[[User], Awaitable[User]]