From ed96a6b6c0081846246c538b5a335968f9f3b0ca Mon Sep 17 00:00:00 2001 From: Joe <79627742+ZhouhaoJiang@users.noreply.github.com> Date: Wed, 23 Oct 2024 14:56:10 +0800 Subject: [PATCH] fix: remove email code login redirect (#9698) --- api/controllers/console/auth/login.py | 8 ++------ api/controllers/console/error.py | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/api/controllers/console/auth/login.py b/api/controllers/console/auth/login.py index 4821c543b7..6c795f95b6 100644 --- a/api/controllers/console/auth/login.py +++ b/api/controllers/console/auth/login.py @@ -1,11 +1,10 @@ from typing import cast import flask_login -from flask import redirect, request +from flask import request from flask_restful import Resource, reqparse import services -from configs import dify_config from constants.languages import languages from controllers.console import api from controllers.console.auth.error import ( @@ -196,10 +195,7 @@ class EmailCodeLoginApi(Resource): email=user_email, name=user_email, interface_language=languages[0] ) except WorkSpaceNotAllowedCreateError: - return redirect( - f"{dify_config.CONSOLE_WEB_URL}/signin" - "?message=Workspace not found, please contact system admin to invite you to join in a workspace." - ) + return NotAllowedCreateWorkspace() token_pair = AccountService.login(account, ip_address=extract_remote_ip(request)) AccountService.reset_login_error_rate_limit(args["email"]) return {"result": "success", "data": token_pair.model_dump()} diff --git a/api/controllers/console/error.py b/api/controllers/console/error.py index a6d4c8e8ec..ed6a99a017 100644 --- a/api/controllers/console/error.py +++ b/api/controllers/console/error.py @@ -41,7 +41,7 @@ class AlreadyActivateError(BaseHTTPException): class NotAllowedCreateWorkspace(BaseHTTPException): - error_code = "unauthorized" + error_code = "not_allowed_create_workspace" description = "Workspace not found, please contact system admin to invite you to join in a workspace." code = 400