drafted registration

Author: pcrespov

services/web/server/src/simcore_service_webserver/login/_controller/rest/preregistration.py

@@ -12,9 +12,9 @@
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.logging_utils import get_log_record_extra, log_context
-from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.utils import fire_and_forget_task
+from simcore_service_webserver.users._users_rest import PreRegisteredUserGet
 
 from ...._meta import API_VTAG
 from ....constants import RQ_PRODUCT_KEY
@@ -71,11 +71,21 @@ async def request_product_account(request: web.Request):
     assert body.captcha  # nosec
 
     if body.captcha != session.get(CAPTCHA_SESSION_KEY):
-        raise web.HTTPUnprocessableEntity(
-            text=MSG_WRONG_CAPTCHA__INVALID, content_type=MIMETYPE_APPLICATION_JSON
-        )
+        raise web.HTTPUnprocessableEntity(text=MSG_WRONG_CAPTCHA__INVALID)
     session.pop(CAPTCHA_SESSION_KEY, None)
 
+    pre_user_profile = PreRegisteredUserGet.model_validate(
+        # TODO: can raise vliadation error
+        body.form
+    )
+
+    user_profile = await _preregistration_service.create_pre_registration(
+        # TODO: this raises AlreadyPreRegisteredError or ValidationError or anything regarding
+        request.app,
+        profile=pre_user_profile,
+        product_name=product.name,
+    )
+
     # send email to fogbugz or user itself
     fire_and_forget_task(
         _preregistration_service.send_account_request_email_to_support(

services/web/server/src/simcore_service_webserver/login/_preregistration_service.py

@@ -7,14 +7,17 @@
 from captcha.image import ImageCaptcha
 from common_library.json_serialization import json_dumps
 from models_library.emails import LowerCaseEmailStr
+from models_library.products import ProductName
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from PIL.Image import Image
 from pydantic import EmailStr, PositiveInt, TypeAdapter, ValidationError
 from servicelib.utils_secrets import generate_passcode
+from simcore_service_webserver.users._users_rest import PreRegisteredUserGet
 
 from ..email.utils import send_email_from_template
 from ..products import products_web
 from ..products.models import Product
+from ..users import _users_service
 
 _logger = logging.getLogger(__name__)
 
@@ -122,3 +125,12 @@ async def create_captcha() -> tuple[str, bytes]:
     image_data = img_byte_arr.getvalue()
 
     return (captcha_text, image_data)
+
+
+async def create_pre_registration(
+    app: web.Application, profile: PreRegisteredUserGet, product_name: ProductName
+):
+
+    await _users_service.pre_register_user(
+        app, profile=profile, creator_user_id=None, product_name=product_name
+    )

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

@@ -45,7 +45,7 @@ async def pre_register_user(
     app: web.Application,
     *,
     profile: PreRegisteredUserGet,
-    creator_user_id: UserID,
+    creator_user_id: UserID | None,
     product_name: ProductName,
 ) -> UserAccountGet:
 

services/web/server/tests/unit/with_dbs/03/login/test_login_preregistration.py

@@ -168,7 +168,7 @@ async def test_request_an_account(
     assert client.app
     # A form similar to the one in https://github.com/ITISFoundation/osparc-simcore/pull/5378
     user_data = {
-        **AccountRequestInfo.model_config["json_schema_extra"]["example"]["form"],
+        **AccountRequestInfo.model_json_schema()["example"]["form"],
         # fields required in the form
         "firstName": faker.first_name(),
         "lastName": faker.last_name(),
@@ -188,8 +188,10 @@ async def test_request_an_account(
 
     product = get_product(client.app, product_name="osparc")
 
-    # sent email?
+    # check email was sent
     mimetext = mocked_send_email.call_args[1]["message"]
     assert "account" in mimetext["Subject"].lower()
     assert mimetext["From"] == product.support_email
     assert mimetext["To"] == product.product_owners_email or product.support_email
+
+    # TODO: switch to PO user and check if request is listed