feat: implement confirmation service setup and integrate with invitations service

Author: pcrespov

services/web/server/src/simcore_service_webserver/login/_application_keys.py

@@ -0,0 +1,5 @@
+from aiohttp import web
+
+from ._confirmation_service import ConfirmationService
+
+CONFIRMATION_SERVICE_APPKEY = web.AppKey("CONFIRMATION_SERVICE", ConfirmationService)

services/web/server/src/simcore_service_webserver/login/_confirmation_web.py

@@ -1,8 +1,20 @@
+import logging
 from urllib.parse import quote
 
 from aiohttp import web
+from simcore_service_webserver.login._application_keys import (
+    CONFIRMATION_SERVICE_APPKEY,
+)
+from simcore_service_webserver.login.settings import get_plugin_options
 from yarl import URL
 
+from ..application_setup import ensure_single_setup
+from ..db.plugin import get_asyncpg_engine
+from ._confirmation_repository import ConfirmationRepository
+from ._confirmation_service import ConfirmationService
+
+_logger = logging.getLogger(__name__)
+
 
 def _url_for_confirmation(app: web.Application, code: str) -> URL:
     # NOTE: this is in a query parameter, and can contain ? for example.
@@ -14,3 +26,17 @@ def make_confirmation_link(request: web.Request, code: str) -> str:
     assert code  # nosec
     link = _url_for_confirmation(request.app, code=code)
     return f"{request.scheme}://{request.host}{link}"
+
+
+@ensure_single_setup(__name__, logger=_logger)
+def setup_confirmation(app: web.Application) -> None:
+    """Sets up the confirmation service in the application."""
+
+    async def _on_cleanup_ctx(app: web.Application):
+        repository = ConfirmationRepository(get_asyncpg_engine(app))
+        options = get_plugin_options(app)
+        app[CONFIRMATION_SERVICE_APPKEY] = ConfirmationService(repository, options)
+
+        yield
+
+    app.cleanup_ctx.append(_on_cleanup_ctx)

services/web/server/src/simcore_service_webserver/login/_controller/rest/_rest_dependencies.py

@@ -6,19 +6,12 @@
 
 from aiohttp import web
 
-from ....db.plugin import get_asyncpg_engine
-from ..._confirmation_repository import ConfirmationRepository
+from ..._application_keys import CONFIRMATION_SERVICE_APPKEY
 from ..._confirmation_service import ConfirmationService
-from ...settings import get_plugin_options
 
 
 def get_confirmation_service(app: web.Application) -> ConfirmationService:
     """Get confirmation service instance from app.
-
-    Creates a ConfirmationService with proper repository and options injection.
     Used across multiple REST controllers for confirmation operations.
     """
-    engine = get_asyncpg_engine(app)
-    repository = ConfirmationRepository(engine)
-    options = get_plugin_options(app)
-    return ConfirmationService(repository, options)
+    return app[CONFIRMATION_SERVICE_APPKEY]

services/web/server/src/simcore_service_webserver/login/_invitations_service.py

@@ -42,7 +42,7 @@
 from ..products.models import Product
 from ..users import users_service
 from . import _auth_service
-from ._controller.rest._rest_dependencies import get_confirmation_service
+from ._application_keys import CONFIRMATION_SERVICE_APPKEY
 from ._models import (
     BaseConfirmationTokenDict,
     ConfirmationTokenDict,
@@ -128,7 +128,7 @@ async def check_other_registrations(
                 #  w/ an expired confirmation will get deleted and its account (i.e. email)
                 #  can be overtaken by this new registration
                 #
-                confirmation_service = get_confirmation_service(app)
+                confirmation_service = app[CONFIRMATION_SERVICE_APPKEY]
                 _confirmation = await confirmation_service.get_confirmation(
                     filter_dict={
                         "user_id": user["id"],
@@ -194,7 +194,7 @@ async def create_invitation_token(
         trial_account_days=trial_days,
         extra_credits_in_usd=extra_credits_in_usd,
     )
-    confirmation_service = get_confirmation_service(app)
+    confirmation_service = app[CONFIRMATION_SERVICE_APPKEY]
     confirmation = await confirmation_service.create_confirmation(
         user_id=user_id,
         action=ConfirmationAction.INVITATION.name,
@@ -307,7 +307,7 @@ async def check_and_consume_invitation(
             )
 
     # database-type invitations
-    confirmation_service = get_confirmation_service(app)
+    confirmation_service = app[CONFIRMATION_SERVICE_APPKEY]
     if confirmation := await confirmation_service.validate_confirmation_code(
         invitation_code
     ):

services/web/server/src/simcore_service_webserver/login/plugin.py

@@ -25,6 +25,7 @@
 from ..products.plugin import setup_products
 from ..redis import setup_redis
 from ..rest.plugin import setup_rest
+from ._confirmation_web import setup_confirmation
 from ._controller.rest import (
     auth,
     change,
@@ -113,6 +114,7 @@ def setup_login(app: web.Application):
     setup_rest(app)
     setup_email(app)
     setup_invitations(app)
+    setup_confirmation(app)
 
     # routes