fixes merge

Author: pcrespov

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

@@ -4,6 +4,7 @@
 from pydantic import ValidationError
 from settings_library.email import SMTPSettings
 
+from ..application_keys import APP_SETTINGS_APPKEY
 from ..application_setup import (
     ModuleCategory,
     app_setup_func,
@@ -24,7 +25,6 @@
 from ..products.plugin import setup_products
 from ..redis import setup_redis
 from ..rest.plugin import setup_rest
-from ._application_keys import APP_SETTINGS_APPKEY
 from ._confirmation_web import setup_confirmation
 from ._controller.rest import (
     auth,
@@ -34,7 +34,7 @@
     twofa,
 )
 from .settings import (
-    APP_LOGIN_OPTIONS_KEY,
+    LOGIN_OPTIONS_APPKEY,
     LOGIN_SETTINGS_PER_PRODUCT_APPKEY,
     LoginOptions,
     LoginSettings,
@@ -52,7 +52,7 @@ def _setup_login_options(app: web.Application):
     if INDEX_RESOURCE_NAME in app.router:
         cfg["LOGIN_REDIRECT"] = f"{app.router[INDEX_RESOURCE_NAME].url_for()}"
 
-    app[APP_LOGIN_OPTIONS_KEY] = LoginOptions(**cfg)
+    app[LOGIN_OPTIONS_APPKEY] = LoginOptions(**cfg)
 
 
 async def _resolve_login_settings_per_product(app: web.Application):

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

@@ -11,17 +11,12 @@
 from settings_library.twilio import TwilioSettings
 from simcore_postgres_database.models.products import ProductLoginSettingsDict
 
-from .constants import LOGIN_SETTINGS_PER_PRODUCT_APPKEY
-
 _DAYS: Final[float] = 1.0  # in days
 _MINUTES: Final[float] = 1.0 / 24.0 / 60.0  # in days
 _YEARS: Final[float] = 365 * _DAYS
 _UNLIMITED: Final[float] = 99 * _YEARS
 
 
-APP_LOGIN_OPTIONS_APPKEY: Final = web.AppKey("APP_LOGIN_OPTIONS_APPKEY", "LoginOptions")
-
-
 class LoginSettings(BaseCustomSettings):
     LOGIN_ACCOUNT_DELETION_RETENTION_DAYS: Annotated[
         PositiveInt,
@@ -145,8 +140,10 @@ def get_confirmation_lifetime(
         return timedelta(days=value)
 
 
+LOGIN_OPTIONS_APPKEY: Final = web.AppKey("LOGIN_OPTIONS_APPKEY", LoginOptions)
+
 LOGIN_SETTINGS_PER_PRODUCT_APPKEY: Final = web.AppKey(
-    "LOGIN_SETTINGS_PER_PRODUCT_APPKEY", dict[ProductName, LoginSettingsForProduct]
+    "LOGIN_SETTINGS_PER_PRODUCT", dict[ProductName, LoginSettingsForProduct]
 )
 
 
@@ -160,7 +157,7 @@ def get_plugin_settings(
 
 
 def get_plugin_options(app: web.Application) -> LoginOptions:
-    options = app.get(APP_LOGIN_OPTIONS_APPKEY)
+    options = app.get(LOGIN_OPTIONS_APPKEY)
     assert options, "login plugin was not initialized"  # nosec
     assert isinstance(options, LoginOptions)  # nosec
     return options