From 0605aed0c73ca588bcd2ef51150c9d57b8d14c02 Mon Sep 17 00:00:00 2001 From: zhuqingchao Date: Fri, 11 Jul 2025 20:19:58 +0800 Subject: [PATCH] remove weird account login --- .gitignore | 1 + api/controllers/service_api/wraps.py | 21 --------------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index dd4673a3d2..8ebbaf3f52 100644 --- a/.gitignore +++ b/.gitignore @@ -197,6 +197,7 @@ sdks/python-client/dify_client.egg-info !.vscode/README.md pyrightconfig.json api/.vscode +web/.vscode .idea/ diff --git a/api/controllers/service_api/wraps.py b/api/controllers/service_api/wraps.py index 5b919a68d4..c0f579a4e8 100644 --- a/api/controllers/service_api/wraps.py +++ b/api/controllers/service_api/wraps.py @@ -59,27 +59,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) - .filter(Tenant.id == api_token.tenant_id) - .filter(TenantAccountJoin.tenant_id == Tenant.id) - .filter(TenantAccountJoin.role.in_(["owner"])) - .filter(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).filter(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: