Merge branch 'feat/change-user-email' of github.com:langgenius/dify into feat/transfer-workspace-onwer

api/controllers/console/workspace/account.py

@@ -489,6 +489,9 @@ class ChangeEmailResetApi(Resource):
 
         AccountService.revoke_change_email_token(args["token"])
 
+        if not AccountService.check_email_unique(args["new_email"]):
+            raise EmailAlreadyInUseError()
+
         old_email = reset_data.get("old_email", "")
         if current_user.email != old_email:
             raise AccountNotFound()
@@ -504,10 +507,7 @@ class CheckEmailUnique(Resource):
         parser = reqparse.RequestParser()
         parser.add_argument("email", type=email, required=True, location="json")
         args = parser.parse_args()
-        with Session(db.engine) as session:
-            # check if email is already in use
-            account = session.execute(select(Account).filter_by(email=args["email"])).scalar_one_or_none()
-            if account is not None:
+        if not AccountService.check_email_unique(args["email"]):
             raise EmailAlreadyInUseError()
         return {"result": "success"}
 

api/services/account_service.py

@@ -807,6 +807,10 @@ class AccountService:
 
         return False
 
+    @staticmethod
+    def check_email_unique(email: str) -> bool:
+        return db.session.query(Account).filter_by(email=email).first() is None
+
 
 class TenantService:
     @staticmethod

api/templates/change_mail_confirm_new_template_en-US.html

@@ -86,3 +86,4 @@
 </body>
 
 </html>
+

api/templates/change_mail_confirm_new_template_zh-CN.html

@@ -86,3 +86,4 @@
 </body>
 
 </html>
+

api/templates/change_mail_confirm_old_template_en-US.html

@@ -86,3 +86,4 @@
 </body>
 
 </html>
+

api/templates/change_mail_confirm_old_template_zh-CN.html

@@ -86,3 +86,4 @@
 </body>
 
 </html>
+

api/templates/without-brand/change_mail_confirm_new_template_en-US.html

@@ -82,3 +82,4 @@
 </body>
 
 </html>
+

api/templates/without-brand/change_mail_confirm_new_template_zh-CN.html

@@ -82,3 +82,4 @@
 </body>
 
 </html>
+

api/templates/without-brand/change_mail_confirm_old_template_en-US.html

@@ -82,3 +82,4 @@
 </body>
 
 </html>
+

api/templates/without-brand/change_mail_confirm_old_template_zh-CN.html

@@ -82,3 +82,4 @@
 </body>
 
 </html>
+