From cdb40c819028a38950bf18affce48fb7ab8c24ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Wed, 16 Nov 2022 16:27:09 +0800
Subject: [PATCH 1/2] * Modify user api bug.

---
 api/v1/entries/user.php | 7 +++++--
 module/user/model.php   | 2 --
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php
index d419d970d4..773bf66c44 100644
--- a/api/v1/entries/user.php
+++ b/api/v1/entries/user.php
@@ -408,8 +408,11 @@ class userEntry extends entry
         $this->setPost('gender', $gender);
 
         $password = $this->request('password', zget($_POST, 'password', ''));
-        $this->setPost('password1', md5($password));
-        $this->setPost('password2', md5($password));
+        if($password)
+        {
+            $this->setPost('password1', md5($password));
+            $this->setPost('password2', md5($password));
+        }
         $this->setPost('verifyPassword', md5($this->app->user->password . $this->app->session->rand));
 
         $control = $this->loadController('user', 'edit');
diff --git a/module/user/model.php b/module/user/model.php
index 0f6acebe7c..de537a6c98 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -547,8 +547,6 @@ class userModel extends model
             ->remove('new, password1, password2, groups,verifyPassword, passwordStrength,passwordLength')
             ->get();
 
-        /* Fix bug for api requests using json. */
-        if($this->app->getViewType() == 'json') $this->post->verifyPassword = md5(md5($this->post->verifyPassword) . $this->session->rand);
         if(empty($_POST['verifyPassword']) or $this->post->verifyPassword != md5($this->app->user->password . $this->session->rand))
         {
             dao::$errors['verifyPassword'][] = $this->lang->user->error->verifyPassword;

From 4692b3e26ee5f36027152d53033f89ff55e276b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E8=BE=B0=E8=BD=A9?= <songchenxuan@easycorp.ltd>
Date: Wed, 16 Nov 2022 16:31:03 +0800
Subject: [PATCH 2/2] * Don not check password strength.

---
 api/v1/entries/user.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/api/v1/entries/user.php b/api/v1/entries/user.php
index 773bf66c44..87782cf8c3 100644
--- a/api/v1/entries/user.php
+++ b/api/v1/entries/user.php
@@ -412,6 +412,7 @@ class userEntry extends entry
         {
             $this->setPost('password1', md5($password));
             $this->setPost('password2', md5($password));
+            $this->setPost('passwordStrength', 2);
         }
         $this->setPost('verifyPassword', md5($this->app->user->password . $this->app->session->rand));