aboutsummaryrefslogtreecommitdiff
path: root/webmentions_ssg/__init__.py
diff options
context:
space:
mode:
Diffstat (limited to 'webmentions_ssg/__init__.py')
-rw-r--r--webmentions_ssg/__init__.py81
1 files changed, 7 insertions, 74 deletions
diff --git a/webmentions_ssg/__init__.py b/webmentions_ssg/__init__.py
index 11bd632..3dda31b 100644
--- a/webmentions_ssg/__init__.py
+++ b/webmentions_ssg/__init__.py
@@ -7,13 +7,11 @@ import logging.handlers
import os
from pathlib import Path
-import click
import coloredlogs
-import sqlalchemy as sa
-from flask import Flask, current_app
+from flask import Flask
from flask.cli import AppGroup
from flask_bootstrap import Bootstrap5
-from flask_mail import Mail, Message
+from flask_mail import Mail
from flask_migrate import Migrate, upgrade
from flask_sqlalchemy import SQLAlchemy
from flask_wtf.csrf import CSRFProtect
@@ -38,9 +36,7 @@ MIGRATE = Migrate()
HUEY = Huey()
MAIL = Mail()
-USERS_CLI = AppGroup("users", help="Handle users")
DB_CLI = AppGroup("db", help="Handle database")
-MAIL_CLI = AppGroup("mail", help="Handle mail")
def create_app(config_class: type[DefaultConfig] | None = None) -> Flask:
@@ -130,39 +126,15 @@ def create_app(config_class: type[DefaultConfig] | None = None) -> Flask:
app.register_blueprint(root_page)
- app.cli.add_command(USERS_CLI)
- app.cli.add_command(MAIL_CLI)
-
- return app
-
-
-@USERS_CLI.command("create", help="Create or add users")
-@click.option("--username", prompt=True)
-@click.password_option(confirmation_prompt=True)
-def create_user(username: str, password: str) -> None:
- """
- Create a new user.
-
- :param username: Username of the user to create.
- :param password: Plain-text password to hash and store for the user.
- :raises click.ClickException: If a user with the given username already
- exists.
- """
+ from .cli.users import USERS_CLI
- from .models import User
-
- if (
- DATABASE.session.scalar(sa.select(User).where(User.username == username))
- is not None
- ):
- raise click.ClickException(f"User {username!r} already exists.")
+ app.cli.add_command(USERS_CLI)
- user = User(username=username, password=password)
+ from .cli.mail import MAIL_CLI
- DATABASE.session.add(user)
- DATABASE.session.commit()
+ app.cli.add_command(MAIL_CLI)
- click.echo(f"Created user {username!r}.")
+ return app
@DB_CLI.command("create")
@@ -171,42 +143,3 @@ def create_db() -> None:
Upgrade the database to the latest migration revision.
"""
upgrade()
-
-
-@MAIL_CLI.command("test", help="Send an email to test the SMTP configuration")
-@click.option(
- "--to", "recipient", help="Recipient address (defaults to NOTIFICATION_EMAIL)."
-)
-def send_test_mail(recipient: str | None) -> None:
- """
- Send a test email using the configured SMTP server.
-
- :param recipient: Optional recipient overriding NOTIFICATION_EMAIL.
- :raises click.ClickException: If configuration is missing or sending fails.
- """
- recipient = recipient or current_app.config.get("NOTIFICATION_EMAIL")
- if not recipient:
- raise click.ClickException(
- "No recipient specified. Set NOTIFICATION_EMAIL or pass --to."
- )
-
- sender = current_app.config.get("MAIL_DEFAULT_SENDER")
- if not sender:
- raise click.ClickException("MAIL_DEFAULT_SENDER is not configured.")
-
- message = Message(
- subject="webmentions-ssg: test email",
- sender=sender,
- recipients=[recipient],
- body=(
- "This is a test email from webmentions-ssg.\n\n"
- "If you received this message, the outgoing mail configuration works.\n"
- ),
- )
-
- try:
- MAIL.send(message)
- except Exception as exc:
- raise click.ClickException(f"Could not send test email: {exc}") from exc
-
- click.echo(f"Test email sent to {recipient}.")