youngkingdom/dify
1
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-04-30 23:48:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: update register logic

Browse Source
This commit is contained in:
Joe
2024-08-29 15:15:48 +08:00
parent ccc0ec8178
commit da684ebfaa
4 changed files with 89 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,9 +35,3 @@ class EmailLoginCodeError(BaseHTTPException):
error_code = "email_login_code_error"
description = "Email login code is invalid or expired."
code = 400
class NotAllowCreateWorkspaceError(BaseHTTPException):
error_code = "workspace_not_found"
description = "Workspace not found."
code = 400

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

@ -12,7 +12,6 @@ from controllers.console.auth.error import (
EmailLoginCodeError,
InvalidEmailError,
InvalidTokenError,
NotAllowCreateWorkspaceError,
)
from controllers.console.setup import setup_required
from libs.helper import email, get_remote_ip
@ -33,8 +32,6 @@ class LoginApi(Resource):
parser.add_argument("remember_me", type=bool, required=False, default=False, location="json")
args = parser.parse_args()
# todo: Verify the recaptcha
try:
account = AccountService.authenticate(args["email"], args["password"])
except services.errors.account.AccountLoginError as e:
@ -63,12 +60,31 @@ class LogoutApi(Resource):
return {"result": "success"}
class ResetPasswordSendEmailApi(Resource):
@setup_required
def post(self):
parser = reqparse.RequestParser()
parser.add_argument("email", type=email, required=True, location="json")
args = parser.parse_args()
account = AccountService.get_user_through_email(args["email"])
if account is None:
if dify_config.ALLOW_REGISTER:
token = AccountService.send_reset_password_email(email=args["email"])
else:
raise InvalidEmailError()
else:
token = AccountService.send_reset_password_email(account=account)
return {"result": "success", "data": token}
class ResetPasswordApi(Resource):
@setup_required
def get(self):
# parser = reqparse.RequestParser()
# parser.add_argument('email', type=email, required=True, location='json')
# args = parser.parse_args()
parser = reqparse.RequestParser()
parser.add_argument("email", type=email, required=True, location="json")
args = parser.parse_args()
# import mailchimp_transactional as MailchimpTransactional
# from mailchimp_transactional.api_client import ApiClientError
@ -123,9 +139,13 @@ class EmailCodeLoginSendEmailApi(Resource):
account = AccountService.get_user_through_email(args["email"])
if account is None:
raise InvalidEmailError()
if dify_config.ALLOW_REGISTER:
token = AccountService.send_email_code_login_email(email=args["email"])
else:
raise InvalidEmailError()
else:
token = AccountService.send_email_code_login_email(account=account)
token = AccountService.send_email_code_login_email(account)
return {"result": "success", "data": token}
@ -153,25 +173,17 @@ class EmailCodeLoginApi(Resource):
AccountService.revoke_email_code_login_token(args["token"])
account = AccountService.get_user_through_email(user_email)
if account is None:
# through environment variable, control whether to allow user to register and create workspace
if dify_config.ALLOW_REGISTER:
account = AccountService.create_account(
email=user_email, name=user_email, interface_language=languages[0]
)
else:
raise InvalidEmailError()
if dify_config.ALLOW_CREATE_WORKSPACE:
TenantService.create_owner_tenant_if_not_exist(account=account)
else:
raise NotAllowCreateWorkspaceError()
account = AccountService.create_user_through_env(
email=user_email, name=user_email, interface_language=languages[0]
)
else:
token = AccountService.login(account, ip_address=get_remote_ip(request))
token = AccountService.login(account, ip_address=get_remote_ip(request))
return {"result": "success", "data": token}
return {"result": "success", "data": token}
api.add_resource(LoginApi, "/login")
api.add_resource(LogoutApi, "/logout")
api.add_resource(EmailCodeLoginSendEmailApi, "/email-code-login")
api.add_resource(EmailCodeLoginApi, "/email-code-login/validity")
api.add_resource(ResetPasswordApi, "/reset-password")