From dc0caab45c4418e12d640f60e8958358e4c23924 Mon Sep 17 00:00:00 2001
From: Joe <1264204425@qq.com>
Date: Thu, 12 Sep 2024 10:40:44 +0800
Subject: [PATCH] fix: email code login tenant check

---
 api/controllers/console/auth/login.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py
index 052a207a71..1daaa44477 100644
--- a/api/controllers/console/auth/login.py
+++ b/api/controllers/console/auth/login.py
@@ -132,15 +132,16 @@ class EmailCodeLoginApi(Resource):
 
         AccountService.revoke_email_code_login_token(args["token"])
         account = AccountService.get_user_through_email(user_email)
-        tenant = TenantService.get_join_tenants(account)
-        if not tenant:
-            if not dify_config.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:
+            tenant = TenantService.get_join_tenants(account)
+            if not tenant:
+                if not dify_config.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: