implement email auth

api/controllers/service_api_with_auth/auth/login.py

@@ -1,9 +1,7 @@
 from typing import cast
 
 import flask_login  # type: ignore
-from flask import request
+from configs.deploy import DeploymentConfig
-from flask_restful import Resource, reqparse  # type: ignore
-
 from constants.languages import languages
 from controllers.service_api_with_auth import api
 from controllers.service_api_with_auth.auth.error import (
@@ -16,8 +14,10 @@ from controllers.service_api_with_auth.error import (
     AccountNotFound,
     EmailSendIpLimitError,
     NotAllowedCreateWorkspace,
+    TenantNotFoundError,
 )
-from events.tenant_event import tenant_was_created
+from flask import request
+from flask_restful import Resource, reqparse  # type: ignore
 from libs.helper import email, extract_remote_ip
 from models.account import Account
 from services.account_service import AccountService, TenantService
@@ -117,11 +117,15 @@ class EmailCodeLoginSendEmailApi(Resource):
 
         if account is None:
             if FeatureService.get_system_features().is_allow_register:
-                token = AccountService.send_email_code_login_email(email=args["email"], language=language)
+                token = AccountService.send_email_code_login_email(
+                    email=args["email"], language=language
+                )
             else:
                 raise AccountNotFound()
         else:
-            token = AccountService.send_email_code_login_email(account=account, language=language)
+            token = AccountService.send_email_code_login_email(
+                account=account, language=language
+            )
 
         return {"result": "success", "data": token}
 
@@ -170,13 +174,28 @@ class EmailCodeLoginApi(Resource):
             description: Invalid token, email or code
         """
         parser = reqparse.RequestParser()
+        # TODO: ytqh add a new field for different tenant (default: Saier)
+        parser.add_argument("tenant_id", type=str, required=False, location="json")
         parser.add_argument("email", type=str, required=True, location="json")
         parser.add_argument("code", type=str, required=True, location="json")
         parser.add_argument("token", type=str, required=True, location="json")
         args = parser.parse_args()
 
         user_email = args["email"]
+        tenant_id = args["tenant_id"]
 
+        # Skip token validation if in debug mode is True
+        # WARNING: This is for development purposes only and should never be enabled in production
+        if DeploymentConfig().DEBUG:
+            import logging
+
+            logger = logging.getLogger(__name__)
+            logger.warning(
+                f"⚠️ DEBUG MODE: Token validation bypassed for email: {user_email}"
+            )
+
+            tenant_id = "5cd3029e-7f92-428a-a5c8-14a790c70233"  # TODO: ytqh move this to the config
+        else:
             token_data = AccountService.get_email_code_login_data(args["token"])
             if token_data is None:
                 raise InvalidTokenError()
@@ -188,31 +207,34 @@ class EmailCodeLoginApi(Resource):
                 raise EmailCodeError()
 
             AccountService.revoke_email_code_login_token(args["token"])
+
         try:
             account = AccountService.get_user_through_email(user_email)
+            tenant = TenantService.get_tenant_by_id(tenant_id)
         except AccountRegisterError as are:
             raise AccountInFreezeError()
-        if account:
+
-            tenant = TenantService.get_join_tenants(account)
+        if tenant is None:
-            if not tenant:
+            raise TenantNotFoundError()
-                if not FeatureService.get_system_features().is_allow_create_workspace:
-                    raise NotAllowedCreateWorkspace()
-                else:
-                    tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
-                    TenantService.create_tenant_member(tenant, account, role="owner")
-                    account.current_tenant = tenant
-                    tenant_was_created.send(tenant)
 
         if account is None:
             try:
-                account = AccountService.create_account_and_tenant(
+                account = AccountService.create_account_in_tenant(
-                    email=user_email, name=user_email, interface_language=languages[0]
+                    tenant=tenant,
+                    email=user_email,
+                    name=user_email,
+                    interface_language=languages[0],
                 )
-            except WorkSpaceNotAllowedCreateError:
-                return NotAllowedCreateWorkspace()
             except AccountRegisterError as are:
                 raise AccountInFreezeError()
-        token_pair = AccountService.login(account, ip_address=extract_remote_ip(request))
+        else:
+            connected_tenant = TenantService.get_join_tenants(account)
+            if connected_tenant is None:
+                TenantService.create_tenant_member(tenant, account, role="end_user")
+
+        token_pair = AccountService.login(
+            account, ip_address=extract_remote_ip(request)
+        )
         AccountService.reset_login_error_rate_limit(args["email"])
         return {"result": "success", "data": token_pair.model_dump()}
 

api/controllers/service_api_with_auth/error.py

@@ -101,3 +101,8 @@ class AccountInFreezeError(BaseHTTPException):
         "This email account has been deleted within the past 30 days"
         "and is temporarily unavailable for new account registration."
     )
+
+class TenantNotFoundError(BaseHTTPException):
+    error_code = "tenant_not_found"
+    description = "Tenant not found."
+    code = 400

api/models/account.py

@@ -210,6 +210,8 @@ class TenantAccountJoinRole(enum.Enum):
     ADMIN = "admin"
     NORMAL = "normal"
     DATASET_OPERATOR = "dataset_operator"
+    END_USER = "end_user"
+    END_ADMIN = "end_admin"
 
 
 class TenantAccountJoin(db.Model):  # type: ignore[name-defined]

api/services/account_service.py

@@ -242,6 +242,17 @@ class AccountService:
         db.session.commit()
         return account
 
+    @staticmethod
+    def create_account_in_tenant(
+        tenant: Tenant, email: str, name: str, interface_language: str, password: Optional[str] = None
+    ) -> Account:
+        """create account"""
+        account = AccountService.create_account(
+            email=email, name=name, interface_language=interface_language, password=password
+        )
+        TenantService.create_tenant_member(tenant, account, role="end_user")
+        return account
+
     @staticmethod
     def create_account_and_tenant(
         email: str, name: str, interface_language: str, password: Optional[str] = None
@@ -549,6 +560,11 @@ def _get_login_cache_key(*, account_id: str, token: str):
 
 
 class TenantService:
+
+    @staticmethod
+    def get_tenant_by_id(tenant_id: str) -> Tenant:
+        return Tenant.query.filter_by(id=tenant_id).first()
+    
     @staticmethod
     def create_tenant(name: str, is_setup: Optional[bool] = False, is_from_dashboard: Optional[bool] = False) -> Tenant:
         """Create tenant"""