mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-05-13 08:45:01 +00:00
user delete fix
This commit is contained in:
@@ -31,7 +31,7 @@
|
|||||||
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a8e0bce4703232a0",
|
"/chunks/user-storage.js": "/chunks/user-storage.js?id=a8e0bce4703232a0",
|
||||||
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=bfe357e0ea955be0",
|
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=bfe357e0ea955be0",
|
||||||
"/chunks/user-password.js": "/chunks/user-password.js?id=23d3aee39f539a3c",
|
"/chunks/user-password.js": "/chunks/user-password.js?id=23d3aee39f539a3c",
|
||||||
"/chunks/user-delete.js": "/chunks/user-delete.js?id=827a05e01cbc657d",
|
"/chunks/user-delete.js": "/chunks/user-delete.js?id=6bea6f8cadf4d74f",
|
||||||
"/chunks/plan.js": "/chunks/plan.js?id=4b267375ea9f19b3",
|
"/chunks/plan.js": "/chunks/plan.js?id=4b267375ea9f19b3",
|
||||||
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a956ceca6865c50c",
|
"/chunks/plan-subscribers.js": "/chunks/plan-subscribers.js?id=a956ceca6865c50c",
|
||||||
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=715ee86991d5e4db",
|
"/chunks/plan-settings.js": "/chunks/plan-settings.js?id=715ee86991d5e4db",
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<AppInputText
|
<AppInputText
|
||||||
:title="
|
:title="
|
||||||
$t('admin_page_user.label_delete_user', {
|
$t('admin_page_user.label_delete_user', {
|
||||||
user: user.data.relationships.settings.data.attributes.name,
|
user: user.data.relationships.settings.data.attributes.name.trim(),
|
||||||
})
|
})
|
||||||
"
|
"
|
||||||
:description="$t('user_box_delete.description')"
|
:description="$t('user_box_delete.description')"
|
||||||
@@ -82,7 +82,7 @@ export default {
|
|||||||
|
|
||||||
if (!isValid) return
|
if (!isValid) return
|
||||||
|
|
||||||
if (this.userName !== this.user.data.relationships.settings.data.attributes.name) {
|
if (this.userName.trim() !== this.user.data.relationships.settings.data.attributes.name.trim()) {
|
||||||
this.$refs.deleteUser.setErrors({
|
this.$refs.deleteUser.setErrors({
|
||||||
'User name': 'The user name is not the same.',
|
'User name': 'The user name is not the same.',
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ use App\Http\Controllers\Controller;
|
|||||||
use Illuminate\Support\Facades\Auth;
|
use Illuminate\Support\Facades\Auth;
|
||||||
use Domain\Admin\Requests\DeleteUserRequest;
|
use Domain\Admin\Requests\DeleteUserRequest;
|
||||||
use Domain\Admin\Actions\DeleteUserDataAction;
|
use Domain\Admin\Actions\DeleteUserDataAction;
|
||||||
|
use Illuminate\Support\Str;
|
||||||
|
|
||||||
class DeleteUserController extends Controller
|
class DeleteUserController extends Controller
|
||||||
{
|
{
|
||||||
@@ -30,7 +31,7 @@ class DeleteUserController extends Controller
|
|||||||
abort(406, "You can\'t delete your account");
|
abort(406, "You can\'t delete your account");
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($user->settings->name !== $request->name) {
|
if (trim($user->settings->name) !== $request->input('name')) {
|
||||||
abort(403, 'The name you typed is wrong!');
|
abort(403, 'The name you typed is wrong!');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user