Merge branch 'master' into pr-osparc-add-wallet-id-to-osparc-envs

GitHK · Jan 29, 2025 · b177768 · b177768
2 parents 49303c7 + b3fb639
commit b177768
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 12 deletions.
diff --git a/...simcore_postgres_database/migration/versions/1bc517536e0a_add_product_owners_email_col.py b/...simcore_postgres_database/migration/versions/1bc517536e0a_add_product_owners_email_col.py
@@ -0,0 +1,29 @@
+"""Add product owners email col
+
+Revision ID: 1bc517536e0a
+Revises: 5f88b513cd4c
+Create Date: 2025-01-29 10:05:58.254306+00:00
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "1bc517536e0a"
+down_revision = "5f88b513cd4c"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "products", sa.Column("product_owners_email", sa.String(), nullable=True)
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("products", "product_owners_email")
+    # ### end Alembic commands ###
diff --git a/packages/postgres-database/src/simcore_postgres_database/models/products.py b/packages/postgres-database/src/simcore_postgres_database/models/products.py
@@ -154,6 +154,12 @@ class ProductLoginSettingsDict(TypedDict, total=False):
         doc="Support email for this product"
         'Therefore smtp_sender = f"{display_name} support <{support_email}>"',
     ),
+    sa.Column(
+        "product_owners_email",
+        sa.String,
+        nullable=True,
+        doc="Alternative support email directed to POs only (e.g. for account request, sales, etc)",
+    ),
     sa.Column(
         "twilio_messaging_sid",
         sa.String,

diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py b/packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py
@@ -227,7 +227,12 @@ def random_product(
         "short_name": suffix[:4],
         "host_regex": r"[a-zA-Z0-9]+\.com",
         "support_email": f"support@{suffix}.io",
-        "twilio_messaging_sid": fake.random_element(elements=(None, fake.uuid4()[:34])),
+        "product_owners_email": fake.random_element(
+            elements=[f"product-onwers@{suffix}.io", None]
+        ),
+        "twilio_messaging_sid": fake.random_element(
+            elements=(None, f"{fake.uuid4()}"[:34])
+        ),
         "vendor": Vendor(
             name=fake.company(),
             copyright=fake.company_suffix(),

diff --git a/services/web/server/src/simcore_service_webserver/login/_registration_api.py b/services/web/server/src/simcore_service_webserver/login/_registration_api.py
@@ -63,7 +63,7 @@ async def send_account_request_email_to_support(
     ipinfo: dict,
 ):
     template_name = "request_account.jinja2"
-    support_email = product.support_email
+    destination_email = product.product_owners_email or product.support_email
     email_template_path = await get_product_template_path(request, template_name)
     try:
         user_email = TypeAdapter(LowerCaseEmailStr).validate_python(
@@ -75,13 +75,13 @@ async def send_account_request_email_to_support(
     try:
         await send_email_from_template(
             request,
-            from_=support_email,
-            to=support_email,
+            from_=product.support_email,
+            to=destination_email,
             reply_to=user_email,  # So that issue-tracker system ACK email is sent to the user that requests the account
             template=email_template_path,
             context={
                 "host": request.host,
-                "name": "support-team",
+                "name": "product-owners",
                 "product": product.model_dump(
                     include={
                         "name",
@@ -99,7 +99,7 @@ async def send_account_request_email_to_support(
         _logger.exception(
             "Failed while sending '%s' email to %s",
             template_name,
-            f"{support_email=}",
+            f"{destination_email=}",
         )
 
 

diff --git a/services/web/server/src/simcore_service_webserver/products/_db.py b/services/web/server/src/simcore_service_webserver/products/_db.py
@@ -32,6 +32,7 @@
     products.c.short_name,
     products.c.host_regex,
     products.c.support_email,
+    products.c.product_owners_email,
     products.c.twilio_messaging_sid,
     products.c.vendor,
     products.c.issues,

diff --git a/services/web/server/src/simcore_service_webserver/products/_model.py b/services/web/server/src/simcore_service_webserver/products/_model.py
@@ -63,11 +63,18 @@ class Product(BaseModel):
         ..., description="Host regex"
     )
 
-    support_email: LowerCaseEmailStr = Field(
-        ...,
-        description="Main support email."
-        " Other support emails can be defined under 'support' field",
-    )
+    support_email: Annotated[
+        LowerCaseEmailStr,
+        Field(
+            description="Main support email."
+            " Other support emails can be defined under 'support' field",
+        ),
+    ]
+
+    product_owners_email: Annotated[
+        LowerCaseEmailStr | None,
+        Field(description="Used e.g. for account requests forms"),
+    ] = None
 
     twilio_messaging_sid: str | None = Field(
         default=None, min_length=34, max_length=34, description="Identifier for SMS"

diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_registration_handlers.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_registration_handlers.py
@@ -208,4 +208,4 @@ async def test_request_an_account(
     mimetext = mocked_send_email.call_args[1]["message"]
     assert "account" in mimetext["Subject"].lower()
     assert mimetext["From"] == product.support_email
-    assert mimetext["To"] == product.support_email
+    assert mimetext["To"] == product.product_owners_email or product.support_email