🎨 New front-end statics (ITISFoundation#5534)

Author: pcrespov

.env-devel

@@ -150,6 +150,8 @@ S3_EXPORT_SECURE=0
 SCICRUNCH_API_BASE_URL=https://scicrunch.org/api/1
 SCICRUNCH_API_KEY=REPLACE_ME_with_valid_api_key
 
+SIMCORE_VCS_RELEASE_TAG=latest
+
 SMTP_HOST=fake.mail.server.com
 SMTP_PORT=25
 SMTP_USERNAME=it_doesnt_matter

services/docker-compose.yml

@@ -624,6 +624,8 @@ services:
 
       WEBSERVER_STATICWEB: ${WEBSERVER_STATICWEB}
 
+      SIMCORE_VCS_RELEASE_TAG: ${SIMCORE_VCS_RELEASE_TAG}
+
       # WEBSERVER_STORAGE
       STORAGE_ENDPOINT: ${STORAGE_ENDPOINT}
       STORAGE_HOST: ${STORAGE_HOST}

services/static-webserver/README.md

@@ -2,7 +2,7 @@
 
 Used for static content serving.
 
-### Furtherr steps
+## Further steps
 
 In the future will fully serve all static content. Currently the `webserver` is still serving the following routes:
 

services/static-webserver/client/source/class/osparc/po/Users.js

@@ -63,7 +63,7 @@ qx.Class.define("osparc.po.Users", {
 
       const userEmail = new qx.ui.form.TextField().set({
         required: true,
-        placeholder: this.tr("new.[email protected]")
+        placeholder: this.tr("[email protected] or user@*")
       });
       form.add(userEmail, this.tr("Email"));
 

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

@@ -1,7 +1,6 @@
 import logging
-from datetime import datetime
 from functools import cached_property
-from typing import Any
+from typing import Any, Final
 
 from aiohttp import web
 from models_library.basic_types import (
@@ -85,10 +84,7 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
         description="Name of the tag that makrs this release or None if undefined",
         example="ResistanceIsFutile10",
     )
-    SIMCORE_VCS_RELEASE_DATE: datetime | None = Field(
-        default=None,
-        description="Release date or None if undefined. It corresponds to the tag's creation date",
-    )
+
     SIMCORE_VCS_RELEASE_URL: AnyHttpUrl | None = Field(
         default=None,
         description="URL to release notes",
@@ -243,13 +239,18 @@ class ApplicationSettings(BaseCustomSettings, MixinLoggingSettings):
     @root_validator()
     @classmethod
     def build_vcs_release_url_if_unset(cls, values):
-        vcs_release_url = values.get("SIMCORE_VCS_RELEASE_URL")
+        release_url = values.get("SIMCORE_VCS_RELEASE_URL")
 
-        if vcs_release_url is None and (
+        if release_url is None and (
             vsc_release_tag := values.get("SIMCORE_VCS_RELEASE_TAG")
         ):
-            vcs_release_url = f"https://github.com/ITISFoundation/osparc-simcore/releases/tag/{vsc_release_tag}"
-            values["SIMCORE_VCS_RELEASE_URL"] = vcs_release_url
+            if vsc_release_tag == "latest":
+                release_url = (
+                    "https://github.com/ITISFoundation/osparc-simcore/commits/master/"
+                )
+            else:
+                release_url = f"https://github.com/ITISFoundation/osparc-simcore/releases/tag/{vsc_release_tag}"
+            values["SIMCORE_VCS_RELEASE_URL"] = release_url
 
         return values
 
@@ -309,19 +310,15 @@ def _get_disabled_public_plugins(self) -> list[str]:
         # might reveal critical info on the settings of a deploy to the client.
         # TODO: more reliable definition of a "plugin" and whether it can be advertised or not
         # (extra var? e.g. Field( ... , x_advertise_plugin=True))
-        PUBLIC_PLUGIN_CANDIDATES = {
+        public_plugin_candidates: Final = {
             "WEBSERVER_CLUSTERS",
             "WEBSERVER_EXPORTER",
             "WEBSERVER_META_MODELING",
             "WEBSERVER_PAYMENTS",
             "WEBSERVER_SCICRUNCH",
             "WEBSERVER_VERSION_CONTROL",
         }
-        return [
-            plugin_name
-            for plugin_name in PUBLIC_PLUGIN_CANDIDATES
-            if not self.is_enabled(plugin_name)
-        ]
+        return [_ for _ in public_plugin_candidates if not self.is_enabled(_)]
 
     def _export_by_alias(self, **kwargs) -> dict[str, Any]:
         #  This is a small helper to assist export functions since aliases are no longer used by
@@ -337,7 +334,6 @@ def _export_by_alias(self, **kwargs) -> dict[str, Any]:
             "SC_VCS_REF": "vcs_ref",
             "SC_VCS_URL": "vcs_url",
             "SIMCORE_VCS_RELEASE_TAG": "vcs_release_tag",
-            "SIMCORE_VCS_RELEASE_DATE": "vcs_release_date",
             "SIMCORE_VCS_RELEASE_URL": "vcs_release_url",
             "SWARM_STACK_NAME": "stack_name",
         }
@@ -366,7 +362,6 @@ def public_dict(self) -> dict[str, Any]:
                     "SC_VCS_REF",
                     "SC_VCS_URL",
                     "SIMCORE_VCS_RELEASE_TAG",
-                    "SIMCORE_VCS_RELEASE_DATE",
                     "SIMCORE_VCS_RELEASE_URL",
                 },
                 exclude_none=True,
@@ -383,11 +378,11 @@ def to_client_statics(self) -> dict[str, Any]:
                 "SC_VCS_REF": True,
                 "SC_VCS_URL": True,
                 "SIMCORE_VCS_RELEASE_TAG": True,
-                "SIMCORE_VCS_RELEASE_DATE": True,
                 "SIMCORE_VCS_RELEASE_URL": True,
                 "SWARM_STACK_NAME": True,
                 "WEBSERVER_PROJECTS": {"PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES"},
                 "WEBSERVER_LOGIN": {"LOGIN_ACCOUNT_DELETION_RETENTION_DAYS"},
+                "WEBSERVER_SESSION": {"SESSION_COOKIE_MAX_AGE"},
             },
             exclude_none=True,
         )

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

@@ -62,12 +62,19 @@ async def set_user_as_deleted(app: web.Application, user_id: UserID) -> None:
     )
 
 
+def _glob_to_sql_like(glob_pattern: str) -> str:
+    # Escape SQL LIKE special characters in the glob pattern
+    sql_like_pattern = glob_pattern.replace("%", r"\%").replace("_", r"\_")
+    # Convert glob wildcards to SQL LIKE wildcards
+    return sql_like_pattern.replace("*", "%").replace("?", "_")
+
+
 async def search_users(
-    app: web.Application, email_like: str, *, include_products: bool = False
+    app: web.Application, email_glob: str, *, include_products: bool = False
 ) -> list[_schemas.UserProfile]:
     # NOTE: this search is deploy-wide i.e. independent of the product!
     rows = await _db.search_users_and_get_profile(
-        get_database_engine(app), email_like=email_like
+        get_database_engine(app), email_like=_glob_to_sql_like(email_glob)
     )
 
     async def _list_products_or_none(user_id):
@@ -105,7 +112,7 @@ async def pre_register_user(
     app: web.Application, profile: _schemas.PreUserProfile, creator_user_id: UserID
 ) -> _schemas.UserProfile:
 
-    found = await search_users(app, email_like=profile.email, include_products=False)
+    found = await search_users(app, email_glob=profile.email, include_products=False)
     if found:
         raise AlreadyPreRegisteredError(num_found=len(found), email=profile.email)
 
@@ -136,7 +143,7 @@ async def pre_register_user(
         **details,
     )
 
-    found = await search_users(app, email_like=profile.email, include_products=False)
+    found = await search_users(app, email_glob=profile.email, include_products=False)
 
     assert len(found) == 1  # nosec
     return found[0]

services/web/server/src/simcore_service_webserver/users/_handlers.py

@@ -71,7 +71,11 @@ async def update_my_profile(request: web.Request) -> web.Response:
 
 
 class _SearchQueryParams(BaseModel):
-    email: str = Field(min_length=3, max_length=200)
+    email: str = Field(
+        min_length=3,
+        max_length=200,
+        description="complete or glob pattern for an email",
+    )
 
 
 _RESPONSE_MODEL_MINIMAL_POLICY = RESPONSE_MODEL_POLICY.copy()
@@ -89,7 +93,7 @@ async def search_users(request: web.Request) -> web.Response:
     query_params = parse_request_query_parameters_as(_SearchQueryParams, request)
 
     found = await _api.search_users(
-        request.app, email_like=query_params.email, include_products=True
+        request.app, email_glob=query_params.email, include_products=True
     )
 
     return envelope_json_response(

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

@@ -75,7 +75,7 @@ def app_config_for_production_legacy(test_data_dir: Path) -> ConfigDict:
 
 
 @pytest.fixture
-def mock_env_auto_deployer_agent(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
+def mock_env_deployer_pipeline(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
     # git log --tags --simplify-by-decoration --pretty="format:%ci %d"
     #  2023-02-08 18:34:56 +0000  (tag: v1.47.0, tag: staging_ResistanceIsFutile12)
     #  2023-02-06 18:40:07 +0100  (tag: v1.46.0, tag: staging_ResistanceIsFutile11)
@@ -85,7 +85,6 @@ def mock_env_auto_deployer_agent(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict
         monkeypatch,
         envs={
             "SIMCORE_VCS_RELEASE_TAG": "staging_ResistanceIsFutile12",
-            "SIMCORE_VCS_RELEASE_DATE": "2023-02-10T18:03:35.957601",
         },
     )
 

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

@@ -7,6 +7,7 @@
 
 import pytest
 from aiohttp import web
+from pydantic import HttpUrl, parse_obj_as
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.utils_envs import setenvs_from_dict, setenvs_from_envfile
 from servicelib.json_serialization import json_dumps
@@ -60,7 +61,7 @@ def mock_env_makefile(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
 
 
 @pytest.fixture
-def mock_env_Dockerfile_build(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
+def mock_env_dockerfile_build(monkeypatch: pytest.MonkeyPatch) -> EnvVarsDict:
     #
     # docker run -it --hostname "{{.Node.Hostname}}-{{.Service.Name}}-{{.Task.Slot}}" local/webserver:production printenv
     #
@@ -100,8 +101,8 @@ def mock_webserver_service_environment(
     monkeypatch: pytest.MonkeyPatch,
     mock_env_makefile: EnvVarsDict,
     mock_env_devel_environment: EnvVarsDict,
-    mock_env_Dockerfile_build: EnvVarsDict,
-    mock_env_auto_deployer_agent: EnvVarsDict,
+    mock_env_dockerfile_build: EnvVarsDict,
+    mock_env_deployer_pipeline: EnvVarsDict,
 ) -> EnvVarsDict:
     """
     Mocks environment produce in the docker compose config with a .env (.env-devel)
@@ -144,14 +145,15 @@ def mock_webserver_service_environment(
             "STORAGE_PORT": os.environ.get("STORAGE_PORT", "8080"),
             "SWARM_STACK_NAME": os.environ.get("SWARM_STACK_NAME", "simcore"),
             "WEBSERVER_LOGLEVEL": os.environ.get("LOG_LEVEL", "WARNING"),
+            "SESSION_COOKIE_MAX_AGE": str(7 * 24 * 60 * 60),
         },
     )
 
     return (
         mock_env_makefile
         | mock_env_devel_environment
-        | mock_env_Dockerfile_build
-        | mock_env_auto_deployer_agent
+        | mock_env_dockerfile_build
+        | mock_env_deployer_pipeline
         | mock_envs_docker_compose_environment
     )
 
@@ -224,6 +226,13 @@ def test_settings_to_client_statics_plugins(
         statics["webserverLogin"]["LOGIN_ACCOUNT_DELETION_RETENTION_DAYS"]
         == settings.WEBSERVER_LOGIN.LOGIN_ACCOUNT_DELETION_RETENTION_DAYS
     )
+    assert (
+        statics["webserverSession"].get("SESSION_COOKIE_MAX_AGE")
+        == settings.WEBSERVER_SESSION.SESSION_COOKIE_MAX_AGE
+    )
+
+    assert statics["vcsReleaseTag"]
+    assert parse_obj_as(HttpUrl, statics["vcsReleaseUrl"])
 
     assert set(statics["pluginsDisabled"]) == (disable_plugins | {"WEBSERVER_CLUSTERS"})
 

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

@@ -27,7 +27,7 @@ def client(
     aiohttp_client: Callable,
     api_version_prefix: str,
     mock_env_devel_environment: EnvVarsDict,
-    mock_env_auto_deployer_agent: EnvVarsDict,
+    mock_env_deployer_pipeline: EnvVarsDict,
 ) -> TestClient:
     app = create_safe_application()