insert_user_and_secrets

Author: pcrespov

packages/postgres-database/tests/conftest.py

@@ -18,11 +18,10 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from faker import Faker
-from pytest_simcore.helpers import postgres_tools
+from pytest_simcore.helpers import postgres_tools, postgres_users
 from pytest_simcore.helpers.faker_factories import (
     random_group,
     random_project,
-    random_user,
 )
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.projects import projects
@@ -268,10 +267,11 @@ def create_fake_user(sync_engine: sqlalchemy.engine.Engine) -> Iterator[Callable
     async def _creator(
         conn: SAConnection, group: RowProxy | None = None, **overrides
     ) -> RowProxy:
-        user_id = await conn.scalar(
-            users.insert().values(**random_user(**overrides)).returning(users.c.id)
+
+        user_id = await postgres_users.insert_user_and_secrets(
+            conn,
+            **overrides,
         )
-        assert user_id is not None
 
         # This is done in two executions instead of one (e.g. returning(literal_column("*")) )
         # to allow triggering function in db that

packages/postgres-database/tests/test_models_api_keys.py

@@ -9,10 +9,10 @@
 import sqlalchemy as sa
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
+from pytest_simcore.helpers import postgres_users
 from pytest_simcore.helpers.faker_factories import (
     random_api_auth,
     random_product,
-    random_user,
 )
 from simcore_postgres_database.models.api_keys import api_keys
 from simcore_postgres_database.models.products import products
@@ -21,13 +21,12 @@
 
 @pytest.fixture
 async def user_id(connection: SAConnection) -> AsyncIterable[int]:
-    uid = await connection.scalar(
-        users.insert().values(random_user()).returning(users.c.id)
-    )
-    assert uid
-    yield uid
+    user_id = await postgres_users.insert_user_and_secrets(connection)
+
+    assert user_id
+    yield user_id
 
-    await connection.execute(users.delete().where(users.c.id == uid))
+    await connection.execute(users.delete().where(users.c.id == user_id))
 
 
 @pytest.fixture
@@ -84,7 +83,10 @@ async def test_get_session_identity_for_api_server(
     # authorize a session
     #
     result = await connection.execute(
-        sa.select(api_keys.c.user_id, api_keys.c.product_name,).where(
+        sa.select(
+            api_keys.c.user_id,
+            api_keys.c.product_name,
+        ).where(
             (api_keys.c.api_key == session_auth.api_key)
             & (api_keys.c.api_secret == session_auth.api_secret),
         )

packages/postgres-database/tests/test_models_groups.py

@@ -10,7 +10,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import ResultProxy, RowProxy
 from psycopg2.errors import ForeignKeyViolation, RaiseException, UniqueViolation
-from pytest_simcore.helpers.faker_factories import random_user
+from pytest_simcore.helpers import postgres_users
 from simcore_postgres_database.webserver_models import (
     GroupType,
     groups,
@@ -64,9 +64,8 @@ async def test_all_group(
         await connection.execute(groups.delete().where(groups.c.gid == all_group_gid))
 
     # check adding a user is automatically added to the all group
-    result = await connection.execute(
-        users.insert().values(**random_user()).returning(literal_column("*"))
-    )
+    user_id = await postgres_users.insert_user_and_secrets(connection)
+    result = await connection.execute(users.select().where(users.c.id == user_id))
     user: RowProxy = await result.fetchone()
 
     result = await connection.execute(
@@ -98,9 +97,8 @@ async def test_all_group(
 async def test_own_group(
     connection: SAConnection,
 ):
-    result = await connection.execute(
-        users.insert().values(**random_user()).returning(literal_column("*"))
-    )
+    user_id = await postgres_users.insert_user_and_secrets(connection)
+    result = await connection.execute(users.select().where(users.c.id == user_id))
     user: RowProxy = await result.fetchone()
     assert not user.primary_gid
 

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

@@ -55,9 +55,7 @@ def _compute_hash(password: str) -> str:
 _DEFAULT_HASH = _compute_hash(DEFAULT_TEST_PASSWORD)
 
 
-def random_user(
-    fake: Faker = DEFAULT_FAKER, password: str | None = None, **overrides
-) -> dict[str, Any]:
+def random_user(fake: Faker = DEFAULT_FAKER, **overrides) -> dict[str, Any]:
     from simcore_postgres_database.models.users import users
     from simcore_postgres_database.webserver_models import UserStatus
 
@@ -67,12 +65,34 @@ def random_user(
         # NOTE: ensures user name is unique to avoid flaky tests
         "name": f"{fake.user_name()}_{fake.uuid4()}",
         "email": f"{fake.uuid4()}_{fake.email().lower()}",
-        "password_hash": _DEFAULT_HASH,
         "status": UserStatus.ACTIVE,
     }
-
     assert set(data.keys()).issubset({c.name for c in users.columns})
 
+    data.update(overrides)
+    return data
+
+
+def random_user_secrets(
+    fake: Faker = DEFAULT_FAKER,
+    *,
+    # foreign keys
+    user_id: int,
+    password: str | None = None,
+    **overrides,
+) -> dict[str, Any]:
+    from simcore_postgres_database.models.users_secrets import users_secrets
+
+    assert fake  # nosec
+
+    assert set(overrides.keys()).issubset({c.name for c in users_secrets.columns})
+
+    data = {
+        "user_id": user_id,
+        "password_hash": _DEFAULT_HASH,
+    }
+    assert set(data.keys()).issubset({c.name for c in users_secrets.columns})
+
     # transform password in hash
     if password:
         assert len(password) >= 12

packages/pytest-simcore/src/pytest_simcore/helpers/postgres_users.py

@@ -0,0 +1,27 @@
+from common_library.async_tools import maybe_await
+from simcore_postgres_database.models.users import users
+from simcore_postgres_database.models.users_secrets import users_secrets
+
+from .faker_factories import random_user, random_user_secrets
+
+
+async def insert_user_and_secrets(conn, **overrides) -> int:
+    password = overrides.pop("password")
+    # user data
+    user_id = await maybe_await(
+        conn.scalar(
+            users.insert().values(**random_user(**overrides)).returning(users.c.id)
+        )
+    )
+    assert user_id is not None
+
+    # secrets
+    await maybe_await(
+        conn.execute(
+            users_secrets.insert()
+            .values(**random_user_secrets(user_id=user_id, password=password))
+            .returning(users.c.id)
+        )
+    )
+
+    return user_id

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_users.py

@@ -3,9 +3,9 @@
 from typing import Any, TypedDict
 
 from aiohttp import web
+from common_library.users_enums import UserRole, UserStatus
 from models_library.users import UserID
 from simcore_postgres_database.models.users import users as users_table
-from simcore_service_webserver.db.models import UserRole, UserStatus
 from simcore_service_webserver.db.plugin import get_asyncpg_engine
 from simcore_service_webserver.groups import api as groups_service
 from simcore_service_webserver.products.products_service import list_products