Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

refactor(controllers/web): dep-inject login and forgot-password payloads (#36659) (#40856)

Weike Zhang45be4620fead
diff --git a/api/controllers/web/forgot_password.py b/api/controllers/web/forgot_password.py
index a9374555ed4..0be96287dec 100644
--- a/api/controllers/web/forgot_password.py
+++ b/api/controllers/web/forgot_password.py
@@ -15,7 +15,12 @@ from controllers.console.auth.error import (
PasswordMismatchError,
)
from controllers.console.error import EmailSendIpLimitError
-from controllers.console.wraps import email_password_login_enabled, only_edition_enterprise, setup_required
+from controllers.console.wraps import (
+ email_password_login_enabled,
+ model_validate,
+ only_edition_enterprise,
+ setup_required,
+)
from controllers.web import web_ns
from extensions.ext_database import db
from libs.helper import extract_remote_ip
@@ -54,9 +59,8 @@ class ForgotPasswordSendEmailApi(Resource):
}
)
@web_ns.response(200, "Password reset email sent successfully", web_ns.models[SimpleResultDataResponse.__name__])
- def post(self):
- payload = ForgotPasswordSendPayload.model_validate(web_ns.payload or {})
-
+ @model_validate(ForgotPasswordSendPayload)
+ def post(self, payload: ForgotPasswordSendPayload):
request_email = payload.email
normalized_email = request_email.lower()
@@ -90,9 +94,8 @@ class ForgotPasswordCheckApi(Resource):
responses={200: "Token is valid", 400: "Bad request - invalid token format", 401: "Invalid or expired token"}
)
@web_ns.response(200, "Token is valid", web_ns.models[VerificationTokenResponse.__name__])
- def post(self):
- payload = ForgotPasswordCheckPayload.model_validate(web_ns.payload or {})
-
+ @model_validate(ForgotPasswordCheckPayload)
+ def post(self, payload: ForgotPasswordCheckPayload):
user_email = payload.email.lower()
is_forgot_password_error_rate_limit = AccountService.is_forgot_password_error_rate_limit(user_email)
@@ -144,9 +147,8 @@ class ForgotPasswordResetApi(Resource):
}
)
@web_ns.response(200, "Password reset successfully", web_ns.models[SimpleResultResponse.__name__])
- def post(self):
- payload = ForgotPasswordResetPayload.model_validate(web_ns.payload or {})
-
+ @model_validate(ForgotPasswordResetPayload)
+ def post(self, payload: ForgotPasswordResetPayload):
# Validate passwords match
if payload.new_password != payload.password_confirm:
raise PasswordMismatchError()
diff --git a/api/controllers/web/login.py b/api/controllers/web/login.py
index b841056743d..6d99d290b0b 100644
--- a/api/controllers/web/login.py
+++ b/api/controllers/web/login.py
@@ -25,6 +25,7 @@ from controllers.console.error import AccountBannedError
from controllers.console.wraps import (
decrypt_code_field,
decrypt_password_field,
+ model_validate,
only_edition_enterprise,
setup_required,
)
@@ -100,9 +101,9 @@ class LoginApi(Resource):
)
@web_ns.response(200, "Authentication successful", web_ns.models[AccessTokenResultResponse.__name__])
@decrypt_password_field
- def post(self):
+ @model_validate(LoginPayload)
+ def post(self, payload: LoginPayload):
"""Authenticate user and login."""
- payload = LoginPayload.model_validate(web_ns.payload or {})
normalized_email = payload.email.lower()
try:
@@ -139,8 +140,8 @@ class LoginStatusApi(Resource):
}
)
@web_ns.response(200, "Login status", web_ns.models[LoginStatusResponse.__name__])
- def get(self):
- query = LoginStatusQuery.model_validate(request.args.to_dict(flat=True))
+ @model_validate(LoginStatusQuery)
+ def get(self, query: LoginStatusQuery):
app_code = query.app_code
user_id = query.user_id
token = extract_webapp_access_token(request)
@@ -206,9 +207,8 @@ class EmailCodeLoginSendEmailApi(Resource):
}
)
@web_ns.response(200, "Email code sent successfully", web_ns.models[SimpleResultDataResponse.__name__])
- def post(self):
- payload = EmailCodeLoginSendPayload.model_validate(web_ns.payload or {})
-
+ @model_validate(EmailCodeLoginSendPayload)
+ def post(self, payload: EmailCodeLoginSendPayload):
if payload.language == "zh-Hans":
language = "zh-Hans"
else:
@@ -242,9 +242,8 @@ class EmailCodeLoginApi(Resource):
web_ns.models[AccessTokenResultResponse.__name__],
)
@decrypt_code_field
- def post(self):
- payload = EmailCodeLoginVerifyPayload.model_validate(web_ns.payload or {})
-
+ @model_validate(EmailCodeLoginVerifyPayload)
+ def post(self, payload: EmailCodeLoginVerifyPayload):
user_email = payload.email.lower()
token_data = WebAppAuthService.get_email_code_login_data(payload.token)