rm undefined and default product

Author: pcrespov

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

@@ -15,8 +15,9 @@
 from .errors import BelowMinimumPaymentError, ProductPriceNotDefinedError
 
 
-def get_product_name(request: web.Request) -> str:
-    product_name: str = request[RQ_PRODUCT_KEY]
+def get_product_name(request: web.Request) -> str | None:
+    """Returns product name in request but might be undefined"""
+    product_name: str | None = request[RQ_PRODUCT_KEY]
     return product_name
 
 
@@ -37,6 +38,11 @@ def list_products(app: web.Application) -> list[Product]:
     return products
 
 
+def get_default_product_name(app: web.Application) -> str:
+    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

@@ -1,4 +1,3 @@
-import enum
 import logging
 from collections import OrderedDict
 
@@ -39,15 +38,6 @@ def _discover_product_by_request_header(request: web.Request) -> str | None:
     return None
 
 
-def _get_app_default_product_name(request: web.Request) -> str:
-    product_name: str = request.app[f"{APP_PRODUCTS_KEY}_default"]
-    return product_name
-
-
-class Sentinel(enum.StrEnum):
-    UNDEFINED = enum.auto()
-
-
 _INCLUDE_PATHS: set[str] = {"/static-frontend-data.json", "/socket.io/"}
 
 
@@ -59,15 +49,13 @@ 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] = None
     # - API entrypoints
     # - /static info for front-end
     if 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)
-            or Sentinel.UNDEFINED
-            # FIXME: or _get_app_default_product_name(request)
-        )
+        request[RQ_PRODUCT_KEY] = _discover_product_by_request_header(
+            request
+        ) or _discover_product_by_hostname(request)
 
     # - Publications entrypoint: redirections from other websites. SEE studies_access.py::access_study
     # - Root entrypoint: to serve front-end apps
@@ -76,16 +64,15 @@ async def discover_product_middleware(request: web.Request, handler: Handler):
         or request.path.startswith("/view")
         or request.path == "/"
     ):
-        request[RQ_PRODUCT_KEY] = (
-            _discover_product_by_hostname(request) or Sentinel.UNDEFINED
-        )
-        # FIXME: or _get_app_default_product_name(request)
+        request[RQ_PRODUCT_KEY] = _discover_product_by_hostname(request)
 
     msg = "\n".join(
         [
             f"{request.url=}",
             f"{request.host=}",
-            f"{request.headers=}",
+            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)=}",
         ]
     )

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

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