rm default

Author: pcrespov

services/web/server/src/simcore_service_webserver/products/_api.py

@@ -38,12 +38,6 @@ def list_products(app: web.Application) -> list[Product]:
     return products
 
 
-def get_default_product_name(app: web.Application) -> str:
-    # TODO: remove from api
-    product_name: str = app[f"{APP_PRODUCTS_KEY}_default"]
-    return product_name
-
-
 async def get_current_product_credit_price_info(
     request: web.Request,
 ) -> ProductPriceInfo | None:

services/web/server/src/simcore_service_webserver/products/_middlewares.py

@@ -7,12 +7,16 @@
 
 from .._constants import APP_PRODUCTS_KEY, RQ_PRODUCT_KEY
 from .._meta import API_VTAG
-from ._api import get_default_product_name
 from ._model import Product
 
 _logger = logging.getLogger(__name__)
 
 
+def _get_default_product_name(app: web.Application) -> str:
+    product_name: str = app[f"{APP_PRODUCTS_KEY}_default"]
+    return product_name
+
+
 def _discover_product_by_hostname(request: web.Request) -> str | None:
     products: OrderedDict[str, Product] = request.app[APP_PRODUCTS_KEY]
     #
@@ -39,24 +43,22 @@ def _discover_product_by_request_header(request: web.Request) -> str | None:
     return None
 
 
-_INCLUDE_PATHS: set[str] = {"/static-frontend-data.json", "/socket.io/"}
-
-
 def _get_diagnose_msg(request: web.Request):
-    return (
-        "\n".join(
-            [
-                f"{request.url=}",
-                f"{request.host=}",
-                f"{request.remote=}",
-                *[f"{k}:{request.headers[k][:20]}" for k in request.headers],
-                f"{request.headers.get('X-Forwarded-Host')=}",
-                f"{request.get(RQ_PRODUCT_KEY)=}",
-            ]
-        ),
+    return "\n".join(
+        [
+            f"{request.url=}",
+            f"{request.host=}",
+            f"{request.remote=}",
+            *[f"{k}:{request.headers[k][:20]}" for k in request.headers],
+            f"{request.headers.get('X-Forwarded-Host')=}",
+            f"{request.get(RQ_PRODUCT_KEY)=}",
+        ]
     )
 
 
+_INCLUDE_PATHS: set[str] = {"/static-frontend-data.json", "/socket.io/"}
+
+
 @web.middleware
 async def discover_product_middleware(request: web.Request, handler: Handler):
     """
@@ -65,47 +67,39 @@ async def discover_product_middleware(request: web.Request, handler: Handler):
         - request[RQ_PRODUCT_KEY] is set to discovered product in 3 types of entrypoints
         - if no product discovered, then it is set to default
     """
-    request[RQ_PRODUCT_KEY] = get_default_product_name(request.app)
 
     if (
         # - API entrypoints
         # - /static info for front-end
         request.path.startswith(f"/{API_VTAG}")
         or request.path in _INCLUDE_PATHS
     ):
-        request[RQ_PRODUCT_KEY] = _discover_product_by_request_header(
-            request
-        ) or _discover_product_by_hostname(request)
-
-        if not request[RQ_PRODUCT_KEY]:
-            bad_request_error = web.HTTPBadRequest(
-                reason="web api request must define a product"
-            )
-            _logger.warning("%s:\n%s", bad_request_error, _get_diagnose_msg(request))
-            raise bad_request_error
+        request[RQ_PRODUCT_KEY] = (
+            _discover_product_by_request_header(request)
+            or _discover_product_by_hostname(request)
+            or _get_default_product_name(request.app)
+        )
 
-    elif (
+    else:
         # - Publications entrypoint: redirections from other websites. SEE studies_access.py::access_study
         # - Root entrypoint: to serve front-end apps
-        request.path.startswith("/study/")
-        or request.path.startswith("/view")
-        or request.path == "/"
-    ):
+        # request.path.startswith("/study/")
+        # or request.path.startswith("/view")
+        # or request.path == "/" )
         request[RQ_PRODUCT_KEY] = _discover_product_by_hostname(
             request
-        ) and get_default_product_name(request.app)
+        ) or _get_default_product_name(request.app)
 
-        assert request[RQ_PRODUCT_KEY]  # nosec
+    # FIXME: session[product]
+    # if product_session := get_session(request).get('product_name'):
+    #  assert get_product_name(request) ==   product_session
 
     _logger.warning(
         "\n%s\n%s\n%s\n",
         "------------------TESTING-------------------",
         _get_diagnose_msg(request),
         "-------------------------------------------",
     )
-
-    assert request.get(RQ_PRODUCT_KEY) is not None or request.path.startswith(  # nosec
-        "/dev/doc"
-    )
+    assert request[RQ_PRODUCT_KEY]  # nosec
 
     return await handler(request)

services/web/server/src/simcore_service_webserver/products/api.py

@@ -3,7 +3,6 @@
 from ._api import (
     get_credit_amount,
     get_current_product,
-    get_default_product_name,
     get_product,
     get_product_name,
     get_product_stripe_info,
@@ -15,7 +14,6 @@
 __all__: tuple[str, ...] = (
     "get_credit_amount",
     "get_current_product",
-    "get_default_product_name",
     "get_product_name",
     "get_product_stripe_info",
     "get_product_template_path",