fix(console): new password input disabled when user changes password (s…

…tar-whale#894)
anda-ren · Aug 10, 2022 · 5c2a800 · 5c2a800
1 parent 0d2c783
commit 5c2a800
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/console/src/domain/user/components/PasswordForm.tsx b/console/src/domain/user/components/PasswordForm.tsx
@@ -29,7 +29,7 @@ export default function PasswordForm({ currentUser, admin, onSubmit }: IPassword
     const [form] = useForm()
     const [css] = useStyletron()
     const [useRandom, setUseRandom] = useState(false)
-    const [passwdValid, setPasswdValid] = useState(false)
+    const [passwdValid, setPasswdValid] = useState(!admin)
     const [useRandomRadioVal, setUseRandomRadioVal] = useState('no')
 
     const handelSubmit = (data: IChangePasswordSchema) => {

diff --git a/console/src/domain/user/services/user.ts b/console/src/domain/user/services/user.ts
@@ -42,11 +42,10 @@ export async function listUsers(query: IListQuerySchema): Promise<IListSchema<IU
 }
 
 export async function changePassword(data: IChangePasswordSchema) {
-    // TODO change uri when backend ready
     const resp = await axios({
         method: 'put',
-        url: '/api/v1/user/pwd',
-        data: JSON.stringify(data),
+        url: '/api/v1/user/current/pwd',
+        data: JSON.stringify({ currentUserPwd: data.originPwd, newPwd: data.userPwd }),
         headers: { 'Content-Type': 'application/json' },
     })