test: adds test for create_reset_password_link

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+## [0.17.1] - 2023-11-15
+- Added test for `create_reset_password_link` in both `emailpassword` and `thirdpartyemailpassword` recipes.
+
 ## [0.17.0] - 2023-11-14
 - Fixes `create_reset_password_link` in the emailpassword recipe wherein we passed the `rid` instead of the token in the link
 

setup.py

@@ -70,7 +70,7 @@
 
 setup(
     name="supertokens_python",
-    version="0.17.0",
+    version="0.17.1",
     author="SuperTokens",
     license="Apache 2.0",
     author_email="[email protected]",

supertokens_python/constants.py

@@ -14,7 +14,7 @@
 from __future__ import annotations
 
 SUPPORTED_CDI_VERSIONS = ["3.0"]
-VERSION = "0.17.0"
+VERSION = "0.17.1"
 TELEMETRY = "/telemetry"
 USER_COUNT = "/users/count"
 USER_DELETE = "/user/remove"

tests/emailpassword/test_passwordreset.py

@@ -14,14 +14,20 @@
 import asyncio
 import json
 from typing import Any, Dict, Union
+from urllib.parse import urlparse
 
 from fastapi import FastAPI
 from fastapi.requests import Request
 from fastapi.testclient import TestClient
-from pytest import fixture, mark
+from pytest import fixture, mark, raises
 from supertokens_python import InputAppInfo, SupertokensConfig, init
+from supertokens_python.exceptions import GeneralError
 from supertokens_python.framework.fastapi import get_middleware
 from supertokens_python.recipe import emailpassword, session
+from supertokens_python.recipe.emailpassword.asyncio import create_reset_password_link
+from supertokens_python.recipe.emailpassword.interfaces import (
+    CreateResetPasswordLinkUnknownUserIdError,
+)
 from supertokens_python.recipe.session import SessionContainer
 from supertokens_python.recipe.session.asyncio import (
     create_new_session,
@@ -124,6 +130,7 @@ async def test_that_generated_password_link_is_correct(
     reset_url = None
     token_info: Union[None, str] = None
     rid_info: Union[None, str] = None
+    tenant_info: Union[None, str] = None
 
     class CustomEmailService(
         emailpassword.EmailDeliveryInterface[emailpassword.EmailTemplateVars]
@@ -133,11 +140,12 @@ async def send_email(
             template_vars: emailpassword.EmailTemplateVars,
             user_context: Dict[str, Any],
         ) -> None:
-            nonlocal reset_url, token_info, rid_info
+            nonlocal reset_url, token_info, rid_info, tenant_info
             password_reset_url_with_token = template_vars.password_reset_link
             reset_url = password_reset_url_with_token.split("?")[0]
             token_info = password_reset_url_with_token.split("?")[1].split("&")[0]
             rid_info = password_reset_url_with_token.split("?")[1].split("&")[1]
+            tenant_info = password_reset_url_with_token.split("?")[1].split("&")[2]
 
     init(
         supertokens_config=SupertokensConfig("http://localhost:3567"),
@@ -172,6 +180,7 @@ async def send_email(
     assert reset_url == "http://supertokens.io/auth/reset-password"
     assert token_info is not None and "token=" in token_info  # type: ignore pylint: disable=unsupported-membership-test
     assert rid_info is not None and "rid=emailpassword" in rid_info  # type: ignore pylint: disable=unsupported-membership-test
+    assert tenant_info is not None and "tenantId=" in tenant_info  # type: ignore pylint: disable=unsupported-membership-test
 
 
 @mark.asyncio
@@ -258,6 +267,14 @@ async def send_email(
             token_info = (
                 password_reset_url_with_token.split("?")[1].split("&")[0].split("=")[1]
             )
+            assert (
+                password_reset_url_with_token.split("?")[1].split("&")[2].split("=")[1]
+                == "public"
+            )
+            assert (
+                password_reset_url_with_token.split("?")[1].split("&")[1].split("=")[1]
+                == "emailpassword"
+            )
 
     init(
         supertokens_config=SupertokensConfig("http://localhost:3567"),
@@ -339,3 +356,45 @@ async def send_email(
     assert dict_response["status"] == "OK"
     assert dict_response["user"]["id"] == user_info["id"]
     assert dict_response["user"]["email"] == user_info["email"]
+
+
+@mark.asyncio
+async def test_create_reset_password_link(
+    driver_config_client: TestClient,
+):
+    init(
+        supertokens_config=SupertokensConfig("http://localhost:3567"),
+        app_info=InputAppInfo(
+            app_name="SuperTokens Demo",
+            api_domain="http://api.supertokens.io",
+            website_domain="http://supertokens.io",
+            api_base_path="/auth",
+        ),
+        framework="fastapi",
+        recipe_list=[
+            emailpassword.init(),
+            session.init(get_token_transfer_method=lambda _, __, ___: "cookie"),
+        ],
+    )
+    start_st()
+
+    response_1 = sign_up_request(
+        driver_config_client, "[email protected]", "validpass123"
+    )
+    assert response_1.status_code == 200
+    dict_response = json.loads(response_1.text)
+    user_info = dict_response["user"]
+    assert dict_response["status"] == "OK"
+    link = await create_reset_password_link("public", user_info["id"])
+    url = urlparse(link.link)  # type: ignore
+    queries = url.query.strip("&").split("&")
+    assert url.path == "/auth/reset-password"
+    assert "tenantId=public" in queries
+    assert "rid=emailpassword" in queries
+
+    link = await create_reset_password_link("public", "invalidUserId")
+    assert isinstance(link, CreateResetPasswordLinkUnknownUserIdError)
+
+    with raises(GeneralError) as err:
+        await create_reset_password_link("invalidTenantId", user_info["id"])
+    assert "status code: 400" in str(err.value)

tests/thirdpartyemailpassword/test_email_delivery.py

@@ -20,9 +20,11 @@
 from fastapi import FastAPI
 from fastapi.requests import Request
 from fastapi.testclient import TestClient
-from pytest import fixture, mark
+from pytest import fixture, mark, raises
+from urllib.parse import urlparse
 
 from supertokens_python import InputAppInfo, SupertokensConfig, init
+from supertokens_python.exceptions import GeneralError
 from supertokens_python.framework.fastapi import get_middleware
 from supertokens_python.ingredients.emaildelivery import EmailDeliveryInterface
 from supertokens_python.ingredients.emaildelivery.types import (
@@ -37,6 +39,15 @@
     session,
     thirdpartyemailpassword,
 )
+from supertokens_python.recipe.thirdpartyemailpassword.asyncio import (
+    create_reset_password_link,
+    send_reset_password_email,
+)
+from supertokens_python.recipe.thirdpartyemailpassword.interfaces import (
+    CreateResetPasswordLinkUnknownUserIdError,
+    SendResetPasswordEmailEmailOkResult,
+    SendResetPasswordEmailUnknownUserIdError,
+)
 from supertokens_python.recipe.emailverification.emaildelivery.services import (
     SMTPService as EVSMTPService,
 )
@@ -1036,3 +1047,83 @@ async def send_email(
 
     assert email == "[email protected]"
     assert email_verify_url != ""
+
+
+@mark.asyncio
+async def test_create_reset_password_link(
+    driver_config_client: TestClient,
+):
+    init(
+        supertokens_config=SupertokensConfig("http://localhost:3567"),
+        app_info=InputAppInfo(
+            app_name="SuperTokens Demo",
+            api_domain="http://api.supertokens.io",
+            website_domain="http://supertokens.io",
+            api_base_path="/auth",
+        ),
+        framework="fastapi",
+        recipe_list=[
+            thirdpartyemailpassword.init(),
+            session.init(get_token_transfer_method=lambda _, __, ___: "cookie"),
+        ],
+    )
+    start_st()
+
+    response_1 = sign_up_request(
+        driver_config_client, "[email protected]", "validpass123"
+    )
+    assert response_1.status_code == 200
+    dict_response = json.loads(response_1.text)
+    user_info = dict_response["user"]
+    assert dict_response["status"] == "OK"
+    link = await create_reset_password_link("public", user_info["id"])
+    url = urlparse(link.link)  # type: ignore
+    queries = url.query.strip("&").split("&")
+    assert url.path == "/auth/reset-password"
+    assert "tenantId=public" in queries
+    assert "rid=thirdpartyemailpassword" in queries
+
+    link = await create_reset_password_link("public", "invalidUserId")
+    assert isinstance(link, CreateResetPasswordLinkUnknownUserIdError)
+
+    with raises(GeneralError) as err:
+        await create_reset_password_link("invalidTenantId", user_info["id"])
+    assert "status code: 400" in str(err.value)
+
+
+@mark.asyncio
+async def test_send_reset_password_email(
+    driver_config_client: TestClient,
+):
+    init(
+        supertokens_config=SupertokensConfig("http://localhost:3567"),
+        app_info=InputAppInfo(
+            app_name="SuperTokens Demo",
+            api_domain="http://api.supertokens.io",
+            website_domain="http://supertokens.io",
+            api_base_path="/auth",
+        ),
+        framework="fastapi",
+        recipe_list=[
+            thirdpartyemailpassword.init(),
+            session.init(get_token_transfer_method=lambda _, __, ___: "cookie"),
+        ],
+    )
+    start_st()
+
+    response_1 = sign_up_request(
+        driver_config_client, "[email protected]", "validpass123"
+    )
+    assert response_1.status_code == 200
+    dict_response = json.loads(response_1.text)
+    user_info = dict_response["user"]
+    assert dict_response["status"] == "OK"
+    resp = await send_reset_password_email("public", user_info["id"])
+    assert isinstance(resp, SendResetPasswordEmailEmailOkResult)
+
+    link = await send_reset_password_email("public", "invalidUserId")
+    assert isinstance(link, SendResetPasswordEmailUnknownUserIdError)
+
+    with raises(GeneralError) as err:
+        await send_reset_password_email("invalidTenantId", user_info["id"])
+    assert "status code: 400" in str(err.value)