feat: Add session claims feature

.github/workflows/tests.yml

@@ -51,5 +51,10 @@ jobs:
               run: cd ../supertokens-root && ./loadModules
             - name: Setting up supertokens-root test environment
               run: cd ../supertokens-root && bash ./utils/setupTestEnvLocal
+            - name: Debugging with tmate
+              if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled }}
+              uses: mxschmitt/[email protected]
+              with:
+                sudo: false
             - name: Run tests
-              run: make test
+              run: make test

dev-requirements.txt

@@ -82,3 +82,4 @@ uvicorn==0.18.2
 Werkzeug==2.0.3
 wrapt==1.13.3
 zipp==3.7.0
+pytest-mock==3.8.2

supertokens_python/post_init_callbacks.py

@@ -0,0 +1,18 @@
+from typing import Callable, List
+
+
+class PostSTInitCallbacks:
+    """Callbacks that are called after the SuperTokens instance is initialized."""
+
+    callbacks: List[Callable[[], None]] = []
+
+    @staticmethod
+    def add_post_init_callback(cb: Callable[[], None]) -> None:
+        PostSTInitCallbacks.callbacks.append(cb)
+
+    @staticmethod
+    def run_post_init_callbacks() -> None:
+        for cb in PostSTInitCallbacks.callbacks:
+            cb()
+
+        PostSTInitCallbacks.callbacks = []

supertokens_python/recipe/emailpassword/__init__.py

@@ -26,7 +26,6 @@
 exceptions = ex
 InputOverrideConfig = utils.InputOverrideConfig
 InputResetPasswordUsingTokenFeature = utils.InputResetPasswordUsingTokenFeature
-InputEmailVerificationConfig = utils.InputEmailVerificationConfig
 InputSignUpFeature = utils.InputSignUpFeature
 InputFormField = utils.InputFormField
 SMTPService = emaildelivery_services.SMTPService
@@ -42,14 +41,12 @@ def init(
     reset_password_using_token_feature: Union[
         utils.InputResetPasswordUsingTokenFeature, None
     ] = None,
-    email_verification_feature: Union[utils.InputEmailVerificationConfig, None] = None,
     override: Union[utils.InputOverrideConfig, None] = None,
     email_delivery: Union[EmailDeliveryConfig[EmailTemplateVars], None] = None,
 ) -> Callable[[AppInfo], RecipeModule]:
     return EmailPasswordRecipe.init(
         sign_up_feature,
         reset_password_using_token_feature,
-        email_verification_feature,
         override,
         email_delivery,
     )

supertokens_python/recipe/emailpassword/api/implementation.py

@@ -92,10 +92,9 @@ async def generate_password_reset_token_post(
 
         token = token_result.token
         password_reset_link = (
-            await api_options.config.reset_password_using_token_feature.get_reset_password_url(
-                user, user_context
-            )
-            + "?token="
+            api_options.app_info.website_domain.get_as_string_dangerous()
+            + api_options.app_info.website_base_path.get_as_string_dangerous()
+            + "/reset-password?token="
             + token
             + "&rid="
             + api_options.recipe_id

supertokens_python/recipe/emailpassword/asyncio/__init__.py

@@ -18,55 +18,6 @@
 from ..types import EmailTemplateVars, User
 
 
-async def create_email_verification_token(
-    user_id: str, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    email = await EmailPasswordRecipe.get_instance().get_email_for_user_id(
-        user_id, user_context
-    )
-    return await EmailPasswordRecipe.get_instance().email_verification_recipe.recipe_implementation.create_email_verification_token(
-        user_id, email, user_context
-    )
-
-
-async def verify_email_using_token(
-    token: str, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    return await EmailPasswordRecipe.get_instance().email_verification_recipe.recipe_implementation.verify_email_using_token(
-        token, user_context
-    )
-
-
-async def unverify_email(
-    user_id: str, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    email = await EmailPasswordRecipe.get_instance().get_email_for_user_id(
-        user_id, user_context
-    )
-    return await EmailPasswordRecipe.get_instance().email_verification_recipe.recipe_implementation.unverify_email(
-        user_id, email, user_context
-    )
-
-
-async def is_email_verified(
-    user_id: str, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    email = await EmailPasswordRecipe.get_instance().get_email_for_user_id(
-        user_id, user_context
-    )
-    return await EmailPasswordRecipe.get_instance().email_verification_recipe.recipe_implementation.is_email_verified(
-        user_id, email, user_context
-    )
-
-
 async def update_email_or_password(
     user_id: str,
     email: Union[str, None] = None,
@@ -142,19 +93,6 @@ async def sign_up(
     )
 
 
-async def revoke_email_verification_token(
-    user_id: str, user_context: Union[None, Dict[str, Any]] = None
-):
-    if user_context is None:
-        user_context = {}
-    email = await EmailPasswordRecipe.get_instance().get_email_for_user_id(
-        user_id, user_context
-    )
-    return await EmailPasswordRecipe.get_instance().email_verification_recipe.recipe_implementation.revoke_email_verification_tokens(
-        user_id, email, user_context
-    )
-
-
 async def send_email(
     input_: EmailTemplateVars, user_context: Union[None, Dict[str, Any]] = None
 ):

supertokens_python/recipe/emailpassword/emaildelivery/services/backward_compatibility/__init__.py

@@ -25,20 +25,12 @@
 )
 from supertokens_python.recipe.emailpassword.types import (
     User,
-    VerificationEmailTemplateVars,
-)
-from supertokens_python.recipe.emailverification.emaildelivery.services.backward_compatibility import (
-    BackwardCompatibilityService as EmailVerificationBackwardCompatibilityService,
-)
-from supertokens_python.recipe.emailverification.types import (
-    User as EmailVerificationUser,
 )
 from supertokens_python.supertokens import AppInfo
 from supertokens_python.utils import handle_httpx_client_exceptions
 
 if TYPE_CHECKING:
     from supertokens_python.recipe.emailpassword.utils import (
-        InputEmailVerificationConfig,
         InputResetPasswordUsingTokenFeature,
     )
 
@@ -68,7 +60,6 @@ async def func(user: User, password_reset_url_with_token: str, _: Dict[str, Any]
 
 class BackwardCompatibilityService(EmailDeliveryInterface[EmailTemplateVars]):
     app_info: AppInfo
-    ev_backward_compatibility_service: EmailVerificationBackwardCompatibilityService
 
     def __init__(
         self,
@@ -77,7 +68,6 @@ def __init__(
         reset_password_using_token_feature: Union[
             InputResetPasswordUsingTokenFeature, None
         ] = None,
-        email_verification_feature: Union[InputEmailVerificationConfig, None] = None,
     ) -> None:
         self.recipe_interface_impl = recipe_interface_impl
 
@@ -97,55 +87,18 @@ def __init__(
             reset_password_feature_send_email_func
         )
 
-        create_and_send_custom_email: Union[
-            Callable[[EmailVerificationUser, str, Dict[str, Any]], Awaitable[None]],
-            None,
-        ] = None
-        if email_verification_feature:
-            if email_verification_feature.create_and_send_custom_email is not None:
-                ev_create_and_send_custom_email = (
-                    email_verification_feature.create_and_send_custom_email
-                )
-
-                async def create_and_send_custom_email_wrapper(
-                    user: EmailVerificationUser, link: str, user_context: Dict[str, Any]
-                ):
-                    user_info = await recipe_interface_impl.get_user_by_id(
-                        user.user_id, user_context
-                    )
-                    if user_info is None:
-                        raise Exception("Unknown User ID provided")
-
-                    return await ev_create_and_send_custom_email(
-                        user_info, link, user_context
-                    )
-
-                create_and_send_custom_email = create_and_send_custom_email_wrapper
-
-        self.ev_backward_compatibility_service = (
-            EmailVerificationBackwardCompatibilityService(
-                app_info, create_and_send_custom_email=create_and_send_custom_email
-            )
-        )
-
     async def send_email(
         self, template_vars: EmailTemplateVars, user_context: Dict[str, Any]
     ) -> None:
-        if isinstance(template_vars, VerificationEmailTemplateVars):
-            await self.ev_backward_compatibility_service.send_email(
-                template_vars, user_context
-            )
-        else:
-            user = await self.recipe_interface_impl.get_user_by_id(
-                user_id=template_vars.user.id, user_context=user_context
-            )
-
-            if user is None:
-                raise Exception("Should never come here")
+        user = await self.recipe_interface_impl.get_user_by_id(
+            user_id=template_vars.user.id, user_context=user_context
+        )
+        if user is None:
+            raise Exception("Should never come here")
 
-            try:
-                await self.reset_password_feature_send_email_func(
-                    user, template_vars.password_reset_link, user_context
-                )
-            except Exception:
-                pass
+        try:
+            await self.reset_password_feature_send_email_func(
+                user, template_vars.password_reset_link, user_context
+            )
+        except Exception:
+            pass

supertokens_python/recipe/emailpassword/emaildelivery/services/smtp/__init__.py

@@ -24,17 +24,8 @@
     EmailTemplateVars,
     SMTPOverrideInput,
 )
-from supertokens_python.recipe.emailverification.emaildelivery.services.smtp import (
-    SMTPService as EmailVerificationSMTPService,
-)
-from supertokens_python.recipe.emailverification.types import (
-    VerificationEmailTemplateVars,
-)
 
 from .service_implementation import ServiceImplementation
-from .service_implementation.email_verification_implementation import (
-    ServiceImplementation as EmailVerificationServiceImpl,
-)
 
 
 class SMTPService(EmailDeliveryInterface[EmailTemplateVars]):
@@ -50,21 +41,9 @@ def __init__(
         oi = ServiceImplementation(transporter)
         self.service_implementation = oi if override is None else override(oi)
 
-        self.email_verification_smtp_service = EmailVerificationSMTPService(
-            smtp_settings=smtp_settings,
-            override=lambda _: EmailVerificationServiceImpl(
-                self.service_implementation
-            ),
-        )
-
     async def send_email(
         self, template_vars: EmailTemplateVars, user_context: Dict[str, Any]
     ) -> None:
-        if isinstance(template_vars, VerificationEmailTemplateVars):
-            return await self.email_verification_smtp_service.send_email(
-                template_vars, user_context
-            )
-
         content = await self.service_implementation.get_content(
             template_vars, user_context
         )

supertokens_python/recipe/emailpassword/emaildelivery/services/smtp/service_implementation/__init__.py

@@ -26,13 +26,6 @@
 from supertokens_python.recipe.emailverification.emaildelivery.services.smtp.service_implementation import (
     ServiceImplementation as EVServiceImplementation,
 )
-from supertokens_python.recipe.emailverification.types import (
-    VerificationEmailTemplateVars,
-)
-
-from .email_verification_implementation import (
-    ServiceImplementation as DerivedEVServiceImplementation,
-)
 
 
 class ServiceImplementation(SMTPServiceInterface[EmailTemplateVars]):
@@ -45,14 +38,6 @@ def __init__(self, transporter: Transporter) -> None:
         )
         self.ev_get_content = email_verification_service_implementation.get_content
 
-        derived_ev_service_implementation = DerivedEVServiceImplementation(self)
-        email_verification_service_implementation.send_raw_email = (
-            derived_ev_service_implementation.send_raw_email
-        )
-        email_verification_service_implementation.get_content = (
-            derived_ev_service_implementation.get_content
-        )
-
     async def send_raw_email(
         self, content: EmailContent, user_context: Dict[str, Any]
     ) -> None:
@@ -61,6 +46,4 @@ async def send_raw_email(
     async def get_content(
         self, template_vars: EmailTemplateVars, user_context: Dict[str, Any]
     ) -> EmailContent:
-        if isinstance(template_vars, VerificationEmailTemplateVars):
-            return await self.ev_get_content(template_vars, user_context)
         return get_password_reset_email_content(template_vars)