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

feat: add NotAllowedCreateWorkspace

Browse Source
This commit is contained in:
Joe 2024-09-10 11:51:40 +08:00
parent 4d1efbef62
commit ca5b29438b
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/controllers/console/auth/forgot_password.py
View File

@ -2,7 +2,7 @@ import base64
import logging import logging
import secrets import secrets
from flask import redirect, request from flask import request
from flask_restful import Resource, reqparse from flask_restful import Resource, reqparse
from configs import dify_config from configs import dify_config
@ -15,7 +15,7 @@ from controllers.console.auth.error import (
PasswordMismatchError, PasswordMismatchError,
PasswordResetRateLimitExceededError, PasswordResetRateLimitExceededError,
) )
from controllers.console.error import NotAllowedRegister from controllers.console.error import NotAllowedCreateWorkspace, NotAllowedRegister
from controllers.console.setup import setup_required from controllers.console.setup import setup_required
from events.tenant_event import tenant_was_created from events.tenant_event import tenant_was_created
from extensions.ext_database import db from extensions.ext_database import db
@ -111,9 +111,7 @@ class ForgotPasswordResetApi(Resource):
tenant = TenantService.get_join_tenants(account) tenant = TenantService.get_join_tenants(account)
if not tenant: if not tenant:
if not dify_config.ALLOW_CREATE_WORKSPACE: if not dify_config.ALLOW_CREATE_WORKSPACE:
return redirect( return NotAllowedCreateWorkspace()
f"{dify_config.CONSOLE_WEB_URL}/signin?message=Workspace not found, please contact system admin to invite you to join in a workspace."
)
else: else:
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")

6
api/controllers/console/auth/login.py
View File

@ -14,7 +14,7 @@ from controllers.console.auth.error import (
InvalidTokenError, InvalidTokenError,
PasswordMismatchError, PasswordMismatchError,
) )
from controllers.console.error import NotAllowedRegister from controllers.console.error import NotAllowedCreateWorkspace, NotAllowedRegister
from controllers.console.setup import setup_required from controllers.console.setup import setup_required
from events.tenant_event import tenant_was_created from events.tenant_event import tenant_was_created
from libs.helper import email, get_remote_ip from libs.helper import email, get_remote_ip
@ -135,9 +135,7 @@ class EmailCodeLoginApi(Resource):
tenant = TenantService.get_join_tenants(account) tenant = TenantService.get_join_tenants(account)
if not tenant: if not tenant:
if not dify_config.ALLOW_CREATE_WORKSPACE: if not dify_config.ALLOW_CREATE_WORKSPACE:
return redirect( return NotAllowedCreateWorkspace()
f"{dify_config.CONSOLE_WEB_URL}/signin?message=Workspace not found, please contact system admin to invite you to join in a workspace."
)
else: else:
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")