cleanup

Author: pcrespov

services/web/server/src/simcore_service_webserver/application_settings.py

@@ -283,7 +283,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     WEBSERVER_DB_LISTENER: bool = True
     WEBSERVER_FOLDERS: bool = True
     WEBSERVER_GROUPS: bool = True
-    WEBSERVER_LICENSES: bool
+    WEBSERVER_LICENSES: bool = False
     WEBSERVER_META_MODELING: bool = True
     WEBSERVER_NOTIFICATIONS: bool = Field(default=True)
     WEBSERVER_PRODUCTS: bool = True

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

@@ -8,6 +8,7 @@
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
 from ..rabbitmq import setup_rabbitmq
+from ..rest.plugin import setup_rest
 from . import (
     _licensed_items_checkouts_rest,
     _licensed_items_purchases_rest,
@@ -22,13 +23,13 @@
     __name__,
     ModuleCategory.ADDON,
     settings_name="WEBSERVER_LICENSES",
-    depends=["simcore_service_webserver.rest"],
     logger=_logger,
 )
 def setup_licenses(app: web.Application):
     assert app[APP_SETTINGS_KEY].WEBSERVER_LICENSES  # nosec
 
     # routes
+    setup_rest(app)
     app.router.add_routes(_licensed_items_rest.routes)
     app.router.add_routes(_licensed_items_purchases_rest.routes)
     app.router.add_routes(_licensed_items_checkouts_rest.routes)

services/web/server/tests/unit/isolated/test_application_settings.py

@@ -84,6 +84,8 @@ def test_settings_to_client_statics_plugins(
 
     assert settings.WEBSERVER_LOGIN
 
+    assert statics["webserverLicenses"] == settings.WEBSERVER_LICENSES
+
     assert (
         statics["webserverLogin"]["LOGIN_ACCOUNT_DELETION_RETENTION_DAYS"]
         == settings.WEBSERVER_LOGIN.LOGIN_ACCOUNT_DELETION_RETENTION_DAYS