@@ -99,8 +99,8 @@ public function updateProfile(Request $request, BaseHttpResponse $response)
99
99
'description ' => ['nullable ' , 'string ' , 'max:1000 ' ],
100
100
'email ' => [
101
101
'nullable ' ,
102
- 'max:60 ' ,
103
- 'min:6 ' ,
102
+ 'max:60 ' ,
103
+ 'min:6 ' ,
104
104
'email ' ,
105
105
'unique: ' . ApiHelper::getTable () . ',email, ' . $ userId ,
106
106
],
@@ -130,6 +130,7 @@ public function updateProfile(Request $request, BaseHttpResponse $response)
130
130
* Update password
131
131
*
132
132
* @bodyParam password string required The new password of user.
133
+ * @bodyParam old_password string required The current password of user.
133
134
*
134
135
* @group Profile
135
136
* @authenticated
@@ -138,6 +139,7 @@ public function updatePassword(Request $request, BaseHttpResponse $response)
138
139
{
139
140
$ validator = Validator::make ($ request ->input (), [
140
141
'password ' => 'required|min:6|max:60 ' ,
142
+ 'old_password ' => 'required|string|min:6|max:60 ' ,
141
143
]);
142
144
143
145
if ($ validator ->fails ()) {
@@ -147,10 +149,17 @@ public function updatePassword(Request $request, BaseHttpResponse $response)
147
149
->setMessage (__ ('Data invalid! ' ) . ' ' . implode (' ' , $ validator ->errors ()->all ()) . '. ' );
148
150
}
149
151
152
+ if (! Hash::check ($ request ->input ('old_password ' ), $ request ->user ()->getAuthPassword ())) {
153
+ return $ response
154
+ ->setError ()
155
+ ->setCode (403 )
156
+ ->setMessage (__ ('Current password is not valid! ' ));
157
+ }
158
+
150
159
$ request ->user ()->update ([
151
160
'password ' => Hash::make ($ request ->input ('password ' )),
152
161
]);
153
162
154
- return $ response ->setMessage (trans ( ' core/acl::users.password_update_success ' ));
163
+ return $ response ->setMessage (__ ( ' Update password successfully! ' ));
155
164
}
156
165
}
0 commit comments