diff --git a/api/controllers/console/workspace/members.py b/api/controllers/console/workspace/members.py index 9574945ffd..3b91dea845 100644 --- a/api/controllers/console/workspace/members.py +++ b/api/controllers/console/workspace/members.py @@ -175,7 +175,7 @@ class SendOwnerTransferEmailApi(Resource): @login_required @account_initialization_required @is_allow_transfer_owner - def post(self, member_id): + def post(self): parser = reqparse.RequestParser() parser.add_argument("language", type=str, required=False, location="json") args = parser.parse_args() @@ -187,9 +187,6 @@ class SendOwnerTransferEmailApi(Resource): if not TenantService.is_owner(current_user, current_user.current_tenant): raise NotOwnerError() - if current_user.id == str(member_id): - raise CannotTransferOwnerToSelfError() - if args["language"] is not None and args["language"] == "zh-Hans": language = "zh-Hans" else: @@ -324,7 +321,7 @@ api.add_resource(MemberUpdateRoleApi, "/workspaces/current/members//send-owner-transfer-confirm-email" + SendOwnerTransferEmailApi, "/workspaces/current/members/send-owner-transfer-confirm-email" ) api.add_resource(OwnerTransferCheckApi, "/workspaces/current/members/owner-transfer-check") api.add_resource(OwnerTransfer, "/workspaces/current/members//owner-transfer") diff --git a/api/services/account_service.py b/api/services/account_service.py index 2d540ea5b4..4d5366f47f 100644 --- a/api/services/account_service.py +++ b/api/services/account_service.py @@ -466,7 +466,6 @@ class AccountService: email: Optional[str] = None, language: Optional[str] = "en-US", workspace_name: Optional[str] = "", - member_name: Optional[str] = "", ): account_email = account.email if account else email if account_email is None: @@ -484,7 +483,6 @@ class AccountService: to=account_email, code=code, workspace=workspace_name, - member=member_name, ) cls.owner_transfer_rate_limiter.increment_rate_limit(account_email) return token diff --git a/api/tasks/mail_owner_transfer_task.py b/api/tasks/mail_owner_transfer_task.py index d0642c916f..8d05c6dc0f 100644 --- a/api/tasks/mail_owner_transfer_task.py +++ b/api/tasks/mail_owner_transfer_task.py @@ -10,13 +10,12 @@ from services.feature_service import FeatureService @shared_task(queue="mail") -def send_owner_transfer_confirm_task(language: str, to: str, code: str, workspace: str, member: str): +def send_owner_transfer_confirm_task(language: str, to: str, code: str, workspace: str): """ Async Send owner transfer confirm mail :param language: Language in which the email should be sent (e.g., 'en', 'zh') :param to: Recipient email address :param workspace: Workspace name - :param member: Member name """ if not mail.is_inited(): return @@ -30,20 +29,20 @@ def send_owner_transfer_confirm_task(language: str, to: str, code: str, workspac system_features = FeatureService.get_system_features() if system_features.branding.enabled: template = "without-brand/transfer_workspace_owner_confirm_template_zh-CN.html" - html_content = render_template(template, to=to, code=code, WorkspaceName=workspace, NewOwner=member) + html_content = render_template(template, to=to, code=code, WorkspaceName=workspace) mail.send(to=to, subject="验证您转移工作空间所有权的请求", html=html_content) else: - html_content = render_template(template, to=to, code=code, WorkspaceName=workspace, NewOwner=member) + html_content = render_template(template, to=to, code=code, WorkspaceName=workspace) mail.send(to=to, subject="验证您转移工作空间所有权的请求", html=html_content) else: template = "transfer_workspace_owner_confirm_template_en-US.html" system_features = FeatureService.get_system_features() if system_features.branding.enabled: template = "without-brand/transfer_workspace_owner_confirm_template_en-US.html" - html_content = render_template(template, to=to, code=code, WorkspaceName=workspace, NewOwner=member) + html_content = render_template(template, to=to, code=code, WorkspaceName=workspace) mail.send(to=to, subject="Verify Your Request to Transfer Workspace Ownership", html=html_content) else: - html_content = render_template(template, to=to, code=code, WorkspaceName=workspace, NewOwner=member) + html_content = render_template(template, to=to, code=code, WorkspaceName=workspace) mail.send(to=to, subject="Verify Your Request to Transfer Workspace Ownership", html=html_content) end_at = time.perf_counter() diff --git a/api/templates/transfer_workspace_owner_confirm_template_en-US.html b/api/templates/transfer_workspace_owner_confirm_template_en-US.html index 6aadae8aef..46538325d4 100644 --- a/api/templates/transfer_workspace_owner_confirm_template_en-US.html +++ b/api/templates/transfer_workspace_owner_confirm_template_en-US.html @@ -74,8 +74,7 @@ Dify Logo

Verify Your Request to Transfer Workspace Ownership

-

We received a request to transfer ownership of your workspace “{{WorkspaceName}}” to the - member {{NewOwner}}. +

We received a request to transfer ownership of your workspace “{{WorkspaceName}}”. To confirm this action, please use the verification code below. This code will only be valid for the next 5 minutes:

diff --git a/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html b/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html index c8a519fe1e..942667daea 100644 --- a/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html +++ b/api/templates/transfer_workspace_owner_confirm_template_zh-CN.html @@ -74,7 +74,7 @@ Dify Logo

验证您的工作空间所有权转移请求

-

我们收到了将您的工作空间“{{WorkspaceName}}”的所有权转移给成员{{NewOwner}}的请求。 +

我们收到了将您的工作空间“{{WorkspaceName}}”的所有权转移的请求。 为了确认此操作,请使用以下验证码。 此验证码仅在5分钟内有效:

diff --git a/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html b/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html index 013739284f..cd8762e4f7 100644 --- a/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html +++ b/api/templates/without-brand/transfer_workspace_owner_confirm_template_en-US.html @@ -70,8 +70,7 @@

Verify Your Request to Transfer Workspace Ownership

-

We received a request to transfer ownership of your workspace “{{WorkspaceName}}” to the - member {{NewOwner}}. +

We received a request to transfer ownership of your workspace “{{WorkspaceName}}”. To confirm this action, please use the verification code below. This code will only be valid for the next 5 minutes:

diff --git a/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html b/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html index 5831c1d742..fbcb600083 100644 --- a/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html +++ b/api/templates/without-brand/transfer_workspace_owner_confirm_template_zh-CN.html @@ -70,7 +70,7 @@

验证您的工作空间所有权转移请求

-

我们收到了将您的工作空间“{{WorkspaceName}}”的所有权转移给成员{{NewOwner}}的请求。 +

我们收到了将您的工作空间“{{WorkspaceName}}”的所有权转移的请求。 为了确认此操作,请使用以下验证码。 此验证码仅在5分钟内有效: