Merge branch 'master' into pr-osparc-move-service-extras-to-catalog2

Author: GitHK

services/invitations/src/simcore_service_invitations/services/invitations.py

@@ -64,8 +64,7 @@ def _build_link(
     r = URL("/registration").include_query_params(invitation=code_url_safe)
 
     # Adds query to fragment
-    base_url = f"{base_url}/"
-    url = URL(base_url).replace(fragment=f"{r}")
+    url = URL(f"{base_url.rstrip('/')}/").replace(fragment=f"{r}")
     return TypeAdapter(HttpUrl).validate_python(f"{url}")
 
 

services/invitations/tests/unit/api/test_api_invitations.py

@@ -41,6 +41,10 @@ def test_create_invitation(
     assert invitation.guest == invitation_input.guest
     assert invitation.trial_account_days == invitation_input.trial_account_days
 
+    # checks issue with `//` reported in https://github.com/ITISFoundation/osparc-simcore/issues/7055
+    assert invitation.invitation_url
+    assert invitation.invitation_url.path == "/"
+
     assert invitation.product
     if invitation_input.product:
         assert invitation.product == invitation_input.product