outman/dify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add self host user auto join

Browse Source
This commit is contained in:
Joe 2024-09-27 14:44:34 +08:00
parent 9a6918069d
commit 161d725350
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/services/account_service.py
View File

@ -181,6 +181,12 @@ class AccountService:
# SELF_HOSTED Just create account, not create tenant # SELF_HOSTED Just create account, not create tenant
if dify_config.EDITION != "SELF_HOSTED": if dify_config.EDITION != "SELF_HOSTED":
TenantService.create_owner_tenant_if_not_exist(account=account) 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 return account
@ -668,13 +674,17 @@ class RegisterService:
if dify_config.EDITION != "SELF_HOSTED": if dify_config.EDITION != "SELF_HOSTED":
if not dify_config.ALLOW_CREATE_WORKSPACE: if not dify_config.ALLOW_CREATE_WORKSPACE:
raise WorkSpaceNotAllowedCreateError() raise WorkSpaceNotAllowedCreateError()
tenant = TenantService.create_tenant(f"{account.name}'s Workspace") tenant = TenantService.create_tenant(f"{account.name}'s Workspace")
TenantService.create_tenant_member(tenant, account, role="owner") TenantService.create_tenant_member(tenant, account, role="owner")
account.current_tenant = tenant account.current_tenant = tenant
tenant_was_created.send(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: except WorkSpaceNotAllowedCreateError:
db.session.rollback() db.session.rollback()
raise raise