新增删除自身账户功能
*仅简单测试了下
This commit is contained in:
parent
63fef55f65
commit
4a22f950e5
GPG Key ID:
D7A9EC07024C3021
@ -110,18 +110,23 @@ class UserController extends Controller
|
||||
]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes an existing User model.
|
||||
* If deletion is successful, the browser will be redirected to the 'index' page.
|
||||
* @param int $id ID
|
||||
* @return Response
|
||||
* @throws NotFoundHttpException if the model cannot be found
|
||||
*/
|
||||
public function actionDelete($id)
|
||||
public function actionDelete(): Response
|
||||
{
|
||||
$this->findModel($id)->delete();
|
||||
if (Yii::$app->user->isGuest) {
|
||||
Yii::$app->session->setFlash('error', '滚');
|
||||
return $this->goHome();
|
||||
}
|
||||
|
||||
return $this->redirect(['index']);
|
||||
$model = Yii::$app->user->identity;
|
||||
|
||||
if ($model->deleteAccount()) {
|
||||
Yii::$app->user->logout();
|
||||
Yii::$app->session->setFlash('success', 'Account deleted successfully.');
|
||||
} else {
|
||||
Yii::$app->session->setFlash('error', 'Failed to delete account.');
|
||||
}
|
||||
|
||||
return $this->redirect(['user/login']);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -182,10 +187,10 @@ class UserController extends Controller
|
||||
Yii::$app->session->setFlash('error', '登陆成功，但出现了内部错误');
|
||||
}
|
||||
} else {
|
||||
Yii::$app->session->setFlash('error', 'Invalid username or password.');
|
||||
Yii::$app->session->setFlash('error', '用户名密码错误或账户已禁用');
|
||||
}
|
||||
} else {
|
||||
Yii::$app->session->setFlash('error', 'Invalid captcha.');
|
||||
Yii::$app->session->setFlash('error', '请等待验证码加载并完成验证');
|
||||
}
|
||||
}
|
||||
return $this->render('login', [
|
||||
|
||||
@ -252,4 +252,20 @@ class User extends ActiveRecord implements IdentityInterface
|
||||
return $url;
|
||||
}
|
||||
|
||||
public function deleteAccount(): false|int
|
||||
{
|
||||
// 设置用户状态为禁用
|
||||
$this->status = 0;
|
||||
|
||||
// 保存用户模型
|
||||
if (!$this->save()) {
|
||||
return false; // something wrong
|
||||
}
|
||||
// 更新与用户相关的所有 CollectionTasks 和 Share 记录的状态为禁用
|
||||
CollectionTasks::updateAll(['status' => 0], ['user_id' => $this->id]);
|
||||
Share::updateAll(['status' => 0], ['sharer_id' => $this->id]);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
@ -15,10 +15,14 @@ use app\utils\FileSizeHelper;
|
||||
use app\utils\IPLocation;
|
||||
use yii\bootstrap5\ActiveForm;
|
||||
use yii\bootstrap5\Html;
|
||||
use yii\bootstrap5\Modal;
|
||||
use yii\helpers\Url;
|
||||
use yii\web\JqueryAsset;
|
||||
use yii\web\View;
|
||||
|
||||
$this->title = '个人设置';
|
||||
FontAwesomeAsset::register($this);
|
||||
JqueryAsset::register($this);
|
||||
$this->registerCssFile('@web/css/user-info.css');
|
||||
$details = IPLocation::getDetails($model->last_login_ip); // IP LOCATION
|
||||
|
||||
@ -33,55 +37,55 @@ $vaultUsedPercent = $is_unlimited ? 0 : round($vaultUsedSpace / ($storageLimit *
|
||||
$totalUsedPercent = min(($usedPercent + $vaultUsedPercent), 100); //总已用百分比
|
||||
?>
|
||||
|
||||
<div class="user-info">
|
||||
<div class="user-info">
|
||||
|
||||
<h1><?= Html::encode($this->title) ?></h1>
|
||||
<h1><?= Html::encode($this->title) ?></h1>
|
||||
|
||||
<div class="user-profile">
|
||||
<?= $model->getGravatar(email: $model->email, s: 100, img: true, atts: ['alt' => 'User Avatar', 'style' => 'border-radius: 50%']) ?>
|
||||
<div class="user-details">
|
||||
<div class="user-info">
|
||||
<p id="p-username"><?= Html::encode($model->username) ?></p>
|
||||
<p><?= Html::encode($model->email) ?></p>
|
||||
<p>
|
||||
<?php
|
||||
if ($model->role == 'user') {
|
||||
echo '普通用户';
|
||||
} elseif ($model->role == 'admin') {
|
||||
echo '管理员';
|
||||
} else {
|
||||
echo Html::encode($model->role);
|
||||
}
|
||||
?>
|
||||
</p>
|
||||
</div>
|
||||
<div class="user-login-info">
|
||||
<div class="user-last-login">
|
||||
<i class="fa-solid fa-clipboard-user"></i>
|
||||
<div class="login-info-dv">
|
||||
<p class="user-login-info-title">上次登录时间</p>
|
||||
<p class="user-login-info-content"><?= Html::encode($model->last_login . ' (CST)') ?></p>
|
||||
</div>
|
||||
<div class="user-profile">
|
||||
<?= $model->getGravatar(email: $model->email, s: 100, img: true, atts: ['alt' => 'User Avatar', 'style' => 'border-radius: 50%']) ?>
|
||||
<div class="user-details">
|
||||
<div class="user-info">
|
||||
<p id="p-username"><?= Html::encode($model->username) ?></p>
|
||||
<p><?= Html::encode($model->email) ?></p>
|
||||
<p>
|
||||
<?php
|
||||
if ($model->role == 'user') {
|
||||
echo '普通用户';
|
||||
} elseif ($model->role == 'admin') {
|
||||
echo '管理员';
|
||||
} else {
|
||||
echo Html::encode($model->role);
|
||||
}
|
||||
?>
|
||||
</p>
|
||||
</div>
|
||||
<div class="user-last-login-ip">
|
||||
<i class="fa-solid fa-location-dot"></i>
|
||||
<div class="login-info-dv">
|
||||
<p class="user-login-info-title">上次登录IP</p>
|
||||
<p class="user-login-info-content">
|
||||
<?= Html::encode($model->last_login_ip) ?>
|
||||
<?= Html::encode(($details === null) ? '' : '(' . ($details->bogon ? ('Bogon IP') : ($details->city . ', ' . $details->country)) . ')') ?>
|
||||
</p>
|
||||
<div class="user-login-info">
|
||||
<div class="user-last-login">
|
||||
<i class="fa-solid fa-clipboard-user"></i>
|
||||
<div class="login-info-dv">
|
||||
<p class="user-login-info-title">上次登录时间</p>
|
||||
<p class="user-login-info-content"><?= Html::encode($model->last_login . ' (CST)') ?></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="user-last-login-ip">
|
||||
<i class="fa-solid fa-location-dot"></i>
|
||||
<div class="login-info-dv">
|
||||
<p class="user-login-info-title">上次登录IP</p>
|
||||
<p class="user-login-info-content">
|
||||
<?= Html::encode($model->last_login_ip) ?>
|
||||
<?= Html::encode(($details === null) ? '' : '(' . ($details->bogon ? ('Bogon IP') : ($details->city . ', ' . $details->country)) . ')') ?>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion userAccordion" id="userAccordion">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingStorage">
|
||||
<button class="accordion-button <?= ($focus === 'storage' || $focus === null) ? '' : 'collapsed' ?>"
|
||||
type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseStorage" <?= ($focus === 'storage' || $focus === null) ? 'aria-expanded="true"' : '' ?>>
|
||||
<div class="accordion userAccordion" id="userAccordion">
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingStorage">
|
||||
<button class="accordion-button <?= ($focus === 'storage' || $focus === null) ? '' : 'collapsed' ?>"
|
||||
type="button" data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseStorage" <?= ($focus === 'storage' || $focus === null) ? 'aria-expanded="true"' : '' ?>>
|
||||
<span class="accordion-storage-content">
|
||||
<span>
|
||||
<i class="fa-solid fa-hard-drive"></i>
|
||||
@ -91,46 +95,48 @@ $totalUsedPercent = min(($usedPercent + $vaultUsedPercent), 100); //总已用百
|
||||
<?= $totalUsed_F . ' / ' . $storageLimit_F ?>
|
||||
</span>
|
||||
</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseStorage"
|
||||
class="accordion-collapse collapse <?= ($focus === 'storage' || $focus === null) ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<div class="storage-info">
|
||||
<div class="storage-columns">
|
||||
<div class="storage-usage" style="width: 27%">
|
||||
<p>当前已使用容量</p>
|
||||
<span style="font-weight: 600;font-size: 1.4rem;color: black;padding-left: 2px;"><?= $totalUsed_F ?>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseStorage"
|
||||
class="accordion-collapse collapse <?= ($focus === 'storage' || $focus === null) ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<div class="storage-info">
|
||||
<div class="storage-columns">
|
||||
<div class="storage-usage" style="width: 27%">
|
||||
<p>当前已使用容量</p>
|
||||
<span style="font-weight: 600;font-size: 1.4rem;color: black;padding-left: 2px;"><?= $totalUsed_F ?>
|
||||
</span>
|
||||
<span style="font-size: 0.9rem;">/ <?= $storageLimit_F ?></span>
|
||||
</div>
|
||||
<div style="width: 47%">
|
||||
<p><?= $totalUsedPercent ?>% 已用</p>
|
||||
<div class="progress">
|
||||
<div class="progress-bar" role="progressbar"
|
||||
style="width: <?= $usedPercent ?>%;background-color: rgb(52,131,250)"
|
||||
aria-valuenow="<?= $usedPercent ?>"
|
||||
aria-valuemin="0" aria-valuemax="100"></div>
|
||||
<div class="progress-bar" role="progressbar"
|
||||
style="width: <?= $vaultUsedPercent ?>%;background-color: rgb(196,134,0)"
|
||||
aria-valuenow="<?= $vaultUsedPercent ?>"
|
||||
aria-valuemin="0" aria-valuemax="100"></div>
|
||||
<span style="font-size: 0.9rem;">/ <?= $storageLimit_F ?></span>
|
||||
</div>
|
||||
<div class="storage-legend" style="color: rgb(140,139,139)">
|
||||
<div class="legend-item">
|
||||
<span class="legend-color" style="background-color: rgb(52,131,250);"></span>
|
||||
<span>网盘已用空间</span>
|
||||
<span style="margin-left: auto;"><?= $usedSpace_F ?>
|
||||
<?= Html::a('<i class="fa-solid fa-arrow-up-right-from-square" style="font-size: 0.75rem;"></i>', ['home/index']) ?>
|
||||
</span>
|
||||
<div style="width: 47%">
|
||||
<p><?= $totalUsedPercent ?>% 已用</p>
|
||||
<div class="progress">
|
||||
<div class="progress-bar" role="progressbar"
|
||||
style="width: <?= $usedPercent ?>%;background-color: rgb(52,131,250)"
|
||||
aria-valuenow="<?= $usedPercent ?>"
|
||||
aria-valuemin="0" aria-valuemax="100"></div>
|
||||
<div class="progress-bar" role="progressbar"
|
||||
style="width: <?= $vaultUsedPercent ?>%;background-color: rgb(196,134,0)"
|
||||
aria-valuenow="<?= $vaultUsedPercent ?>"
|
||||
aria-valuemin="0" aria-valuemax="100"></div>
|
||||
</div>
|
||||
<div class="legend-item">
|
||||
<span class="legend-color" style="background-color: rgb(196,134,0);"></span>
|
||||
<span>保险箱已用空间</span>
|
||||
<span style="margin-left: auto;"><?= $vaultUsedSpace_F ?>
|
||||
<div class="storage-legend" style="color: rgb(140,139,139)">
|
||||
<div class="legend-item">
|
||||
<span class="legend-color"
|
||||
style="background-color: rgb(52,131,250);"></span>
|
||||
<span>网盘已用空间</span>
|
||||
<span style="margin-left: auto;"><?= $usedSpace_F ?>
|
||||
<?= Html::a('<i class="fa-solid fa-arrow-up-right-from-square" style="font-size: 0.75rem;"></i>', ['home/index']) ?>
|
||||
</span>
|
||||
</div>
|
||||
<div class="legend-item">
|
||||
<span class="legend-color" style="background-color: rgb(196,134,0);"></span>
|
||||
<span>保险箱已用空间</span>
|
||||
<span style="margin-left: auto;"><?= $vaultUsedSpace_F ?>
|
||||
<!-- PENDING-->
|
||||
<?= Html::a('<i class="fa-solid fa-arrow-up-right-from-square" style="font-size: 0.75rem;"></i>', ['site/index']) ?>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -138,67 +144,146 @@ $totalUsedPercent = min(($usedPercent + $vaultUsedPercent), 100); //总已用百
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingBio">
|
||||
<button class="accordion-button <?= ($focus === 'bio') ? '' : 'collapsed' ?>" type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseBio" <?= ($focus === 'bio') ? 'aria-expanded="true"' : '' ?>>
|
||||
<i class="fa-solid fa-address-card"></i>
|
||||
<span>个人简介</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseBio" class="accordion-collapse collapse <?= ($focus === 'bio') ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<?php $form = yii\widgets\ActiveForm::begin(); ?>
|
||||
<?= $form->field($model, 'bio')->textarea(['rows' => 6])->label('简介') ?>
|
||||
<div class="form-group">
|
||||
<?= yii\helpers\Html::submitButton('保存', ['class' => 'btn btn-success']) ?>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingBio">
|
||||
<button class="accordion-button <?= ($focus === 'bio') ? '' : 'collapsed' ?>" type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseBio" <?= ($focus === 'bio') ? 'aria-expanded="true"' : '' ?>>
|
||||
<i class="fa-solid fa-address-card"></i>
|
||||
<span>个人简介</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseBio" class="accordion-collapse collapse <?= ($focus === 'bio') ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<?php $form = yii\widgets\ActiveForm::begin(); ?>
|
||||
<?= $form->field($model, 'bio')->textarea(['rows' => 6])->label('简介') ?>
|
||||
<div class="form-group">
|
||||
<?= yii\helpers\Html::submitButton('保存', ['class' => 'btn btn-success']) ?>
|
||||
</div>
|
||||
<?php yii\widgets\ActiveForm::end(); ?>
|
||||
</div>
|
||||
<?php yii\widgets\ActiveForm::end(); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingPassword">
|
||||
<button class="accordion-button <?= ($focus === 'password') ? '' : 'collapsed' ?>" type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapsePassword" <?= ($focus === 'password') ? 'aria-expanded="true"' : '' ?>>
|
||||
<i class="fa-solid fa-key"></i>
|
||||
<span>修改密码</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapsePassword" class="accordion-collapse collapse <?= ($focus === 'password') ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<?php $form = ActiveForm::begin([
|
||||
'action' => Url::to(['user/change-password']),
|
||||
'method' => 'post'
|
||||
]); ?>
|
||||
<?= $form->field($model, 'oldPassword')->passwordInput()->label('原密码') ?>
|
||||
<?= $form->field($model, 'newPassword')->passwordInput()->label('新密码') ?>
|
||||
<?= $form->field($model, 'newPasswordRepeat')->passwordInput()->label('重复新密码') ?>
|
||||
<div class="form-group">
|
||||
<?= Html::submitButton('保存', ['class' => 'btn btn-success']) ?>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingPassword">
|
||||
<button class="accordion-button <?= ($focus === 'password') ? '' : 'collapsed' ?>" type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapsePassword" <?= ($focus === 'password') ? 'aria-expanded="true"' : '' ?>>
|
||||
<i class="fa-solid fa-key"></i>
|
||||
<span>修改密码</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapsePassword"
|
||||
class="accordion-collapse collapse <?= ($focus === 'password') ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<?php $form = ActiveForm::begin([
|
||||
'action' => Url::to(['user/change-password']),
|
||||
'method' => 'post'
|
||||
]); ?>
|
||||
<?= $form->field($model, 'oldPassword')->passwordInput()->label('原密码') ?>
|
||||
<?= $form->field($model, 'newPassword')->passwordInput()->label('新密码') ?>
|
||||
<?= $form->field($model, 'newPasswordRepeat')->passwordInput()->label('重复新密码') ?>
|
||||
<div class="form-group">
|
||||
<?= Html::submitButton('修改密码', ['class' => 'btn btn-success']) ?>
|
||||
</div>
|
||||
<?php ActiveForm::end(); ?>
|
||||
</div>
|
||||
<?php ActiveForm::end(); ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingAdvanced">
|
||||
<button class="accordion-button <?= ($focus === 'advanced') ? '' : 'collapsed' ?>" type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseAdvanced" <?= ($focus === 'advanced') ? 'aria-expanded="true"' : '' ?>>
|
||||
<i class="fa-solid fa-flask"></i>
|
||||
<span>高级选项</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseAdvanced" class="accordion-collapse collapse <?= ($focus === 'advanced') ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<!-- 高级选项相关内容 -->
|
||||
<div class="accordion-item">
|
||||
<h2 class="accordion-header" id="headingAdvanced">
|
||||
<button class="accordion-button <?= ($focus === 'advanced') ? '' : 'collapsed' ?>" type="button"
|
||||
data-bs-toggle="collapse"
|
||||
data-bs-target="#collapseAdvanced" <?= ($focus === 'advanced') ? 'aria-expanded="true"' : '' ?>>
|
||||
<i class="fa-solid fa-flask"></i>
|
||||
<span>高级功能</span>
|
||||
</button>
|
||||
</h2>
|
||||
<div id="collapseAdvanced"
|
||||
class="accordion-collapse collapse <?= ($focus === 'advanced') ? 'show' : '' ?>">
|
||||
<div class="accordion-body">
|
||||
<!--TODO:二步验证、passwordless-->
|
||||
<h4>二步验证</h4>
|
||||
<hr>
|
||||
<p>使用除您密码之外的第二种方法来增强您账号的安全性。</p>
|
||||
<ul class="list-group list-group-flush">
|
||||
<li class="list-group-item">
|
||||
<h5>
|
||||
<i class="fa-solid fa-shield-halved"></i>
|
||||
TOTP (Authenticator app)
|
||||
</h5>
|
||||
<div>
|
||||
<div class="form-check form-switch">
|
||||
<input class="form-check-input" type="checkbox" role="switch" id="totp-enabled">
|
||||
<label class="form-check-label" for="totp-enabled">启用 TOTP</label>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
<li class="list-group-item">
|
||||
<h5>
|
||||
<i class="fa-solid fa-user-lock"></i>
|
||||
备用码
|
||||
</h5>
|
||||
<div>
|
||||
<button id="generate-backup-codes" class="btn btn-outline-primary btn-sm">
|
||||
生成备用码
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
<br>
|
||||
|
||||
<h4>无密码认证</h4>
|
||||
<hr>
|
||||
<p>遵循 FIDO2 标准为无密码身份验证设置您的账号。</p>
|
||||
<br>
|
||||
|
||||
<h4>主题</h4>
|
||||
<hr>
|
||||
<p>可以在</p>
|
||||
<div class="form-check form-switch">
|
||||
<input class="form-check-input" type="checkbox" role="switch" id="useDarkTheme">
|
||||
<label class="form-check-label" for="useDarkTheme">启用夜间模式</label>
|
||||
</div>
|
||||
<div class="form-check form-switch">
|
||||
<input class="form-check-input" type="checkbox" role="switch" id="autoTheme">
|
||||
<label class="form-check-label" for="autoTheme">Auto</label>
|
||||
</div>
|
||||
<br>
|
||||
|
||||
<h4>删除账户</h4>
|
||||
<hr>
|
||||
<p>这个操作不支持撤回，请谨慎操作。</p>
|
||||
<button type="button" class="btn btn-danger" data-bs-toggle="modal"
|
||||
data-bs-target="#deleteAccountModal">
|
||||
删除账户
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<?php
|
||||
Modal::begin([
|
||||
'title' => '<h4>确定？</h4>',
|
||||
'id' => 'deleteAccountModal',
|
||||
'size' => 'modal-sm',
|
||||
]);
|
||||
|
||||
</div>
|
||||
echo Html::tag('div', '确定要删除这个账户？', ['class' => 'modal-body']);
|
||||
|
||||
echo Html::beginForm(['user/delete'], 'post', ['id' => 'delete-form']);
|
||||
|
||||
echo '<div>';
|
||||
echo Html::checkbox('deleteConfirm', false, ['label' => '确认','id'=>'deleteConfirm']);
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="text-end">';
|
||||
echo Html::submitButton('继续删除', ['class' => 'btn btn-danger', 'disabled' => true,'id' => 'deleteButton']);
|
||||
echo '</div>';
|
||||
|
||||
echo Html::endForm();
|
||||
|
||||
Modal::end();
|
||||
$this->registerJsFile('@web/js/user-info.js', ['depends' => [JqueryAsset::class], 'position' => View::POS_END]);
|
||||
?>
|
||||
9
web/js/user-info.js
Normal file
9
web/js/user-info.js
Normal file
@ -0,0 +1,9 @@
|
||||
$(document).ready(function() {
|
||||
$('#deleteConfirm').change(function() {
|
||||
if(this.checked) {
|
||||
$('#deleteButton').prop('disabled', false);
|
||||
} else {
|
||||
$('#deleteButton').prop('disabled', true);
|
||||
}
|
||||
});
|
||||
});
|
||||
Loading…
x
Reference in New Issue
Block a user