From 161d7253505673eea2f88b0d7910785554954c91 Mon Sep 17 00:00:00 2001 From: Joe <1264204425@qq.com> Date: Fri, 27 Sep 2024 14:44:34 +0800 Subject: [PATCH] feat: add self host user auto join --- api/services/account_service.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/api/services/account_service.py b/api/services/account_service.py index 90051f855c..4017b74d1a 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -181,6 +181,12 @@ class AccountService: # SELF_HOSTED Just create account, not create tenant if dify_config.EDITION != "SELF_HOSTED": TenantService.create_owner_tenant_if_not_exist(account=account) + else: + # SElF_HOST just have one tenant + tenant = Tenant.query.filter_by(id=1).first() + TenantService.create_tenant_member(tenant, account, role="user") + account.current_tenant = tenant + db.session.commit() return account @@ -668,13 +674,17 @@ class RegisterService: if dify_config.EDITION != "SELF_HOSTED": if not dify_config.ALLOW_CREATE_WORKSPACE: raise WorkSpaceNotAllowedCreateError() - 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) + else: + # SELF_HOSTED just have one tenant + tenant = Tenant.query.filter_by(id=1).first() + TenantService.create_tenant_member(tenant, account, role="user") + account.current_tenant = tenant - db.session.commit() + db.session.commit() except WorkSpaceNotAllowedCreateError: db.session.rollback() raise