From 4ee49f355068ce88a4ac4ecf4995c015f3c517bf Mon Sep 17 00:00:00 2001 From: ZalterCitty Date: Mon, 8 Sep 2025 10:44:36 +0800 Subject: [PATCH] chore: remove weird account login (#22247) Co-authored-by: zhuqingchao Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com> --- .gitignore | 1 + api/controllers/service_api/wraps.py | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 03ff04d823..bc354e639e 100644 --- a/.gitignore +++ b/.gitignore @@ -198,6 +198,7 @@ sdks/python-client/dify_client.egg-info !.vscode/launch.json.template !.vscode/README.md api/.vscode +web/.vscode # vscode Code History Extension .history diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py index 4d71e58396..2df00d9fc7 100644 --- a/api/controllers/service_api/wraps.py +++ b/api/controllers/service_api/wraps.py @@ -63,27 +63,6 @@ def validate_app_token(view: Optional[Callable] = None, *, fetch_user_arg: Optio if tenant.status == TenantStatus.ARCHIVE: raise Forbidden("The workspace's status is archived.") - tenant_account_join = ( - db.session.query(Tenant, TenantAccountJoin) - .where(Tenant.id == api_token.tenant_id) - .where(TenantAccountJoin.tenant_id == Tenant.id) - .where(TenantAccountJoin.role.in_(["owner"])) - .where(Tenant.status == TenantStatus.NORMAL) - .one_or_none() - ) # TODO: only owner information is required, so only one is returned. - if tenant_account_join: - tenant, ta = tenant_account_join - account = db.session.query(Account).where(Account.id == ta.account_id).first() - # Login admin - if account: - account.current_tenant = tenant - current_app.login_manager._update_request_context_with_user(account) # type: ignore - user_logged_in.send(current_app._get_current_object(), user=_get_user()) # type: ignore - else: - raise Unauthorized("Tenant owner account does not exist.") - else: - raise Unauthorized("Tenant does not exist.") - kwargs["app_model"] = app_model if fetch_user_arg: