管理员个人信息页

*仅测试部分移植功能

controllers/AdminController.php

@@ -6,6 +6,7 @@ use app\models\User;
 use app\models\UserSearch;
 use app\utils\AdminSword;
 use app\utils\FileSizeHelper;
+use OTPHP\TOTP;
 use Throwable;
 use Yii;
 use yii\base\Exception;
@@ -46,7 +47,7 @@ class AdminController extends Controller
                         'user-create' => ['GET', 'POST'],
                         'user-update' => ['GET', 'POST'],
                         'user-delete' => ['POST'],
-                        'info' => ['GET'],
+                        'info' => ['GET','POST'],
                         'user-totpoff' => ['POST'],
                         'user-pwdreset' => ['POST'],
                     ],
@@ -95,6 +96,7 @@ class AdminController extends Controller
 
     /**
      * Displays a single User model.
+     * 显示、处理用户管理中的数据变更
      * @param int $id ID
      * @throws NotFoundHttpException|Throwable if the model cannot be found
      */
@@ -324,10 +326,39 @@ class AdminController extends Controller
     }
 
     /**
-     * @return string
+     * @param string|null $focus
+     * @return Response|string
      */
-    public function actionInfo(): string
+    public function actionInfo(string $focus = null): Response|string
     {
-        return $this->render('info');
+        $model = Yii::$app->user->identity;
+        $totp_secret = null;
+        $totp_url = null;
+        if (!$model->is_otp_enabled) {
+            $totp = TOTP::generate();
+            $totp_secret = $totp->getSecret();
+            $totp->setLabel('NetDisk_' . $model->name);
+            $totp_url = $totp->getProvisioningUri();
+        }
+        if (Yii::$app->request->isPost && $model->load(Yii::$app->request->post())) {
+            if ($model->save(true,['bio'])) {
+                Yii::$app->session->setFlash('success', '个人简介已更新');
+                return $this->render('info', [
+                    'model' => $model,
+                    'focus' => 'bio',
+                    'totp_secret' => $totp_secret,
+                    'totp_url' => $totp_url,
+                    'is_otp_enabled' => $model->is_otp_enabled
+                ]);
+            }
+        }
+        return $this->render('info', [
+            'model' => $model,
+            'focus' => $focus,
+            'totp_secret' => $totp_secret,
+            'totp_url' => $totp_url,
+            'is_otp_enabled' => $model->is_otp_enabled == 1
+        ]);
     }
+    // Todo: 测试移植的用户信息页功能
 }

controllers/UserController.php

@@ -505,14 +505,24 @@ class UserController extends Controller
     {
         $model = Yii::$app->user->identity;
         $model->scenario = 'changePassword';
-
+        $org_password = $model->password;
+        //verify old password
         if ($model->load(Yii::$app->request->post()) && $model->validate()) {
-            $model->password = Yii::$app->security->generatePasswordHash($model->newPassword);
+            if (!Yii::$app->security->validatePassword($model->oldPassword, $org_password)) {
-            if ($model->save(false)) {
+                Yii::$app->session->setFlash('error', '原密码错误');
-                Yii::$app->session->setFlash('success', 'Password changed successfully.');
             } else {
-                Yii::$app->session->setFlash('error', 'Failed to change password.');
+                $model->password = Yii::$app->security->generatePasswordHash($model->newPassword);
+                if ($model->save(false)) {
+                    Yii::$app->session->setFlash('success', 'Password changed successfully.');
+                } else {
+                    Yii::$app->session->setFlash('error', 'Failed to change password.');
+                }
             }
+        }else{
+            Yii::$app->session->setFlash('error', 'Failed to validate password.');
+        }
+        if (Yii::$app->user->can('admin')) {
+            return $this->redirect(['admin/info', 'focus' => 'password']);
         }
         return $this->redirect(['user/info', 'focus' => 'password']);
     }
@@ -541,6 +551,9 @@ class UserController extends Controller
                 Yii::$app->session->setFlash('error', '二步验证启用失败，请重新添加');
             }
         }
+        if (Yii::$app->user->can('admin')) {
+            return $this->redirect(['admin/info']);
+        }
         return $this->redirect(['user/info']);
     }
 
@@ -598,6 +611,9 @@ class UserController extends Controller
         } else {
             // 如果用户没有启用 TOTP，返回一个错误消息
             Yii::$app->session->setFlash('error', '获取失败，您还没有启用二步验证。');
+            if (Yii::$app->user->can('admin')) {
+                return $this->redirect(['admin/info', 'focus' => 'advanced']);
+            }
             return $this->redirect(['user/info', 'focus' => 'advanced']);
         }
     }
@@ -622,11 +638,14 @@ class UserController extends Controller
     public function actionChangeName(): Response
     {
         $model = Yii::$app->user->identity;
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post()) && $model->save(true, ['name'])) {
             Yii::$app->session->setFlash('success', '昵称已更新');
         } else {
             Yii::$app->session->setFlash('error', '昵称更新失败');
         }
+        if (Yii::$app->user->can('admin')) {
+            return $this->redirect(['admin/info']);
+        }
         return $this->redirect(['user/info']);
     }
 
@@ -644,6 +663,9 @@ class UserController extends Controller
             ]);
         } else {
             Yii::$app->session->setFlash('error', '非Ajax请求');
+            if (Yii::$app->user->can('admin')) {
+                return $this->redirect(['admin/info']);
+            }
             return $this->redirect('info');
         }
     }
@@ -662,6 +684,9 @@ class UserController extends Controller
             $publicKeyCredentialSourceRepository = $this->findCredentialModel($id);
             if ($publicKeyCredentialSourceRepository->user_id !== Yii::$app->user->id) {
                 Yii::$app->session->setFlash('error', '非法操作');
+                if (Yii::$app->user->can('admin')) {
+                    return $this->redirect(['admin/info']);
+                }
                 return $this->redirect('info');
             }
             $publicKeyCredentialSourceRepository->delete();
@@ -672,6 +697,9 @@ class UserController extends Controller
             ]);
         } else {
             Yii::$app->session->setFlash('error', '非Pjax请求,无法删除');
+            if (Yii::$app->user->can('admin')) {
+                return $this->redirect(['admin/info']);
+            }
             return $this->redirect('info');
         }
     }
@@ -872,10 +900,10 @@ class UserController extends Controller
             }
             Yii::$app->user->login($user, $remember === 1 ? 3600 * 24 * 30 : 0);
             $publicKeyCredentialSourceRepository1->saveCredential($publicKeyCredentialSource, '', false);
-            if(Yii::$app->user->can('admin')){
+            if (Yii::$app->user->can('admin')) {
-                return $this->asJson(['verified' => true,'redirectTo' => 'index.php?r=admin%2Findex']);
+                return $this->asJson(['verified' => true, 'redirectTo' => 'index.php?r=admin%2Findex']);
             }
-            return $this->asJson(['verified' => true,'redirectTo' => 'index.php']);
+            return $this->asJson(['verified' => true, 'redirectTo' => 'index.php']);
         }
         // Optional, but highly recommended, you can save the credential source as it may be modified
         // during the verification process (counter may be higher).

models/User.php

@@ -73,14 +73,14 @@ class User extends ActiveRecord implements IdentityInterface
             [['username', 'password', 'email', 'password2'], 'required', 'on' => 'register'],
             [['username', 'password', 'email'], 'required', 'on' => 'addUser'],
             ['username', 'string', 'min' => 3, 'max' => 12],
-            ['password', 'string', 'min' => 6, 'max' => 24],
+            ['password', 'string', 'min' => 6],
             ['password2', 'compare', 'compareAttribute' => 'password', 'on' => 'register'],
             ['email', 'email', 'on' => ['register', 'addUser']],
             ['username', 'unique', 'on' => ['register', 'addUser']],
             ['email', 'unique', 'on' => ['register', 'addUser']],
             [['oldPassword', 'newPassword', 'newPasswordRepeat'], 'required', 'on' => 'changePassword'],
             ['oldPassword', 'validatePassword2', 'on' => 'changePassword'],
-            ['newPassword', 'string', 'min' => 6, 'max' => 24, 'on' => 'changePassword'],
+            ['newPassword', 'string', 'min' => 6, 'on' => 'changePassword'],
             ['newPasswordRepeat', 'compare', 'compareAttribute' => 'newPassword', 'on' => 'changePassword'],
             ['newPassword', 'compare', 'compareAttribute' => 'oldPassword', 'operator' => '!=', 'message' => '新密码不能与旧密码相同', 'on' => 'changePassword'],
         ];

views/admin/info.php

@@ -1,8 +1,359 @@
 <?php
-/** @var yii\web\View $this */
+/* @var $this yii\web\View */
-?>
+/* @var $model app\models\User */
-<h1>admin/index</h1>
+/* @var $focus string */
+/* @var $totp_secret string */
+/* @var $totp_url string */
+/* @var $is_otp_enabled bool */
 
-<p>
+use app\assets\FontAwesomeAsset;
-    这里是管理员页面.建设中
+use app\assets\SimpleWebAuthnBrowser;
-</p>
+use app\models\PublicKeyCredentialSourceRepository;
+use app\models\User;
+use app\utils\IPLocation;
+use Endroid\QrCode\Color\Color;
+use Endroid\QrCode\Encoding\Encoding;
+use Endroid\QrCode\ErrorCorrectionLevel;
+use Endroid\QrCode\QrCode;
+use Endroid\QrCode\RoundBlockSizeMode;
+use Endroid\QrCode\Writer\PngWriter;
+use yii\bootstrap5\ActiveForm;
+use yii\bootstrap5\Html;
+use yii\bootstrap5\Modal;
+use yii\data\ActiveDataProvider;
+use yii\helpers\Url;
+use yii\web\JqueryAsset;
+use yii\web\View;
+use yii\widgets\Pjax;
+
+$this->title = '个人设置';
+FontAwesomeAsset::register($this);
+JqueryAsset::register($this);
+SimpleWebAuthnBrowser::register($this);
+$this->registerCssFile('@web/css/user-info.css');
+$details = IPLocation::getDetails($model->last_login_ip); // IP LOCATION
+
+// QR-CODE
+if (!is_null($totp_secret)) {
+    $writer = new PngWriter();
+    $qrCode = QrCode::create($totp_url)
+        ->setEncoding(new Encoding('UTF-8'))
+        ->setErrorCorrectionLevel(ErrorCorrectionLevel::Low)
+        ->setSize(300)
+        ->setMargin(10)
+        ->setRoundBlockSizeMode(RoundBlockSizeMode::Margin)
+        ->setForegroundColor(new Color(0, 0, 0))
+        ->setBackgroundColor(new Color(255, 255, 255));
+    $result = $writer->write($qrCode);
+}
+
+// totp
+$user = new User();
+
+// Dark Mode
+$darkMode = Yii::$app->user->identity->dark_mode;
+?>
+
+<div class="user-info">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <div class="user-profile">
+        <div class="avatar-container">
+            <?= $model->getGravatar(email: $model->email, s: 100, img: true, atts: ['alt' => 'User Avatar', 'class' => 'avatar']) ?>
+            <div class="avatar-overlay">
+                <i class="fa-solid fa-pen-to-square"></i>
+            </div>
+        </div>
+        <div class="user-details">
+            <div class="user-info">
+                <p id="p-username" class="editable-username" title="用户昵称(用户名)">
+                    <?= Html::encode($model->name . '(' . $model->username . ')') ?>
+                    <i class="fa-solid fa-pen-to-square edit-icon"></i>
+                </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>
+                <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 class="accordion userAccordion" id="userAccordion">
+        <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>
+            </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>
+                    <?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">
+                    <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" <?= $is_otp_enabled ? 'checked' : '' ?>>
+                                    <label class="form-check-label" for="totp-enabled" data-bs-toggle="modal"
+                                           data-bs-target="#totpSetupModal">启用 TOTP</label>
+                                </div>
+                            </div>
+                        </li>
+                        <li class="list-group-item">
+                            <h5>
+                                <i class="fa-solid fa-user-lock"></i>
+                                备用码
+                            </h5>
+                            <div>
+                                <?= Html::a('获取恢复代码(请妥善保存)', Url::to(['user/download-recovery-codes']), ['class' => 'btn btn-outline-primary btn-sm', 'id' => 'generate-backup-codes']) ?>
+                            </div>
+                        </li>
+                        <li class="list-group-item">
+                            <h5>
+                                <i class="fa-solid fa-key"></i>
+                                Passwordless验证 (Webauthn) (BETA)
+                            </h5>
+                            <div class="input-group" id="totp_area">
+                                <input type="text" class="form-control" placeholder="在这里为新的FIDO设备命名" aria-label="在这里为新的FIDO设备命名" name="fido_name" id="fido_name" style="min-width: 220px;max-width: 300px">
+                                <?= Html::button('添加', ['id' => "webauthn_add", 'type' => 'button', 'class' => 'btn btn-primary btn-sm']) ?>
+                                <?= Html::button('测试', ['id' => "webauthn_verify", 'type' => 'button', 'class' => 'btn btn-primary btn-sm']) ?>
+                                <?= Html::button('管理', ['id' => "webauthn_detail", 'type' => 'button', 'class' => 'btn btn-primary btn-sm']) ?>
+                            </div>
+                            <div class="alert alert-success" role="alert" hidden>
+                                <span id="webauthn_success"></span>
+                            </div>
+                            <div class="alert alert-danger" role="alert" hidden>
+                                <span id="webauthn_error"></span>
+                            </div>
+                        </li>
+                    </ul>
+                    <br>
+
+                    <h4>主题</h4>
+                    <hr>
+                    <div class="form-check form-switch">
+                        <input class="form-check-input" type="checkbox" role="switch"
+                               id="useDarkTheme" <?= $darkMode === 0 ? '' : ($darkMode === 1 ? 'checked' : 'disabled') ?>>
+                        <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="followSystemTheme" <?= $darkMode === 2 ? 'checked' : '' ?>>
+                        <label class="form-check-label" for="followSystemTheme">跟随设备主题</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
+Modal::begin([
+    'title' => '<h4>更改用户头像</h4>',
+    'id' => 'avatarModal',
+]);
+
+echo Html::tag('div', '<i class="fa-solid fa-circle-info" id="info_icon"></i>
+<p>要修改头像，请前往Gravatar<a href="https://gravatar.com/" target=”_blank”><i class="fa-solid fa-arrow-up-right-from-square"></i></a>，使用相同的电子邮箱地址创建/登录账户后对头像进行管理</p>
+<br>Q: 修改头像后不起作用?<br>A: 尝试ctrl+F5强制刷新或清除cache后刷新页面<br><a href="https://support.gravatar.com/" target=”_blank”>更多帮助</a>', ['class' => 'modal-body']);
+
+Modal::end();
+
+// 修改用户昵称的Modal
+Modal::begin([
+    'title' => '<h4>修改用户昵称</h4>',
+    'id' => 'changeAccountName',
+    'size' => 'modal-sm',
+]);
+
+$form = ActiveForm::begin([
+    'action' => ['user/change-name'],
+    'method' => 'post'
+]);
+echo $form->field($user, 'name')->textInput()->label('新的用户昵称:');
+echo Html::submitButton('确认修改', ['class' => 'btn btn-primary']);
+ActiveForm::end();
+
+Modal::end();
+
+// 删除账户Modal
+Modal::begin([
+    'title' => '<h4>确定？</h4>',
+    'id' => 'deleteAccountModal',
+    'size' => 'modal-sm',
+]);
+
+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();
+
+// 二步验证Modal
+Modal::begin([
+    'title' => '<h4>需要进一步操作以启用二步验证</h4>',
+    'id' => 'totpSetupModal',
+    'size' => 'model-xl',
+]);
+?>
+<div class="row">
+    <div class="col-md-6 text-center center">
+        <img src="<?= is_null($totp_secret) ? '' : $result->getDataUri() ?>" alt="QR Code" class="img-fluid">
+    </div>
+    <div class="col-md-6">
+        <p>使用兼容TOTP的应用程序扫描左侧二维码以添加二步验证</p>
+        <p>推荐以下二步验证器：:</p>
+        <ul>
+            <li>
+                <a href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_US">Google
+                    Authenticator</a></li>
+            <li><a href="https://play.google.com/store/apps/details?id=com.azure.authenticator&hl=en_US">Microsoft
+                    Authenticator</a></li>
+            <li><a href="https://play.google.com/store/apps/details?id=com.authy.authy&hl=en">Authy</a></li>
+            <!--这是广告吗-->
+            <li><a href="https://git.chenx221.cyou/chenx221/OTP/releases">自制TOTP验证器(Windows)</a></li>
+            <!-- Add more applications as needed -->
+        </ul>
+        <div class="input-group mb-3">
+            <label for="totp_secret">无法扫描?使用下面的密钥来添加</label>
+            <input type="text" class="form-control" value="<?= $totp_secret ?>" id="totp_secret" readonly>
+            <button class="btn btn-outline-secondary" type="button"
+                    onclick="navigator.clipboard.writeText('<?= $totp_secret ?>')">Copy
+            </button>
+        </div>
+        <?php
+        if (!$is_otp_enabled) {
+            $form = ActiveForm::begin([
+                'action' => ['user/setup-two-factor'],
+                'method' => 'post'
+            ]);
+            echo Html::activeHiddenInput($user, 'otp_secret', ['value' => $totp_secret]);
+            echo $form->field($user, 'totp_input')->textInput()->label('最后一步! 输入TOTP应用程序上显示的密码以启用二步验证');
+            echo Html::submitButton('启用二步验证', ['class' => 'btn btn-primary']);
+            ActiveForm::end();
+        }
+        ?>
+    </div>
+</div>
+<?php
+Modal::end();
+
+Modal::begin([
+    'title' => '<h4>管理已添加的Webauthn设备</h4>',
+    'id' => 'credentialModal',
+    'size' => 'modal-xl modal-fullscreen-xl-down',
+]);
+
+echo Html::tag('div', '你可以在下方查看和删除已经添加的Webauthn设备', ['class' => 'modal-body']);
+$dataProvider = new ActiveDataProvider([
+    'query' => PublicKeyCredentialSourceRepository::find()->where(['user_id' => Yii::$app->user->id]),
+]);
+// 使用 GridView 小部件显示数据
+Pjax::begin();
+echo Html::tag('div', '', ['id' => 'pjax-container']);
+Pjax::end();
+Modal::end();
+$this->registerJsFile('@web/js/user-info.js', ['depends' => [JqueryAsset::class, SimpleWebAuthnBrowser::class], 'position' => View::POS_END]);
+?>