[NHUB-566] Migrate public Blueprint to an EndpointGroup

newsroom/public/__init__.py

@@ -1,14 +1,17 @@
-from superdesk.flask import Blueprint, render_template
+from superdesk.core.app import SuperdeskAsyncApp
+from superdesk.core.module import Module
+from superdesk.flask import render_template
 from newsroom.gettext import get_session_locale
 from newsroom.email import get_language_template_name
 
-blueprint = Blueprint("public", __name__)
+from .views import public_endpoints
 
-from . import views  # noqa
 
+def init_module(app: SuperdeskAsyncApp):
+    app.wsgi.add_template_global(render_restricted_action_modal_body)
 
-def init_app(app):
-    app.add_template_global(render_restricted_action_modal_body)
+
+module = Module(name="newsroom.public", init=init_module, endpoints=[public_endpoints])
 
 
 async def render_restricted_action_modal_body():

newsroom/public/views.py

@@ -1,13 +1,14 @@
 from typing import List, Dict
 
+from pydantic import BaseModel
 from werkzeug.utils import secure_filename
 
-from superdesk.core import get_current_app, get_app_config
 from superdesk.flask import render_template
+from superdesk.core.web import EndpointGroup
+from superdesk.core import get_current_app, get_app_config
 
 from newsroom.auth.utils import is_valid_session
 from newsroom.types import Article, DashboardCardDict
-from newsroom.public import blueprint
 from newsroom.wire.items import get_items_for_dashboard
 from newsroom.ui_config_async import UiConfigResourceService
 from newsroom.users import get_user_profile_data
@@ -17,6 +18,8 @@
 PUBLIC_DASHBOARD_CARDS_CACHE_KEY = "public-dashboard-cards"
 PUBLIC_DASHBOARD_ITEMS_CACHE_KEY = "public-dashboard-items"
 
+public_endpoints = EndpointGroup("public", __name__)
+
 
 async def get_public_dashboard_config():
     app = get_current_app().as_any()
@@ -54,9 +57,14 @@ async def get_public_cards() -> List[DashboardCardDict]:
     return cards
 
 
-@blueprint.route("/page/<path:template>")
-async def page(template):
-    return await render_template("page-{template}.html".format(template=secure_filename(template)))
+class PageArgs(BaseModel):
+    template: str
+
+
+@public_endpoints.endpoint("/page/<path:template>")
+async def page(args: PageArgs, _p: None, _r: None):
+    template = secure_filename(args.template)
+    return await render_template(f"page-{template}.html")
 
 
 async def render_public_dashboard():
@@ -73,7 +81,7 @@ async def render_public_dashboard():
     )
 
 
-@blueprint.route("/public/card_items")
+@public_endpoints.endpoint("/public/card_items")
 async def public_card_items():
     if not await is_valid_session() and not get_app_config("PUBLIC_DASHBOARD"):
         return {"_items": []}

newsroom/web/default_settings.py

@@ -119,7 +119,6 @@
     "newsroom.design",
     "newsroom.products",
     "newsroom.reports",
-    "newsroom.public",
     "newsroom.agenda",
     "newsroom.news_api.api_tokens",
     "newsroom.monitoring",
@@ -143,7 +142,6 @@
     "newsroom.products",
     "newsroom.section_filters",
     "newsroom.reports",
-    "newsroom.public",
     "newsroom.agenda",
     "newsroom.photos",
     "newsroom.media_utils",
@@ -178,6 +176,7 @@
     "newsroom.topics_folders",
     "newsroom.push",
     "newsroom.history_async",
+    "newsroom.public",
 ]
 
 SITE_NAME = "Newshub"