new appkey

Author: pcrespov

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

@@ -125,9 +125,7 @@
 
 # App keys for login plugin
 # Naming convention: APP_LOGIN_...KEY
-APP_LOGIN_SETTINGS_PER_PRODUCT_KEY: Final[str] = (
-    f"{__name__}.LOGIN_SETTINGS_PER_PRODUCT"
-)
+LOGIN_SETTINGS_PER_PRODUCT_APPKEY: Final[str] = f"{__name__}.LOGIN_SETTINGS_PER_PRODUCT"
 
 
 # maximum amount the user can resend the code via email or phone

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

@@ -39,7 +39,7 @@
     twofa,
 )
 from ._login_repository_legacy import APP_LOGIN_STORAGE_KEY, AsyncpgStorage
-from .constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
+from .constants import LOGIN_SETTINGS_PER_PRODUCT_APPKEY
 from .settings import (
     APP_LOGIN_OPTIONS_KEY,
     LoginOptions,
@@ -118,7 +118,7 @@ async def _resolve_login_settings_per_product(app: web.Application):
             raise ValueError(error_msg)
 
     # store in app
-    app[APP_LOGIN_SETTINGS_PER_PRODUCT_KEY] = login_settings_per_product
+    app[LOGIN_SETTINGS_PER_PRODUCT_APPKEY] = login_settings_per_product
 
     # product-based public config: Overrides  ApplicationSettings.public_dict
     public_data_per_product = {}

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

@@ -10,7 +10,7 @@
 from settings_library.twilio import TwilioSettings
 from simcore_postgres_database.models.products import ProductLoginSettingsDict
 
-from .constants import APP_LOGIN_SETTINGS_PER_PRODUCT_KEY
+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
@@ -147,7 +147,7 @@ def get_plugin_settings(
     app: web.Application, product_name: str
 ) -> LoginSettingsForProduct:
     """login plugin's settings are customized per product"""
-    settings = app[APP_LOGIN_SETTINGS_PER_PRODUCT_KEY][product_name]
+    settings = app[LOGIN_SETTINGS_PER_PRODUCT_APPKEY][product_name]
     assert settings, "setup_settings not called?"  # nosec
     assert isinstance(settings, LoginSettingsForProduct)  # nosec
     return settings

services/web/server/tests/unit/with_dbs/03/test_user_preferences_models.py

@@ -91,7 +91,7 @@ def test_overwrite_user_preferences_defaults(
 
 @pytest.fixture
 def mock_app(app_environment: EnvVarsDict) -> Mock:
-    app = {APP_SETTINGS_APPKEY: Mock()}
+    app = {}
     app[APP_SETTINGS_APPKEY] = ApplicationSettings.create_from_envs()
     return app  # type: ignore